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

2 files changed, 11 insertions, 9 deletions

diff --git a/lib/stdlib/doc/src/unicode_usage.xml b/lib/stdlib/doc/src/unicode_usage.xml
index 11b84f552a..6af2fa9fa3 100644
--- a/lib/stdlib/doc/src/unicode_usage.xml
+++ b/lib/stdlib/doc/src/unicode_usage.xml
@@ -64,8 +64,8 @@
 	source files was switched to UTF-8.</p></item>
 
 	<item><p>In Erlang/OTP 20.0, atoms and function can contain
-	Unicode characters. Module names are still restricted to
-	the ISO-Latin-1 range.</p>
+	Unicode characters. Module names, application names, and node
+	names are still restricted to the ISO Latin-1 range.</p>
 	<p>Support was added for normalizations forms in
 	<c>unicode</c> and the <c>string</c> module now handles
 	utf8-encoded binaries.</p></item>
@@ -352,10 +352,11 @@
         <p>Having the source code in UTF-8 also allows you to write string
           literals, function names, and atoms containing Unicode
 	  characters with code points &gt; 255.
-          Module names are still restricted to the ISO Latin-1 range.
-	  Binary literals, where you use type
+          Module names, application names, and node names are still restricted
+	  to the ISO Latin-1 range. Binary literals, where you use type
           <c>/utf8</c>, can also be expressed using Unicode characters &gt; 255.
-          Having module names using characters other than 7-bit ASCII can cause
+          Having module names or application names using characters other than
+	  7-bit ASCII can cause
           trouble on operating systems with inconsistent file naming schemes,
           and can hurt portability, so it is not recommended.</p>
         <p>EEP 40 suggests that the language is also to allow for Unicode
@@ -451,8 +452,8 @@ external_charlist() = maybe_improper_list(char() | external_unicode_binary() |
     marker="stdlib:epp#encoding"><c>epp(3)</c></seealso> module.  As
     from Erlang/OTP R16, strings and comments can be written using
     Unicode.  As from Erlang/OTP 20, also atoms and functions can be
-    written using Unicode. Modules names must still be named using
-    characters from the ISO Latin-1 character set.  (These
+    written using Unicode. Modules, applications, and nodes must still be
+    named using characters from the ISO Latin-1 character set.  (These
     restrictions in the language are independent of the encoding of
     the source file.)</p>
 
@@ -780,7 +781,7 @@ Eshell V5.10.1  (abort with ^G)
     filenames or directory names. If the file system content is
     listed, you also get Unicode lists as return value. The support
     lies in the Kernel and STDLIB modules, which is why
-    most applications (that does not explicitly require the filenames
+    most applications (that do not explicitly require the filenames
     to be in the ISO Latin-1 range) benefit from the Unicode support
     without change.</p>
 
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>