diff options
| author | Patrik Nyblom <[email protected]> | 2012-08-20 18:19:52 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2012-08-20 18:19:52 +0200 |
| commit | a8fb0d0537314f717f9ab33989a5115457c9aab0 (patch) | |
| tree | 07dcacdaa266c01391a8e422c60c7b6ff9c810cf /erts/doc/src/erlang.xml | |
| parent | 00ef468474d0628903e0a3a3abc7aceb8d2c4061 (diff) | |
| parent | a49b1a844febb2740c530895b32c0bb0ae7d5aa0 (diff) | |
| download | otp-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/erlang.xml')
| -rw-r--r-- | erts/doc/src/erlang.xml | 4 |
1 files changed, 4 insertions, 0 deletions
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> |