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 /lib/kernel/doc | |
| 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 'lib/kernel/doc')
| -rw-r--r-- | lib/kernel/doc/src/os.xml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml index 621ca6e9ee..5e182de41d 100644 --- a/lib/kernel/doc/src/os.xml +++ b/lib/kernel/doc/src/os.xml @@ -80,6 +80,10 @@ DirOut = os:cmd("dir"), % on Win32 platform</code> Each environment variable is given as a single string on the format <c>"VarName=Value"</c>, where <c>VarName</c> is the name of the variable and <c>Value</c> its value.</p> + <p>If Unicode file name encoding is in effect (see the <seealso + marker="erts:erl#file_name_encoding">erl manual + page</seealso>), the strings may contain characters with + codepoints > 255.</p> </desc> </func> <func> @@ -89,6 +93,10 @@ DirOut = os:cmd("dir"), % on Win32 platform</code> <p>Returns the <c><anno>Value</anno></c> of the environment variable <c><anno>VarName</anno></c>, or <c>false</c> if the environment variable is undefined.</p> + <p>If Unicode file name encoding is in effect (see the <seealso + marker="erts:erl#file_name_encoding">erl manual + page</seealso>), the strings (both <c><anno>VarName</anno></c> and + <c><anno>Value</anno></c>) may contain characters with codepoints > 255.</p> </desc> </func> <func> @@ -111,6 +119,13 @@ DirOut = os:cmd("dir"), % on Win32 platform</code> <desc> <p>Sets a new <c><anno>Value</anno></c> for the environment variable <c><anno>VarName</anno></c>.</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><anno>VarName</anno></c> and + <c><anno>Value</anno></c>) may contain characters with codepoints > 255.</p> + <p>On Unix platforms, the environment will be set using UTF-8 encoding + if Unicode file name translation is in effect. On Windows the + environment is set using wide character interfaces.</p> </desc> </func> <func> |