diff options
| author | Rickard Green <[email protected]> | 2015-03-17 12:31:48 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-03-17 12:31:48 +0100 |
| commit | 0ae3124f2d80307fd1bb80a83537ba8466a18081 (patch) | |
| tree | 55cf4574f36d838d0aa11c2e7961ca3d8a5fdf02 | |
| parent | 700dde22b771cf535703a42887971a146202eae1 (diff) | |
| download | otp-0ae3124f2d80307fd1bb80a83537ba8466a18081.tar.gz otp-0ae3124f2d80307fd1bb80a83537ba8466a18081.tar.bz2 otp-0ae3124f2d80307fd1bb80a83537ba8466a18081.zip | |
Minor fixes
| -rw-r--r-- | HOWTO/OTP-PATCH-APPLY.md | 1 | ||||
| -rwxr-xr-x | otp_patch_apply | 15 | ||||
| -rw-r--r-- | system/doc/system_principles/versions.xml | 5 |
3 files changed, 19 insertions, 2 deletions
diff --git a/HOWTO/OTP-PATCH-APPLY.md b/HOWTO/OTP-PATCH-APPLY.md index 936de02d07..2aa31629ef 100644 --- a/HOWTO/OTP-PATCH-APPLY.md +++ b/HOWTO/OTP-PATCH-APPLY.md @@ -58,6 +58,7 @@ Configure and build all applications in OTP: $ configure $ make + or $ ./otp_build configure diff --git a/otp_patch_apply b/otp_patch_apply index a1f244eab3..947aa1e6ee 100755 --- a/otp_patch_apply +++ b/otp_patch_apply @@ -1,7 +1,22 @@ #!/bin/sh # +# %CopyrightBegin% +# # Copyright Ericsson AB 2014. All Rights Reserved. # +# The contents of this file are subject to the Erlang Public License, +# Version 1.1, (the "License"); you may not use this file except in +# compliance with the License. You should have received a copy of the +# Erlang Public License along with this software. If not, it can be +# retrieved online at http://www.erlang.org/. +# +# Software distributed under the License is distributed on an "AS IS" +# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See +# the License for the specific language governing rights and limitations +# under the License. +# +# %CopyrightEnd% +# version="1.0.1" 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 |