Docs: Mapping docs completely rewritten for 2.0

1 files changed, 59 insertions, 12 deletions

diff --git a/docs/reference/mapping/types.asciidoc b/docs/reference/mapping/types.asciidoc
index 0cc967e77e..f7c93b0471 100644
--- a/docs/reference/mapping/types.asciidoc
+++ b/docs/reference/mapping/types.asciidoc
@@ -1,24 +1,71 @@
 [[mapping-types]]
-== Types
+== Field datatypes
 
-The datatype for each field in a document (eg strings, numbers, 
-objects etc) can be controlled via the type mapping.
+Elasticsearch supports a number of different datatypes for the fields in a
+document:
 
-include::types/core-types.asciidoc[]
+[float]
+=== Core datatypes
 
-include::types/array-type.asciidoc[]
+<<string>>::    `string`
+<<number>>::    `long`, `integer`, `short`, `byte`, `double`, `float`
+<<date>>::      `date`
+<<boolean>>::   `boolean`
+<<binary>>::    `binary`
 
-include::types/object-type.asciidoc[]
+[float]
+=== Complex datatypes
 
-include::types/root-object-type.asciidoc[]
+<<array>>::     Array support does not require a dedicated `type`
+<<object>>::    `object` for single JSON objects
+<<nested>>::    `nested` for arrays of JSON objects
+
+[float]
+=== Geo dataypes
+
+<<geo-point>>::     `geo_point` for lat/lon points
+<<geo-shape>>::     `geo_shape` for complex shapes like polygons
+
+[float]
+=== Specialised datatypes
+
+<<ip>>::            `ip` for IPv4 addresses
+<<search-suggesters-completion,Completion datatype>>::
+                    `completion` to provide auto-complete suggestions
+<<token-count>>::   `token_count` to count the number of tokens in a string
+
+Attachment datatype::
+
+    See the https://github.com/elastic/elasticsearch-mapper-attachments[mapper attachment plugin]
+    which supports indexing ``attachments'' like Microsoft Office formats, Open
+    Document formats, ePub, HTML, etc. into an `attachment` datatype.
+
+include::types/array.asciidoc[]
+
+include::types/binary.asciidoc[]
+
+include::types/boolean.asciidoc[]
+
+include::types/date.asciidoc[]
+
+include::types/geo-point.asciidoc[]
+
+include::types/geo-shape.asciidoc[]
+
+include::types/ip.asciidoc[]
+
+include::types/nested.asciidoc[]
+
+include::types/numeric.asciidoc[]
+
+include::types/object.asciidoc[]
+
+include::types/string.asciidoc[]
+
+include::types/token-count.asciidoc[]
 
-include::types/nested-type.asciidoc[]
 
-include::types/ip-type.asciidoc[]
 
-include::types/geo-point-type.asciidoc[]
 
-include::types/geo-shape-type.asciidoc[]
 
-include::types/attachment-type.asciidoc[]