diff options
author | Hans Bolinder <[email protected]> | 2016-09-02 08:39:12 +0200 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2016-09-02 08:39:12 +0200 |
commit | db096ad15022ae4f9605fa42bf74780641dc6dac (patch) | |
tree | 477e4ec79ce025e2af2ecef46536a6e80413b057 /erts/doc/src/erl_nif.xml | |
parent | 068185ef518384c0141cc643820f3a2a103ff4c3 (diff) | |
parent | ad6e765bcd4f35a282ef00e38ed9129f3a5c1d83 (diff) | |
download | otp-db096ad15022ae4f9605fa42bf74780641dc6dac.tar.gz otp-db096ad15022ae4f9605fa42bf74780641dc6dac.tar.bz2 otp-db096ad15022ae4f9605fa42bf74780641dc6dac.zip |
Merge branch 'hasse/doc/fix_editorial_changes' into maint
* hasse/doc/fix_editorial_changes:
doc: Correct errors introduced by Editorial changes
Diffstat (limited to 'erts/doc/src/erl_nif.xml')
-rw-r--r-- | erts/doc/src/erl_nif.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/doc/src/erl_nif.xml b/erts/doc/src/erl_nif.xml index 4ec5ab78d8..b5dc9037c4 100644 --- a/erts/doc/src/erl_nif.xml +++ b/erts/doc/src/erl_nif.xml @@ -474,7 +474,7 @@ return term;</code> register/unregister its name, and so on.</p> <p>Termination of a process executing a dirty NIF can only be completed up to a certain point while it executes the dirty NIF. - All Erlang resources, such as its registered name and its <c>ets</c> + All Erlang resources, such as its registered name and its ETS tables, are released. All links and monitors are triggered. The execution of the NIF is, however, <em>not</em> stopped. The NIF can safely continue execution, allocate heap memory, and so on, @@ -1573,7 +1573,7 @@ typedef enum { <seealso marker="#enif_raise_exception"> <c>enif_raise_exception</c></seealso>.</p> <note> - <p>Before <c>ERTS</c> 7.0 (Erlang/OTP 18), the return value + <p>Before ERTS 7.0 (Erlang/OTP 18), the return value from <c>enif_make_badarg</c> had to be returned from the NIF. This requirement is now lifted as the return value from the NIF is ignored if <c>enif_make_badarg</c> has been invoked.</p> @@ -2561,7 +2561,7 @@ enif_map_iterator_destroy(env, &iter);</code> thread.</p> <note> <p>Passing <c>msg_env</c> as <c>NULL</c> is only supported as from - <c>ERTS</c> 8.0 (Erlang/OTP 19).</p> + ERTS 8.0 (Erlang/OTP 19).</p> </note> </desc> </func> |