aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src
diff options
context:
space:
mode:
authorBruce Yinhe <[email protected]>2014-11-07 11:05:24 +0100
committerBruce Yinhe <[email protected]>2014-11-07 11:05:24 +0100
commit983a39ab079c9f825d31cfe349588a76824d8ef2 (patch)
tree3c786022f024d95596b241ec09de792f84afc381 /erts/doc/src
parent9884666f91519bec7f63fe925857811cf6385cf7 (diff)
parent1bc59d68f5d22650fa18aa064ed8e50fc9a6a216 (diff)
downloadotp-983a39ab079c9f825d31cfe349588a76824d8ef2.tar.gz
otp-983a39ab079c9f825d31cfe349588a76824d8ef2.tar.bz2
otp-983a39ab079c9f825d31cfe349588a76824d8ef2.zip
Merge branch 'lemenkov/expose_nif_version' into maint
OTP-12298 * lemenkov/expose_nif_version: Expose NIF version
Diffstat (limited to 'erts/doc/src')
-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 111756407f..483d81cfb6 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -6144,6 +6144,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