aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSiri Hansen <siri@erlang.org>2014-11-18 11:36:55 +0100
committerSiri Hansen <siri@erlang.org>2014-11-18 11:36:55 +0100
commitd4e95c0fe6ea3c298e56f2e30768db3ed1c999ff (patch)
tree9f06e07e64b4a1d2f88a06ade3bab18359b630e6 /erts
parentc85746b2fa2780435051611caa87639c770a4d91 (diff)
parent9366932892711cc4cce7a54b1e098e6d5c3db468 (diff)
downloadotp-d4e95c0fe6ea3c298e56f2e30768db3ed1c999ff.tar.gz
otp-d4e95c0fe6ea3c298e56f2e30768db3ed1c999ff.tar.bz2
otp-d4e95c0fe6ea3c298e56f2e30768db3ed1c999ff.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/erl_ext_dist.xml5
1 files changed, 2 insertions, 3 deletions
diff --git a/erts/doc/src/erl_ext_dist.xml b/erts/doc/src/erl_ext_dist.xml
index fa083db4c7..a6e7dddbed 100644
--- a/erts/doc/src/erl_ext_dist.xml
+++ b/erts/doc/src/erl_ext_dist.xml
@@ -126,9 +126,8 @@
However, only characters that can be encoded using Latin1 (ISO-8859-1)
are currently supported in atoms. The support for UTF-8 encoded atoms
in the external format has been implemented in order to be able to support
- all Unicode characters in atoms in <em>some future release</em>. Full
- support for Unicode atoms will not happen before OTP-R18, and might
- be introduced even later than that. Until full Unicode support for
+ all Unicode characters in atoms in <em>some future release</em>.
+ Until full Unicode support for
atoms has been introduced, it is an <em>error</em> to pass atoms containing
characters that cannot be encoded in Latin1, and <em>the behavior is
undefined</em>.</p>