aboutsummaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2017-04-26 16:31:21 +0200
committerSiri Hansen <[email protected]>2017-04-26 16:31:21 +0200
commit77c6f46a92bd695840c25118a28d801ec51372cf (patch)
tree355954be89a1ee3b1b09af0e79f7d910b4854d99 /system
parent157317c25b20e8af3d61fa833fa9554ceb9bb968 (diff)
parenta75bda102900c4a7ae3184efa8250c46a86f8588 (diff)
downloadotp-77c6f46a92bd695840c25118a28d801ec51372cf.tar.gz
otp-77c6f46a92bd695840c25118a28d801ec51372cf.tar.bz2
otp-77c6f46a92bd695840c25118a28d801ec51372cf.zip
Merge branch 'siri/unicode-atoms'
* siri/unicode-atoms: Document that app names and nodes names are restricted to latin-1 Conflicts: lib/stdlib/doc/src/unicode_usage.xml
Diffstat (limited to 'system')
-rw-r--r--system/doc/reference_manual/character_set.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/system/doc/reference_manual/character_set.xml b/system/doc/reference_manual/character_set.xml
index 1129ad63d8..8e41142fb4 100644
--- a/system/doc/reference_manual/character_set.xml
+++ b/system/doc/reference_manual/character_set.xml
@@ -110,7 +110,8 @@
Guide</seealso>.</p>
<p>From Erlang/OTP 20, atoms and function names are also allowed
to contain Unicode characters outside the ISO-Latin-1 range.
- Module names are still restricted to the ISO-Latin-1 range.</p>
+ Module names, application names, and node names are still
+ restricted to the ISO-Latin-1 range.</p>
</section>
<section>
<title>Source File Encoding</title>