diff options
| author | Erlang/OTP <[email protected]> | 2010-06-09 12:30:30 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-06-09 12:30:30 +0000 |
| commit | 6f06c6189a3527a1981043b09323e4233bac4ebd (patch) | |
| tree | 91f93dd66f8f5ba8727c58060fb481984fff49d4 /erts | |
| parent | 26fbd5b3ed713afef6c443762f8aefd6367052e6 (diff) | |
| parent | bff165da260571012aa02b6c325b728297d2550f (diff) | |
| download | otp-6f06c6189a3527a1981043b09323e4233bac4ebd.tar.gz otp-6f06c6189a3527a1981043b09323e4233bac4ebd.tar.bz2 otp-6f06c6189a3527a1981043b09323e4233bac4ebd.zip | |
Merge branch 'pan/otp_8669_doc_autoimported' into dev
* pan/otp_8669_doc_autoimported:
Change documentation for erlang:min/2,max/2 and port_command/3 to
OTP-8669 erlang:min, erlang:max and erlang:port_command/3 autoimported
The recently added BIFs erlang:min/2, erlang:max/2 and
erlang:port_command/3 are now auto-imported (as they were originally
intended to be). Due to the recent compiler change (OTP-8579), the only
impact on old code defining it's own min/2, max/2 or port_command/3
functions will be a warning, the local functions will still be used. The
warning can be removed by using
-compile({no_auto_import,[min/2,max/2,port_command/3]}). in the source
file.
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/doc/src/erlang.xml | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index 3c64fe2bef..77a628e82b 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -2209,7 +2209,7 @@ os_prompt%</pre> </desc> </func> <func> - <name>erlang:max(Term1, Term2) -> Maximum</name> + <name>max(Term1, Term2) -> Maximum</name> <fsummary>Return the largest of two term</fsummary> <type> <v>Term1 = Term2 = Maximum = term()</v> @@ -2458,7 +2458,7 @@ os_prompt%</pre> </desc> </func> <func> - <name>erlang:min(Term1, Term2) -> Minimum</name> + <name>min(Term1, Term2) -> Minimum</name> <fsummary>Return the smallest of two term</fsummary> <type> <v>Term1 = Term2 = Minimum = term()</v> @@ -3231,7 +3231,7 @@ os_prompt%</pre> </desc> </func> <func> - <name>erlang:port_command(Port, Data, OptionList) -> true|false</name> + <name>port_command(Port, Data, OptionList) -> true|false</name> <fsummary>Send data to a port</fsummary> <type> <v>Port = port() | atom()</v> @@ -3267,10 +3267,6 @@ os_prompt%</pre> <note> <p>More options may be added in the future.</p> </note> - <note> - <p><c>erlang:port_command/3</c> is currently not auto imported, but - it is planned to be auto imported in OTP R14.</p> - </note> <p>Failures:</p> <taglist> <tag><c>badarg</c></tag> |