aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src/erlang.xml
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2010-06-02 13:15:16 +0000
committerErlang/OTP <[email protected]>2010-06-02 13:15:16 +0000
commita2b84aa66d96ac3f808ca60d2de072992fdb1410 (patch)
tree449a23f20a4c0c263b9eee2329d4b9a9951ee904 /erts/doc/src/erlang.xml
parent841de5287ecef4dae5ea2e78531d8216f9b87989 (diff)
parenta62abc91b5f95fc9137d42867e1429867a77bf4e (diff)
downloadotp-a2b84aa66d96ac3f808ca60d2de072992fdb1410.tar.gz
otp-a2b84aa66d96ac3f808ca60d2de072992fdb1410.tar.bz2
otp-a2b84aa66d96ac3f808ca60d2de072992fdb1410.zip
Merge branch 'jv/autoimport-binary_to_term_2' into dev
* jv/autoimport-binary_to_term_2: Change binary_to_term/2 to be auto-imported OTP-8671 jv/autoimport-binary_to_term_2 Now, binary_to_term/2 is auto-imported. This will cause a compile warning if and only if a module has got a local function with that name.
Diffstat (limited to 'erts/doc/src/erlang.xml')
-rw-r--r--erts/doc/src/erlang.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index e683f161f1..c3c0dd77d7 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -407,7 +407,7 @@ iolist() = [char() | binary() | iolist()]
</desc>
</func>
<func>
- <name>erlang:binary_to_term(Binary, Opts) -> term()</name>
+ <name>binary_to_term(Binary, Opts) -> term()</name>
<fsummary>Decode an Erlang external term format binary</fsummary>
<type>
<v>Opts = [safe]</v>