diff options
| author | Sverker Eriksson <[email protected]> | 2013-02-22 15:15:01 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-02-22 15:15:01 +0100 |
| commit | 13b1dcfc31b3c42affafc42c30105abfbebbfbf3 (patch) | |
| tree | 8fa0291b2bd2dc9a1e800198c532a724a5b05f0e /lib/erl_interface/doc/src/ei.xml | |
| parent | 7ad014ac10d87f520d031a9d969473a6bfe20bee (diff) | |
| parent | 969224f54bec6d932aa61b9acc8e76b49604ebcc (diff) | |
| download | otp-13b1dcfc31b3c42affafc42c30105abfbebbfbf3.tar.gz otp-13b1dcfc31b3c42affafc42c30105abfbebbfbf3.tar.bz2 otp-13b1dcfc31b3c42affafc42c30105abfbebbfbf3.zip | |
Merge branch 'sverk/erlang_pid-revert'
* sverk/erlang_pid-revert:
erl_interface: Fix some warnings in test code
erl_interface,ic: Remove node_org_enc from erlang_{pid,port,ref}
Diffstat (limited to 'lib/erl_interface/doc/src/ei.xml')
| -rw-r--r-- | lib/erl_interface/doc/src/ei.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/erl_interface/doc/src/ei.xml b/lib/erl_interface/doc/src/ei.xml index dfe181bd1d..6c340378d4 100644 --- a/lib/erl_interface/doc/src/ei.xml +++ b/lib/erl_interface/doc/src/ei.xml @@ -264,7 +264,9 @@ typedef enum { The <c>p</c> parameter is the name of the atom with character encoding <c><seealso marker="#erlang_char_encoding">from_enc</seealso></c> (ascii, latin1 or utf8). The name must either be zero-terminated or a function variant with a <c>len</c> - parameter must be used.</p> + parameter must be used. If <c>to_enc</c> is set to the bitwise-or'd combination + <c>(ERLANG_LATIN1|ERLANG_UTF8)</c>, utf8 encoding is only used if the atom string + can not be represented in latin1 encoding.</p> <p>The encoding will fail if <c>p</c> is not a valid string in encoding <c>from_enc</c>, if the string is too long or if it can not be represented with character encoding <c>to_enc</c>.</p> <p>These functions were introduced in R16 release of Erlang/OTP as part of a first step |