From fe49fef4fc2eafd56a81024304df2efe13f0036b Mon Sep 17 00:00:00 2001 From: dsiders Date: Mon, 26 Jun 2023 15:43:44 +0100 Subject: [PATCH] Docs: LCL, LazUtils. Corrects language in minor version number topics. --- docs/xml/lazutils/lazversion.xml | 25 +++++++++++++------------ docs/xml/lcl/lclversion.xml | 15 ++++++++------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/docs/xml/lazutils/lazversion.xml b/docs/xml/lazutils/lazversion.xml index afa6a49091..f20f09ffc1 100644 --- a/docs/xml/lazutils/lazversion.xml +++ b/docs/xml/lazutils/lazversion.xml @@ -24,12 +24,13 @@ significant. The release number will always be 0 (zero) starting with version 3.0.

-In addition, an odd minor version numbers no longer indicate that it is a +In addition, an odd minor version number no longer indicates that it is a development (or trunk) version. Instead, odd minor version numbers like 3.1 or -3.3 represent a fixes branch. For example: 3.1 would contain bug fixes for the -3.0 branch and would be used as the basis for the first 3.2 release. -Development (or trunk) versions are always represented as minor version number -99; i.e. 3.99 is the development branch for the version 3.X family. +3.3 represent fixes releases. For example: 3.1 would contain bug fixes for the +3.0 release and would be used as the basis for the 3.2 release. Development +(or trunk) versions are always represented as minor version number 99; i.e. +3.99 is the development branch for future releases such as fixes in the 3.X +family and the future 4.0 release.

lazversion.pas is part of the lazutils package. @@ -75,13 +76,13 @@ For the Lazarus version number 2.3.0.42, the value in laz_minor is 3.

Please note: Starting with Lazarus version 3.0, laz_minor is incremented by 1 for each new release or fixes branch. For example: 3.0, 3.1, -3.2, ad infinitum. In addition, an odd minor version number no longer +3.2, etc. In addition, an odd minor version number no longer indicates that it is a development (or trunk) version. Instead, odd minor -version numbers like 3.1 or 3.3 represent a fixes branch. For example: 3.1 -would contain bug fixes for the 3.0 branch and would be used as the basis for -the first 3.2 release. Development (or trunk) versions are always represented -as minor version number 99; i.e. 3.99 is the development branch for the version -3.X family. +version numbers like 3.1 or 3.3 are fixes releases. For example: 3.1 +would contain bug fixes for the 3.0 release and would be used as the basis for +the 3.2 release. Development (or trunk) versions are always represented as +minor version number 99; i.e. 3.99 is the development branch for future +releases such as fixes in the 3.X family and the future 4.0 release.

@@ -104,7 +105,7 @@ For the Lazarus version number 2.3.0.42, the value in laz_release is 0.

Please note: Starting with Lazarus 3.0, the release number is no longer used and will always contain 0 (zero). Releases are represented using the -major and minor version numbers: 3.0, 3.1, 3.2, ad infinitum. +major and minor version numbers: 3.0, 3.1, 3.2, etc.

diff --git a/docs/xml/lcl/lclversion.xml b/docs/xml/lcl/lclversion.xml index 4fc500dac5..51271f1522 100644 --- a/docs/xml/lcl/lclversion.xml +++ b/docs/xml/lcl/lclversion.xml @@ -57,13 +57,14 @@ contains the second number (2).

Please note: Starting with LCL version 3.0, lcl_minor is incremented by -1 for each new release or fixes branch. For example: 3.0, 3.1, 3.2, ad -infinitum. In addition, odd minor version numbers no longer indicate that it -is a development (or trunk) version. Instead, odd minor version numbers like -3.1 or 3.3 represent a fixes branch. For example: 3.1 would contain bug fixes -for the 3.0 branch and would be used as the basis for the first 3.2 release. +1 for each new release or fixes branch. For example: 3.0, 3.1, 3.2, etc. In +addition, an odd minor version number no longer indicates that it is a +development (or trunk) version. Instead, odd minor version numbers like 3.1 or +3.3 represent a fixes release. For example: 3.1 would contain bug fixes for +the 3.0 release and would be used as the basis for the 3.2 release. Development (or trunk) versions are always represented as minor version number -99; i.e. 3.99 is the development branch for the version 3.X family. +99; i.e. 3.99 is the development branch for future releases such as fixes in +the 3.X family and the future 4.0 release.

lcl_version @@ -79,7 +80,7 @@ contains the third number (4).

Please note: Starting with LCL 3.0, the release number is no longer used and will always contain 0 (zero). Releases are represented using the -major and minor version numbers: 3.0, 3.1, 3.2, ad infinitum. +major and minor version numbers: 3.0, 3.1, 3.2, etc.

lcl_version