Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/reference/mapping/params/analyzer.asciidoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[[analyzer]]
=== `analyzer`

The values of <<mapping-index,`analyzed`>> string fields are passed through an
The values of <<text,`text`>> fields are passed through an
<<analysis,analyzer>> to convert the string into a stream of _tokens_ or
_terms_. For instance, the string `"The quick Brown Foxes."` may, depending
on which analyzer is used, be analyzed to the tokens: `quick`, `brown`,
Expand Down
4 changes: 2 additions & 2 deletions docs/reference/mapping/params/index-options.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ following settings:

NOTE: <<number,Numeric fields>> don't support the `index_options` parameter any longer.

<<mapping-index,Analyzed>> string fields use `positions` as the default, and
all other fields use `docs` as the default.
<<text,`text`>> fields use `positions` as the default, and all other fields use
`docs` as the default.

[source,console]
--------------------------------------------------
Expand Down
7 changes: 3 additions & 4 deletions docs/reference/mapping/types/search-as-you-type.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ the same way.
<<analyzer,`analyzer`>>::

The <<analysis,analyzer>> which should be used for
<<mapping-index,`analyzed`>> string fields, both at index-time and at
`text` fields, both at index-time and at
search-time (unless overridden by the
<<search-analyzer,`search_analyzer`>>). Defaults to the default index
analyzer, or the <<analysis-standard-analyzer,`standard` analyzer>>.
Expand Down Expand Up @@ -215,7 +215,7 @@ the same way.
<<search-analyzer,`search_analyzer`>>::

The <<analyzer,`analyzer`>> that should be used at search time on
<<mapping-index,`analyzed`>> fields. Defaults to the `analyzer` setting.
<<text,`text`>> fields. Defaults to the `analyzer` setting.

<<search-quote-analyzer,`search_quote_analyzer`>>::

Expand All @@ -229,8 +229,7 @@ the same way.

<<term-vector,`term_vector`>>::

Whether term vectors should be stored for an <<mapping-index,`analyzed`>>
field. Defaults to `no`. This option configures the root field and shingle
Whether term vectors should be stored for the field. Defaults to `no`. This option configures the root field and shingle
subfields, but not the prefix subfield.


Expand Down
7 changes: 3 additions & 4 deletions docs/reference/mapping/types/text.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ The following parameters are accepted by `text` fields:
<<analyzer,`analyzer`>>::

The <<analysis,analyzer>> which should be used for
<<mapping-index,`analyzed`>> string fields, both at index-time and at
the `text` field, both at index-time and at
search-time (unless overridden by the <<search-analyzer,`search_analyzer`>>).
Defaults to the default index analyzer, or the
<<analysis-standard-analyzer,`standard` analyzer>>.
Expand Down Expand Up @@ -122,7 +122,7 @@ The following parameters are accepted by `text` fields:
<<search-analyzer,`search_analyzer`>>::

The <<analyzer,`analyzer`>> that should be used at search time on
<<mapping-index,`analyzed`>> fields. Defaults to the `analyzer` setting.
the `text` field. Defaults to the `analyzer` setting.

<<search-quote-analyzer,`search_quote_analyzer`>>::

Expand All @@ -136,8 +136,7 @@ The following parameters are accepted by `text` fields:

<<term-vector,`term_vector`>>::

Whether term vectors should be stored for an <<mapping-index,`analyzed`>>
field. Defaults to `no`.
Whether term vectors should be stored for the field. Defaults to `no`.

<<mapping-field-meta,`meta`>>::

Expand Down
3 changes: 2 additions & 1 deletion docs/reference/mapping/types/token-count.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ GET my_index/_search
}
--------------------------------------------------

<1> The `name` field is an analyzed string field which uses the default `standard` analyzer.
<1> The `name` field is a <<text,`text`>> field which uses the default
`standard` analyzer.
<2> The `name.length` field is a `token_count` <<multi-fields,multi-field>> which will index the number of tokens in the `name` field.
<3> This query matches only the document containing `Rachel Alice Williams`, as it contains three tokens.

Expand Down