aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src/erlang.xml
diff options
context:
space:
mode:
authorBruce Yinhe <[email protected]>2014-11-07 11:05:48 +0100
committerBruce Yinhe <[email protected]>2014-11-07 11:05:48 +0100
commit7ee73ff2f7c7b64768903316c4ed9a0faaacfa3e (patch)
treed9678549b4a20e0d984d1635cef650f5e9364b6d /erts/doc/src/erlang.xml
parent702739cd0ca57727b4e32006e2a3ac8023c30bcb (diff)
parent983a39ab079c9f825d31cfe349588a76824d8ef2 (diff)
downloadotp-7ee73ff2f7c7b64768903316c4ed9a0faaacfa3e.tar.gz
otp-7ee73ff2f7c7b64768903316c4ed9a0faaacfa3e.tar.bz2
otp-7ee73ff2f7c7b64768903316c4ed9a0faaacfa3e.zip
Merge branch 'maint'
Diffstat (limited to 'erts/doc/src/erlang.xml')
-rw-r--r--erts/doc/src/erlang.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 226f2c0150..f9e8717847 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -6158,6 +6158,11 @@ ok
<seealso marker="#system_info_multi_scheduling">erlang:system_info(multi_scheduling)</seealso>, and
<seealso marker="#system_info_schedulers">erlang:system_info(schedulers)</seealso>.</p>
</item>
+ <tag><c>nif_version</c></tag>
+ <item>
+ <p>Returns a string containing the erlang NIF version
+ used by the runtime system. It will be on the form "&lt;major ver&gt;.&lt;minor ver&gt;".</p>
+ </item>
<tag><marker id="system_info_otp_release"><c>otp_release</c></marker></tag>
<item>
<p>Returns a string containing the OTP release number of the