From b6196f5d47c06e6991cfc7e76db3d588a7797302 Mon Sep 17 00:00:00 2001
From: Patrik Nyblom <pan@erlang.org>
Date: Tue, 14 Aug 2012 15:02:43 +0200
Subject: Add documetation about Unicode in environment

---
 erts/doc/src/erl.xml    | 2 +-
 erts/doc/src/erlang.xml | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'erts/doc/src')

diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index f8a92e1ec4..8c028e1d14 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -533,7 +533,7 @@
         <p>Force the <c>compressed</c> option on all ETS tables.
               Only intended for test and evaluation.</p>
       </item>
-      <tag><c><![CDATA[+fnl]]></c></tag>
+      <tag><marker id="file_name_encoding"></marker><c><![CDATA[+fnl]]></c></tag>
       <item>
         <p>The VM works with file names as if they are encoded using the ISO-latin-1 encoding, disallowing Unicode characters with codepoints beyond 255. This is default on operating systems that have transparent file naming, i.e. all Unixes except MacOSX.</p>
       </item>
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index e69f223897..248b755969 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -3039,8 +3039,11 @@ os_prompt% </pre>
               port process. Both <c>Name</c> and <c>Val</c> must be
               strings. The one exception is <c>Val</c> being the atom
               <c>false</c> (in analogy with <c>os:getenv/1</c>), which
-              removes the environment variable. Not available on
-              VxWorks.</p>
+              removes the environment variable.</p>
+	      <p>If Unicode filename encoding is in effect (see the <seealso
+	      marker="erts:erl#file_name_encoding">erl manual
+	      page</seealso>), the strings (both <c>Name</c> and
+	      <c>Value</c>) may contain characters with codepoints > 255.</p>
           </item>
 	  <tag><c>{args, [ string() ]}</c></tag>
           <item>
-- 
cgit v1.2.3