aboutsummaryrefslogtreecommitdiffstats
path: root/system/doc/system_principles
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2015-03-17 12:36:03 +0100
committerRickard Green <[email protected]>2015-03-17 12:36:03 +0100
commitf991b0bb0ce200967f73b4d6505956a56e358b21 (patch)
treeb4e4334aad4a493155e8a7444d465a7eb24ea3eb /system/doc/system_principles
parent281892c5d7b7b5e1ac2402390d83287913aefd94 (diff)
parent39cdf58cbf7de695917204763a0cd7b52606fb5e (diff)
downloadotp-f991b0bb0ce200967f73b4d6505956a56e358b21.tar.gz
otp-f991b0bb0ce200967f73b4d6505956a56e358b21.tar.bz2
otp-f991b0bb0ce200967f73b4d6505956a56e358b21.zip
Merge branch 'maint'
* maint: Minor fixes Conflicts: system/doc/system_principles/versions.xml
Diffstat (limited to 'system/doc/system_principles')
-rw-r--r--system/doc/system_principles/versions.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/system/doc/system_principles/versions.xml b/system/doc/system_principles/versions.xml
index 25eb90f626..a0f13774ce 100644
--- a/system/doc/system_principles/versions.xml
+++ b/system/doc/system_principles/versions.xml
@@ -63,8 +63,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. Notice that if a development system is updated by