aboutsummaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorSiri Hansen <siri@erlang.org>2014-11-18 10:07:16 +0100
committerSiri Hansen <siri@erlang.org>2014-11-18 10:07:16 +0100
commit9366932892711cc4cce7a54b1e098e6d5c3db468 (patch)
treec876bac66f4cedd5c407b3a595b6f1b2b896f3a5 /system
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 'system')
-rw-r--r--system/doc/reference_manual/character_set.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/system/doc/reference_manual/character_set.xml b/system/doc/reference_manual/character_set.xml
index 884898eb34..b09b484582 100644
--- a/system/doc/reference_manual/character_set.xml
+++ b/system/doc/reference_manual/character_set.xml
@@ -101,9 +101,10 @@
<tcaption>Character Classes.</tcaption>
</table>
<p>In Erlang/OTP R16B the syntax of Erlang tokens was extended to
- handle Unicode. To begin with the support is limited to
- strings, but Erlang/OTP 18 is expected to handle Unicode atoms
- as well. More about the usage of Unicode in Erlang source files
+ handle Unicode. The support is limited to
+ string literals and comments. Atoms, module names, and
+ function names are restricted to the ISO-Latin-1 range.
+ More about the usage of Unicode in Erlang source files
can be found in <seealso
marker="stdlib:unicode_usage#unicode_in_erlang">STDLIB's User's
Guide</seealso>.</p>