aboutsummaryrefslogtreecommitdiffstats
path: root/system/doc
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2014-11-18 11:36:55 +0100
committerSiri Hansen <[email protected]>2014-11-18 11:36:55 +0100
commitd4e95c0fe6ea3c298e56f2e30768db3ed1c999ff (patch)
tree9f06e07e64b4a1d2f88a06ade3bab18359b630e6 /system/doc
parentc85746b2fa2780435051611caa87639c770a4d91 (diff)
parent9366932892711cc4cce7a54b1e098e6d5c3db468 (diff)
downloadotp-d4e95c0fe6ea3c298e56f2e30768db3ed1c999ff.tar.gz
otp-d4e95c0fe6ea3c298e56f2e30768db3ed1c999ff.tar.bz2
otp-d4e95c0fe6ea3c298e56f2e30768db3ed1c999ff.zip
Merge branch 'maint'
Diffstat (limited to 'system/doc')
-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>