Merge remote-tracking branch 'origin/master'

2016-04-29 15:03:25 +02:00 · 2016-04-29 15:03:25 +02:00 · baceabdf92
parent 6c7a44ccd9 713c0df3a3
commit baceabdf92
1 changed files with 1 additions and 1 deletions
--- a/docs/reference/mapping/types.asciidoc
+++ b/docs/reference/mapping/types.asciidoc
@ -29,7 +29,7 @@ string::        <<text,`text`>> and <<keyword,`keyword`>>
 [float]
 === Specialised datatypes

-<<ip>>::            `ip` for IPv4 addresses
+<<ip>>::            `ip` for IPv4 and IPv6 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