diff --git a/docs/reference/glossary.asciidoc b/docs/reference/glossary.asciidoc index f8369c1737a2e..0318af69574bd 100644 --- a/docs/reference/glossary.asciidoc +++ b/docs/reference/glossary.asciidoc @@ -113,7 +113,7 @@ In the delete phase, an index is no longer needed and can safely be deleted. A document is a JSON document which is stored in Elasticsearch. It is like a row in a table in a relational database. Each document is -stored in an <> and has a <> and an +stored in an <> and has a type and an <>. + A document is a JSON object (also known in other languages as a hash / @@ -140,7 +140,7 @@ date), or a nested structure like an array or an object. A field is similar to a column in a table in a relational database. + The <> for each field has a field _type_ (not to -be confused with document <>) which indicates the type +be confused with document type) which indicates the type of data that can be stored in that field, eg `integer`, `string`, `object`. The mapping also allows you to define (amongst other things) how the value for a field should be analyzed. @@ -324,7 +324,7 @@ The cluster that pulls data from a <> in [[glossary-mapping]] mapping :: A mapping is like a _schema definition_ in a relational database. Each -<> has a mapping, which defines a <>, +<> has a mapping, which defines a type, plus a number of index-wide settings. + A mapping can either be defined explicitly, or it will be generated