summaryrefslogtreecommitdiff
path: root/docs/reference/mapping/types.asciidoc
diff options
context:
space:
mode:
authorAdrien Grand <jpountz@gmail.com>2016-03-18 17:01:27 +0100
committerAdrien Grand <jpountz@gmail.com>2016-03-22 16:22:58 +0100
commitb42f66c8acf6368f1d20905786b1d5c17df86075 (patch)
treeff3e74930f2997edb22ee4519a0bdbadc8327f13 /docs/reference/mapping/types.asciidoc
parent3764b3ff800c94293aba0bb0fa18c7df80a764f7 (diff)
Document 5.0 mapping changes.
Diffstat (limited to 'docs/reference/mapping/types.asciidoc')
-rw-r--r--docs/reference/mapping/types.asciidoc12
1 files changed, 8 insertions, 4 deletions
diff --git a/docs/reference/mapping/types.asciidoc b/docs/reference/mapping/types.asciidoc
index 2ac579f273..30d6bd56b1 100644
--- a/docs/reference/mapping/types.asciidoc
+++ b/docs/reference/mapping/types.asciidoc
@@ -7,7 +7,7 @@ document:
[float]
=== Core datatypes
-<<string>>:: `string`
+string:: <<text,`text`>> and <<keyword,`keyword`>>
<<number>>:: `long`, `integer`, `short`, `byte`, `double`, `float`
<<date>>:: `date`
<<boolean>>:: `boolean`
@@ -45,9 +45,9 @@ Attachment datatype::
=== Multi-fields
It is often useful to index the same field in different ways for different
-purposes. For instance, a `string` field could be <<mapping-index,indexed>> as
-an `analyzed` field for full-text search, and as a `not_analyzed` field for
-sorting or aggregations. Alternatively, you could index a string field with
+purposes. For instance, a `string` field could be mapped as
+a `text` field for full-text search, and as a `keyword` field for
+sorting or aggregations. Alternatively, you could index a text field with
the <<analysis-standard-analyzer,`standard` analyzer>>, the
<<english-analyzer,`english`>> analyzer, and the
<<french-analyzer,`french` analyzer>>.
@@ -69,6 +69,8 @@ include::types/geo-shape.asciidoc[]
include::types/ip.asciidoc[]
+include::types/keyword.asciidoc[]
+
include::types/nested.asciidoc[]
include::types/numeric.asciidoc[]
@@ -77,6 +79,8 @@ include::types/object.asciidoc[]
include::types/string.asciidoc[]
+include::types/text.asciidoc[]
+
include::types/token-count.asciidoc[]