aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2014-11-18 10:07:16 +0100
committerSiri Hansen <[email protected]>2014-11-18 10:07:16 +0100
commit9366932892711cc4cce7a54b1e098e6d5c3db468 (patch)
treec876bac66f4cedd5c407b3a595b6f1b2b896f3a5 /erts
parent761e1318abdaee269be8cdcbb6b3e6f5d3f2a65d (diff)
parent08504087f66ab23e39c082782524e2d1e531e3e7 (diff)
downloadotp-9366932892711cc4cce7a54b1e098e6d5c3db468.tar.gz
otp-9366932892711cc4cce7a54b1e098e6d5c3db468.tar.bz2
otp-9366932892711cc4cce7a54b1e098e6d5c3db468.zip
Merge branch 'siri/no-unicode-atoms/OTP-12172' into maint
* siri/no-unicode-atoms/OTP-12172: Remove comments about unicode atoms in OTP 18
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>