diff options
| author | Rickard Green <[email protected]> | 2015-03-17 12:33:00 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-03-17 12:33:00 +0100 |
| commit | 39cdf58cbf7de695917204763a0cd7b52606fb5e (patch) | |
| tree | 55cf4574f36d838d0aa11c2e7961ca3d8a5fdf02 /system | |
| parent | b3e72b5969a3dd7d22e67b2484e3ba390975a034 (diff) | |
| parent | 0ae3124f2d80307fd1bb80a83537ba8466a18081 (diff) | |
| download | otp-39cdf58cbf7de695917204763a0cd7b52606fb5e.tar.gz otp-39cdf58cbf7de695917204763a0cd7b52606fb5e.tar.bz2 otp-39cdf58cbf7de695917204763a0cd7b52606fb5e.zip | |
Merge branch 'rickard/otp_patch_apply/OTP-12565' into maint
* rickard/otp_patch_apply/OTP-12565:
Minor fixes
Diffstat (limited to 'system')
| -rw-r--r-- | system/doc/system_principles/versions.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/system/doc/system_principles/versions.xml b/system/doc/system_principles/versions.xml index ff042f4a3b..ed6fd1f7fe 100644 --- a/system/doc/system_principles/versions.xml +++ b/system/doc/system_principles/versions.xml @@ -61,8 +61,9 @@ <c>filename:join([<seealso marker="kernel:code#root_dir/0">code:root_dir()</seealso>, "releases", <seealso marker="erts:erlang#system_info_otp_release">erlang:system_info(otp_release)</seealso>, "OTP_VERSION"]).</c></p> <p>If the version read from the <c>OTP_VERSION</c> file in a development system has a <c>**</c> suffix, the system has been - patched using the <c>otp_patch_apply</c> tool available to - licensed customers. In this case, the system consists of application + patched using the + <seealso marker="../installation_guide/OTP-PATCH-APPLY"><c>otp_patch_apply</c></seealso> + tool. In this case, the system consists of application versions from multiple OTP versions. The version preceding the <c>**</c> suffix corresponds to the OTP version of the base system that has been patched. Note that if a development system is updated by |