aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/doc/src
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2012-08-30 15:40:32 +0200
committerLukas Larsson <[email protected]>2012-08-30 15:40:32 +0200
commit3f959449578ce652aad353631f3c3c51aa7b5d50 (patch)
tree696e7cccf5a9d9b1515323951e8e880311e8619b /lib/stdlib/doc/src
parentc7787af81f8cf4ae2991ee5c032fb4a7cd29d29d (diff)
parent24f0d49642ecc0cc566055f1c5b8c49e65c42537 (diff)
downloadotp-3f959449578ce652aad353631f3c3c51aa7b5d50.tar.gz
otp-3f959449578ce652aad353631f3c3c51aa7b5d50.tar.bz2
otp-3f959449578ce652aad353631f3c3c51aa7b5d50.zip
Merge branch 'maint'
* maint: Document that CTHs can get fail/skip as Config Ignore calls to dialyzer_timing when checking deprecated Do not verify del_path as it is not always there Fix broken links Generate <a name="name"> tags in edoc xml headings Fix compile warning crypto: Fix buffer overflow bug in rsa_sign crypto: Skip some tests if openssl lib < 0.9.8 Fix boken spec
Diffstat (limited to 'lib/stdlib/doc/src')
-rw-r--r--lib/stdlib/doc/src/unicode_usage.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/doc/src/unicode_usage.xml b/lib/stdlib/doc/src/unicode_usage.xml
index b7b5d497d0..acd36d2125 100644
--- a/lib/stdlib/doc/src/unicode_usage.xml
+++ b/lib/stdlib/doc/src/unicode_usage.xml
@@ -212,7 +212,7 @@ Eshell V5.7 (abort with ^G)
<section>
<title>Unicode in environment variables and parameters</title>
<p>Environment variables and their interpretation is handled much in the same way as file names. If Unicode file names are enabled, environment variables as well as parameters to the Erlang VM are expected to be in Unicode.</p>
-<p>If Unicode file names are enabled, the calls to <seealso marker="kernel:os#os_getenv/0"><c>os:getenv/0</c></seealso>, <seealso marker="kernel:os#os_getenv/1"><c>os:getenv/1</c></seealso> and <seealso marker="kernel:os#os_putenv/2"><c>os:putenv/2</c></seealso> will handle Unicode strings. On Unix-like platforms, the built-in functions will translate environment variables in UTF-8 to/from Unicode strings, possibly with codepoints > 255. On Windows the Unicode versions of the environment system API will be used, also allowing for codepoints > 255.</p>
+<p>If Unicode file names are enabled, the calls to <seealso marker="kernel:os#getenv/0"><c>os:getenv/0</c></seealso>, <seealso marker="kernel:os#getenv/1"><c>os:getenv/1</c></seealso> and <seealso marker="kernel:os#putenv/2"><c>os:putenv/2</c></seealso> will handle Unicode strings. On Unix-like platforms, the built-in functions will translate environment variables in UTF-8 to/from Unicode strings, possibly with codepoints > 255. On Windows the Unicode versions of the environment system API will be used, also allowing for codepoints > 255.</p>
<p>On Unix-like operating systems, parameters are expected to be UTF-8 without translation if Unicode file names are enabled.</p>
</section>
<section>