aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2012-08-20 18:19:52 +0200
committerPatrik Nyblom <[email protected]>2012-08-20 18:19:52 +0200
commita8fb0d0537314f717f9ab33989a5115457c9aab0 (patch)
tree07dcacdaa266c01391a8e422c60c7b6ff9c810cf /erts/doc/src
parent00ef468474d0628903e0a3a3abc7aceb8d2c4061 (diff)
parenta49b1a844febb2740c530895b32c0bb0ae7d5aa0 (diff)
downloadotp-a8fb0d0537314f717f9ab33989a5115457c9aab0.tar.gz
otp-a8fb0d0537314f717f9ab33989a5115457c9aab0.tar.bz2
otp-a8fb0d0537314f717f9ab33989a5115457c9aab0.zip
Merge branch 'maint'
Conflicts: erts/doc/src/erlang.xml erts/preloaded/ebin/init.beam lib/kernel/doc/src/os.xml lib/stdlib/test/filename_SUITE.erl
Diffstat (limited to 'erts/doc/src')
-rw-r--r--erts/doc/src/erl.xml2
-rw-r--r--erts/doc/src/erlang.xml4
2 files changed, 5 insertions, 1 deletions
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index 6221a239fa..126a2199d2 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 35ae44f018..ef0e6fea84 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -2627,6 +2627,10 @@ os_prompt% </pre>
<c>false</c> (in analogy with <c>os:getenv/1</c>), which
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() | binary() ]}</c></tag>
<item>