aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2014-01-13 20:38:24 +0100
committerRickard Green <[email protected]>2014-01-13 20:38:24 +0100
commitfc8cc0057b1f492f359d4f644fe93fdbc75074e8 (patch)
tree63f496f61ea5e63605c5346bd267a9d0f312a96b /erts/doc
parent589eba64f9c1fdef8a717c930aa8a51c47291a53 (diff)
parent47979206defa9429458e419b691138ab1b519833 (diff)
downloadotp-fc8cc0057b1f492f359d4f644fe93fdbc75074e8.tar.gz
otp-fc8cc0057b1f492f359d4f644fe93fdbc75074e8.tar.bz2
otp-fc8cc0057b1f492f359d4f644fe93fdbc75074e8.zip
Merge branch 'rickard/otp-17-vsn-fix'
* rickard/otp-17-vsn-fix: Fix issues with new versioning
Diffstat (limited to 'erts/doc')
-rw-r--r--erts/doc/src/erlang.xml7
1 files changed, 7 insertions, 0 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 711473afd2..124302a2cb 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -6008,6 +6008,13 @@ 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><marker id="system_info_otp_correction_package"><c>otp_correction_package</c></marker></tag>
+ <item>
+ <p>Returns a string containing the OTP correction package version
+ number that currenly executing VM is part of. Note that other
+ OTP applications in the system may be part of other OTP correction
+ packages.</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.</p>