aboutsummaryrefslogtreecommitdiffstats
path: root/system/doc
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2018-08-24 12:28:40 +0200
committerRickard Green <[email protected]>2018-08-24 12:28:40 +0200
commit4d1422e1d5423725bd5e72e1b1ac1d8c0804ea3a (patch)
tree27feb4365c72b35ff2640a4f5298537ab021c330 /system/doc
parent31af178b6db8fdc6c2066e8c2d8fc8748e3f9f65 (diff)
parente24da191701ebd6aa619f9867c9713f696dc95c8 (diff)
downloadotp-4d1422e1d5423725bd5e72e1b1ac1d8c0804ea3a.tar.gz
otp-4d1422e1d5423725bd5e72e1b1ac1d8c0804ea3a.tar.bz2
otp-4d1422e1d5423725bd5e72e1b1ac1d8c0804ea3a.zip
Merge branch 'maint'
* maint: Refer to OTP Versions Tree from documentation
Diffstat (limited to 'system/doc')
-rw-r--r--system/doc/system_principles/versions.xml29
1 files changed, 28 insertions, 1 deletions
diff --git a/system/doc/system_principles/versions.xml b/system/doc/system_principles/versions.xml
index 11dc9d5637..fbdcc6b2b0 100644
--- a/system/doc/system_principles/versions.xml
+++ b/system/doc/system_principles/versions.xml
@@ -181,7 +181,7 @@
goes for application versions.</p>
<p>In general, versions can have more than three parts.
The versions are then only partially ordered. Such
- versions are only used in exceptional cases. When an extra
+ versions are only used when branching off from another branch. When an extra
part (out of the normal three parts) is added to a version number,
a new branch of versions is made. The new branch has a linear
order against the base version. However, versions on different
@@ -240,6 +240,33 @@
</section>
<section>
+ <marker id="otp_versions_tree"/>
+ <title>OTP Versions Tree</title>
+ <p>
+ All released OTP versions can be found in the
+ <url href="http://www.erlang.org/download/otp_versions_tree.html">OTP
+ Versions Tree</url> which is automatically updated whenever
+ we release a new OTP version. Note that every version number as
+ such explicitly define its position in the version tree. Nothing
+ more than the version numbers are needed in order to construct
+ the tree. The root of the tree is OTP version 17.0 which is when
+ we introduced the new
+ <seealso marker="#version_scheme">version scheme</seealso>. The
+ green versions are normal versions released on the main track.
+ Old <seealso marker="#releases_and_patches">OTP releases</seealso>
+ will be maintained for a while on <c>maint</c> branches that have
+ branched off from the main track. Old <c>maint</c> branches always
+ branch off from the main track when the next OTP release is
+ introduced into the main track. Versions on these old <c>maint</c>
+ branches are marked blue. Besides the green and blue versions,
+ there are also gray versions. These are versions on branches
+ introduced in order to fix a specific problem for a specific
+ customer on a specific base version. Branches with gray versions
+ will typically become dead ends very quickly if not immediately.
+ </p>
+ </section>
+
+ <section>
<marker id="otp_17_0_app_versions"/>
<title>OTP 17.0 Application Versions</title>
<p>The following list details the application versions that