diff options
| author | Rickard Green <[email protected]> | 2014-02-21 11:34:29 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-02-21 11:34:29 +0100 |
| commit | dd298cc2d6b21e8c387ac525bd678f0dfa8853f3 (patch) | |
| tree | e59914298c52fec7fb00234eb4f22517367f3a44 /erts/doc | |
| parent | 986611be9b5050969a58e8bdce864b0eb91133d5 (diff) | |
| parent | 3fd4e3e770fbed95fd6fa2d547945ac71256339c (diff) | |
| download | otp-dd298cc2d6b21e8c387ac525bd678f0dfa8853f3.tar.gz otp-dd298cc2d6b21e8c387ac525bd678f0dfa8853f3.tar.bz2 otp-dd298cc2d6b21e8c387ac525bd678f0dfa8853f3.zip | |
Merge branch 'rickard/otp_version/OTP-11615'
* rickard/otp_version/OTP-11615:
Misc adjustments of OTP version
Diffstat (limited to 'erts/doc')
| -rw-r--r-- | erts/doc/src/Makefile | 2 | ||||
| -rw-r--r-- | erts/doc/src/erlang.xml | 19 |
2 files changed, 12 insertions, 9 deletions
diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile index d4c6fe67d2..e8b856c3ff 100644 --- a/erts/doc/src/Makefile +++ b/erts/doc/src/Makefile @@ -139,7 +139,7 @@ man: $(MAN1_FILES) $(MAN3_FILES) gifs: $(GIF_FILES:%=$(HTMLDIR)/%) -$(INFO_FILE): $(INFO_FILE_SRC) ../../vsn.mk +$(INFO_FILE): $(INFO_FILE_SRC) $(ERL_TOP)/make/$(TARGET)/otp.mk sed -e 's;%RELEASE%;$(SYSTEM_VSN);' $(INFO_FILE_SRC) > $(INFO_FILE) diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index 4cf5631727..0f312fb430 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -6094,16 +6094,19 @@ 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> + <p>Returns a string containing the OTP release number of the + OTP release that the currently executing ERTS application is + part of.</p> + <p>As of OTP release 17, the OTP release number corresponds to + the major OTP version number. There is no + <c>erlang:system_info()</c> argument giving the exact OTP + version. This since the exact OTP version in the general case + is hard to determine. For more information see + <seealso marker="doc/installation_guide:otp_version">the + documentation of the OTP version in the installation + guide</seealso>.</p> </item> <tag><marker id="system_info_port_parallelism"><c>port_parallelism</c></marker></tag> <item><p>Returns the default port parallelism scheduling hint used. |