From 853dc07b4e539e36d390ad0d38167aead19d7111 Mon Sep 17 00:00:00 2001
From: Pavel Semyonov
Date: Mon, 26 Feb 2024 12:54:14 +0700
Subject: [PATCH 01/11] Restructure releases section
---
doc/release/3.0.0.rst | 2 +-
doc/release/calendar.rst | 159 +++++------------------------------
doc/release/eol_versions.rst | 143 ++++++++++++++++++++++++++++++-
doc/release/index.rst | 74 +++++++++++++---
doc/release/policy.rst | 3 +-
5 files changed, 225 insertions(+), 156 deletions(-)
diff --git a/doc/release/3.0.0.rst b/doc/release/3.0.0.rst
index b0115ee35a..0a346837dd 100644
--- a/doc/release/3.0.0.rst
+++ b/doc/release/3.0.0.rst
@@ -3,7 +3,7 @@ Tarantool 3.0
Release date: December 26, 2023
-Releases on GitHub: :tarantool-release:`3.0.0`
+Releases on GitHub: :tarantool-release:`3.0.1`, :tarantool-release:`3.0.0`
The 3.0 release of Tarantool introduces a new declarative approach for configuring a cluster,
a new visual tool -- Tarantool Cluster Manager,
diff --git a/doc/release/calendar.rst b/doc/release/calendar.rst
index 21c4e1ece2..6c47911be7 100644
--- a/doc/release/calendar.rst
+++ b/doc/release/calendar.rst
@@ -17,13 +17,13 @@ as well as currently supported versions visualised as a calendar:
Release lifetime table
----------------------
-The release lifetime table lists all Tarantool versions
-starting from 1.10.x up to the current latest versions.
+The release lifetime table lists all currently supported Tarantool versions.
Each link leads to the release notes page of the corresponding version.
*End of life* means the release series will no longer receive any patches, updates,
or feature improvements after the specified date.
*End of support* means that we won't provide technical support to product versions
after the specified date.
+Versions that haven't reached their end of life yet are highlighted with **bold**.
.. container:: table
@@ -34,25 +34,30 @@ after the specified date.
- End of life
- End of support
+ * - `3.0.1 `_
+ - **January 25, 2024**
+ - **December 26, 2025**
+ - **Not planned yet**
+
* - :doc:`3.0.0 `
- - December 26, 2023
- - December 26, 2025
- - Not planned yet
+ - **December 26, 2023**
+ - **December 26, 2025**
+ - **Not planned yet**
* - `2.11.2 LTS `_
- - December 7, 2023
- - May 24, 2025
- - Not planned yet
+ - **December 7, 2023**
+ - **May 24, 2025**
+ - **Not planned yet**
* - `2.11.1 LTS `_
- - August 17, 2023
- - May 24, 2025
- - Not planned yet
+ - **August 17, 2023**
+ - **May 24, 2025**
+ - **Not planned yet**
* - :doc:`2.11.0 LTS `
- - May 24, 2023
- - May 24, 2025
- - Not planned yet
+ - **May 24, 2023**
+ - **May 24, 2025**
+ - **Not planned yet**
* - :doc:`2.10.8 `
- September 14, 2023
@@ -114,132 +119,6 @@ after the specified date.
- April 25, 2022
- Not planned yet
- * - :doc:`2.7.3 `
- - August 19, 2021
- - August 19, 2021
- - August 19, 2021
-
- * - :doc:`2.7.2 `
- - April 21, 2021
- - August 19, 2021
- - August 19, 2021
-
- * - :doc:`2.6.3 `
- - April 21, 2021
- - April 21, 2021
- - April 21, 2021
-
- * - :doc:`2.6.2 `
- - December 30, 2020
- - April 21, 2021
- - April 21, 2021
-
- * - :doc:`2.5.3 `
- - December 30, 2020
- - December 30, 2020
- - December 30, 2020
-
- * - :doc:`2.5.2 `
- - October 22, 2020
- - December 30, 2020
- - December 30, 2020
-
- * - :doc:`2.4.3 `
- - October 22, 2020
- - October 22, 2020
- - October 22, 2020
-
- * - :doc:`2.4.2 `
- - July 17, 2020
- - October 22, 2020
- - October 22, 2020
-
- * - :doc:`2.3.3 `
- - July 17, 2020
- - July 17, 2020
- - July 17, 2020
-
- * - :doc:`2.3.2 `
- - April 20, 2020
- - July 17, 2020
- - July 17, 2020
-
- * - :doc:`2.2.3 `
- - April 20, 2020
- - April 20, 2020
- - April 20, 2020
-
- * - :doc:`2.2.2 `
- - December 31, 2019
- - April 20, 2020
- - April 20, 2020
-
- * - :doc:`1.10.15 LTS `
- - February 20, 2023
- - February 20, 2023
- - February, 2024
-
- * - :doc:`1.10.14 LTS `
- - August 8, 2022
- - February 20, 2023
- - February, 2024
-
- * - :doc:`1.10.13 LTS `
- - April 25, 2022
- - February 20, 2023
- - February, 2024
-
- * - :doc:`1.10.12 LTS `
- - December 22, 2021
- - February 20, 2022
- - February 20, 2023
- * - :doc:`1.10.11 LTS `
- - August 19, 2021
- - February 20, 2022
- - February 20, 2023
- * - :doc:`1.10.10 LTS `
- - April 24, 2021
- - February 20, 2022
- - February 20, 2023
- * - :doc:`1.10.9 LTS `
- - December 30, 2020
- - February 20, 2022
- - February 20, 2023
-
- * - :doc:`1.10.8 LTS `
- - October 22, 2020
- - February 20, 2022
- - February 20, 2023
-
- * - :doc:`1.10.7 LTS `
- - July 17, 2020
- - February 20, 2022
- - February 20, 2023
-
- * - :doc:`1.10.6 LTS `
- - April 20, 2020
- - February 20, 2022
- - February 20, 2023
-
- * - :doc:`1.10.5 LTS `
- - January 14, 2020
- - February 20, 2022
- - February 20, 2023
-
- * - :ref:`1.10.4 LTS `
- - September 26, 2019
- - February 20, 2022
- - February 20, 2023
-
- * - :ref:`1.10.3 LTS `
- - April 1, 2019
- - February 20, 2022
- - February 20, 2023
-
- * - :ref:`1.10.2 LTS `
- - October 13, 2018
- - February 20, 2022
- - February 20, 2023
diff --git a/doc/release/eol_versions.rst b/doc/release/eol_versions.rst
index 63b3c1bb43..347e712ffe 100644
--- a/doc/release/eol_versions.rst
+++ b/doc/release/eol_versions.rst
@@ -2,9 +2,147 @@
EOL versions
============
-This page lists release notes for Tarantool versions that have reached
+This section contains information about Tarantool versions that have reached
their end of life in accordance with the :doc:`release policy `.
-See the :doc:`release calendar ` for more information.
+
+.. container:: table
+
+ .. list-table::
+
+ * - Version
+ - Release date
+ - End of life
+ - End of support
+
+ * - :doc:`2.7.3 `
+ - August 19, 2021
+ - August 19, 2021
+ - August 19, 2021
+
+ * - :doc:`2.7.2 `
+ - April 21, 2021
+ - August 19, 2021
+ - August 19, 2021
+
+ * - :doc:`2.6.3 `
+ - April 21, 2021
+ - April 21, 2021
+ - April 21, 2021
+
+ * - :doc:`2.6.2 `
+ - December 30, 2020
+ - April 21, 2021
+ - April 21, 2021
+
+ * - :doc:`2.5.3 `
+ - December 30, 2020
+ - December 30, 2020
+ - December 30, 2020
+
+ * - :doc:`2.5.2 `
+ - October 22, 2020
+ - December 30, 2020
+ - December 30, 2020
+
+ * - :doc:`2.4.3 `
+ - October 22, 2020
+ - October 22, 2020
+ - October 22, 2020
+
+ * - :doc:`2.4.2 `
+ - July 17, 2020
+ - October 22, 2020
+ - October 22, 2020
+
+ * - :doc:`2.3.3 `
+ - July 17, 2020
+ - July 17, 2020
+ - July 17, 2020
+
+ * - :doc:`2.3.2 `
+ - April 20, 2020
+ - July 17, 2020
+ - July 17, 2020
+
+ * - :doc:`2.2.3 `
+ - April 20, 2020
+ - April 20, 2020
+ - April 20, 2020
+
+ * - :doc:`2.2.2 `
+ - December 31, 2019
+ - April 20, 2020
+ - April 20, 2020
+
+ * - :doc:`1.10.15 LTS `
+ - February 20, 2023
+ - February 20, 2023
+ - February, 2024
+
+ * - :doc:`1.10.14 LTS `
+ - August 8, 2022
+ - February 20, 2023
+ - February, 2024
+
+ * - :doc:`1.10.13 LTS `
+ - April 25, 2022
+ - February 20, 2023
+ - February, 2024
+
+ * - :doc:`1.10.12 LTS `
+ - December 22, 2021
+ - February 20, 2022
+ - February 20, 2023
+
+ * - :doc:`1.10.11 LTS `
+ - August 19, 2021
+ - February 20, 2022
+ - February 20, 2023
+
+ * - :doc:`1.10.10 LTS `
+ - April 24, 2021
+ - February 20, 2022
+ - February 20, 2023
+
+ * - :doc:`1.10.9 LTS `
+ - December 30, 2020
+ - February 20, 2022
+ - February 20, 2023
+
+ * - :doc:`1.10.8 LTS `
+ - October 22, 2020
+ - February 20, 2022
+ - February 20, 2023
+
+ * - :doc:`1.10.7 LTS `
+ - July 17, 2020
+ - February 20, 2022
+ - February 20, 2023
+
+ * - :doc:`1.10.6 LTS `
+ - April 20, 2020
+ - February 20, 2022
+ - February 20, 2023
+
+ * - :doc:`1.10.5 LTS `
+ - January 14, 2020
+ - February 20, 2022
+ - February 20, 2023
+
+ * - :ref:`1.10.4 LTS `
+ - September 26, 2019
+ - February 20, 2022
+ - February 20, 2023
+
+ * - :ref:`1.10.3 LTS `
+ - April 1, 2019
+ - February 20, 2022
+ - February 20, 2023
+
+ * - :ref:`1.10.2 LTS `
+ - October 13, 2018
+ - February 20, 2022
+ - February 20, 2023
.. toctree::
:maxdepth: 1
@@ -57,3 +195,4 @@ See the :doc:`release calendar ` for more information.
1.8
1.7
1.6
+ legacy_policy
diff --git a/doc/release/index.rst b/doc/release/index.rst
index 14041a94e5..45db7b739d 100644
--- a/doc/release/index.rst
+++ b/doc/release/index.rst
@@ -6,20 +6,76 @@
Releases
========
-This section contains release notes for all Tarantool versions, starting from 1.6 up to the latest.
+This section contains information about Tarantool releases: release notes, lifetime
+information, release policy.
To download Tarantool releases, check the `Download `_ page.
-Since version 2.10, a :doc:`new release policy for Tarantool ` has been introduced.
+Tarantool versioning is defined by the :doc:`release policy`.
Backwards compatibility is guaranteed between all versions in the same :term:`release series`.
It is also appreciated but not guaranteed between different release series (major number changes).
To learn more, read the :doc:`Compatibility guarantees ` article.
-.. toctree::
- :maxdepth: 2
+Supported versions
+------------------
+
+Every Tarantool release series has :ref:`the same lifecycle `
+defined by the release policy.
+Below you can find the lifecycle of currently supported Tarantool versions. For
+information about earlier versions, see :doc:`eol_versions`.
+
+*End of life* means the release series will no longer receive any patches, updates,
+or feature improvements after the specified date. Versions that haven't reached
+their end of life yet are shown in **bold**.
+*End of support* means that we won't provide technical support to product versions
+after the specified date.
+
+.. container:: table
+
+ .. list-table::
+
+ * - Series
+ - Versions
+ - First release date
+ - End of life
+ - End of support
- calendar
- major-features
+ * - :doc:`3.0 `
+ - | :tarantool-release:`3.0.1`
+ | :tarantool-release:`3.0.0`
+ - **December 26, 2023**
+ - **December 26, 2025**
+ - **Not planned yet**
+
+ * - :doc:`2.11 LTS `
+ - | :tarantool-release:`2.11.2`
+ | :tarantool-release:`2.11.1`
+ | :tarantool-release:`2.11.0`
+ - **May 24, 2023**
+ - **May 24, 2025**
+ - **Not planned yet**
+
+ * - 2.10
+ - | :doc:`2.10.8 `
+ | :doc:`2.10.7 `
+ | :doc:`2.10.6 `
+ | :doc:`2.10.5 `
+ | :doc:`2.10.4 `
+ | :doc:`2.10.3 `
+ | :doc:`2.10.2 `
+ | :doc:`2.10.1 `
+ | :doc:`2.10.0 `
+ - May 22, 2022
+ - September 14, 2023
+ - Not planned yet
+
+ * - 2.8
+ - | :doc:`2.8.4 `
+ | :doc:`2.8.3 `
+ | :doc:`2.8.2 `
+ - August 19, 2021
+ - April 25, 2022
+ - December 31, 2024
.. toctree::
:maxdepth: 1
@@ -27,9 +83,5 @@ To learn more, read the :doc:`Compatibility guarantees ` article.
3.0.0
2.11.0
eol_versions
-
-.. toctree::
- :maxdepth: 2
-
- policy_index
+ policy
compatibility
diff --git a/doc/release/policy.rst b/doc/release/policy.rst
index 13d7f868aa..f3d72724b2 100644
--- a/doc/release/policy.rst
+++ b/doc/release/policy.rst
@@ -351,5 +351,4 @@ No new versions are released since then.
.. note::
- See all currently supported Tarantool versions visualised as :doc:`a calendar `
- or as :ref:`a release lifetime table `.
+ See all currently supported Tarantool versions in :doc:`Releases `.
From 80e8d85f04c186336409cb74f534c9512814f65d Mon Sep 17 00:00:00 2001
From: Pavel Semyonov
Date: Mon, 26 Feb 2024 15:48:13 +0700
Subject: [PATCH 02/11] Restructure releases section
---
doc/release/_images/releases_calendar.svg | 4 +-
doc/release/calendar.rst | 59 --------------------
doc/release/eol_versions.rst | 68 ++++++++++++++++++++++-
doc/release/index.rst | 24 ++++----
4 files changed, 80 insertions(+), 75 deletions(-)
diff --git a/doc/release/_images/releases_calendar.svg b/doc/release/_images/releases_calendar.svg
index 6b5ffc4659..bb1ffb517d 100644
--- a/doc/release/_images/releases_calendar.svg
+++ b/doc/release/_images/releases_calendar.svg
@@ -1,4 +1,4 @@
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/doc/release/calendar.rst b/doc/release/calendar.rst
index 6c47911be7..3189acdcd9 100644
--- a/doc/release/calendar.rst
+++ b/doc/release/calendar.rst
@@ -59,65 +59,6 @@ Versions that haven't reached their end of life yet are highlighted with **bold*
- **May 24, 2025**
- **Not planned yet**
- * - :doc:`2.10.8 `
- - September 14, 2023
- - September 14, 2023
- - Not planned yet
-
- * - :doc:`2.10.7 `
- - May 24, 2023
- - September 14, 2023
- - Not planned yet
-
- * - :doc:`2.10.6 `
- - March 22, 2023
- - September 14, 2023
- - Not planned yet
-
- * - :doc:`2.10.5 `
- - February 20, 2023
- - September 14, 2023
- - Not planned yet
-
- * - :doc:`2.10.4 `
- - November 11, 2022
- - September 14, 2023
- - Not planned yet
-
- * - :doc:`2.10.3 `
- - September 30, 2022
- - September 14, 2023
- - Not planned yet
-
- * - :doc:`2.10.2 `
- - September 1, 2022
- - September 14, 2023
- - Not planned yet
-
- * - :doc:`2.10.1 `
- - August 8, 2022
- - September 14, 2023
- - Not planned yet
-
- * - :doc:`2.10.0 `
- - May 22, 2022
- - September 14, 2023
- - Not planned yet
-
- * - :doc:`2.8.4 `
- - April 25, 2022
- - April 25, 2022
- - Not planned yet
-
- * - :doc:`2.8.3 `
- - December 22, 2021
- - April 25, 2022
- - Not planned yet
-
- * - :doc:`2.8.2 `
- - August 19, 2021
- - April 25, 2022
- - Not planned yet
diff --git a/doc/release/eol_versions.rst b/doc/release/eol_versions.rst
index 347e712ffe..4bb58c0271 100644
--- a/doc/release/eol_versions.rst
+++ b/doc/release/eol_versions.rst
@@ -3,7 +3,10 @@ EOL versions
============
This section contains information about Tarantool versions that have reached
-their end of life in accordance with the :doc:`release policy `.
+their end of life in accordance with the :doc:`release policy `. This
+means that these version don't receive updates and fixes anymore, although we still
+provide technical support for some of them. Supported versions are shown in **bold**.
+
.. container:: table
@@ -14,6 +17,66 @@ their end of life in accordance with the :doc:`release policy `.
- End of life
- End of support
+ * - :doc:`2.10.8 `
+ - **September 14, 2023**
+ - **September 14, 2023**
+ - **Not planned yet**
+
+ * - :doc:`2.10.7 `
+ - **May 24, 2023**
+ - **September 14, 2023**
+ - **Not planned yet**
+
+ * - :doc:`2.10.6 `
+ - **March 22, 2023**
+ - **September 14, 2023**
+ - **Not planned yet**
+
+ * - :doc:`2.10.5 `
+ - **February 20, 2023**
+ - **September 14, 2023**
+ - **Not planned yet**
+
+ * - :doc:`2.10.4 `
+ - **November 11, 2022**
+ - **September 14, 2023**
+ - **Not planned yet**
+
+ * - :doc:`2.10.3 `
+ - **September 30, 2022**
+ - **September 14, 2023**
+ - **Not planned yet**
+
+ * - :doc:`2.10.2 `
+ - **September 1, 2022**
+ - **September 14, 2023**
+ - **Not planned yet**
+
+ * - :doc:`2.10.1 `
+ - **August 8, 2022**
+ - **September 14, 2023**
+ - **Not planned yet**
+
+ * - :doc:`2.10.0 `
+ - **May 22, 2022**
+ - **September 14, 2023**
+ - **Not planned yet**
+
+ * - :doc:`2.8.4 `
+ - **April 25, 2022**
+ - **April 25, 2022**
+ - **December 31, 2024**
+
+ * - :doc:`2.8.3 `
+ - **December 22, 2021**
+ - **April 25, 2022**
+ - **December 31, 2024**
+
+ * - :doc:`2.8.2 `
+ - **August 19, 2021**
+ - **April 25, 2022**
+ - **December 31, 2024**
+
* - :doc:`2.7.3 `
- August 19, 2021
- August 19, 2021
@@ -147,6 +210,7 @@ their end of life in accordance with the :doc:`release policy `.
.. toctree::
:maxdepth: 1
+ major-features
2.10.8
2.10.7
2.10.6
@@ -195,4 +259,4 @@ their end of life in accordance with the :doc:`release policy `.
1.8
1.7
1.6
- legacy_policy
+ legacy-policy
diff --git a/doc/release/index.rst b/doc/release/index.rst
index 45db7b739d..d4f20eed6e 100644
--- a/doc/release/index.rst
+++ b/doc/release/index.rst
@@ -35,27 +35,30 @@ after the specified date.
.. list-table::
* - Series
- - Versions
- First release date
- End of life
- End of support
+ - Versions
* - :doc:`3.0 `
- - | :tarantool-release:`3.0.1`
- | :tarantool-release:`3.0.0`
- **December 26, 2023**
- **December 26, 2025**
- **Not planned yet**
+ - | :tarantool-release:`3.0.1`
+ | :tarantool-release:`3.0.0`
* - :doc:`2.11 LTS `
- - | :tarantool-release:`2.11.2`
- | :tarantool-release:`2.11.1`
- | :tarantool-release:`2.11.0`
- **May 24, 2023**
- **May 24, 2025**
- **Not planned yet**
+ - | :tarantool-release:`2.11.2`
+ | :tarantool-release:`2.11.1`
+ | :tarantool-release:`2.11.0`
* - 2.10
+ - May 22, 2022
+ - September 14, 2023
+ - Not planned yet
- | :doc:`2.10.8 `
| :doc:`2.10.7 `
| :doc:`2.10.6 `
@@ -65,17 +68,14 @@ after the specified date.
| :doc:`2.10.2 `
| :doc:`2.10.1 `
| :doc:`2.10.0 `
- - May 22, 2022
- - September 14, 2023
- - Not planned yet
* - 2.8
- - | :doc:`2.8.4 `
- | :doc:`2.8.3 `
- | :doc:`2.8.2 `
- August 19, 2021
- April 25, 2022
- December 31, 2024
+ - | :doc:`2.8.4 `
+ | :doc:`2.8.3 `
+ | :doc:`2.8.2 `
.. toctree::
:maxdepth: 1
From 29b1a2239673a7f4cf7f4cca0d9525a9b10da453 Mon Sep 17 00:00:00 2001
From: Pavel Semyonov
Date: Mon, 26 Feb 2024 20:07:51 +0700
Subject: [PATCH 03/11] Draw new calendar
---
doc/release/_images/releases_calendar.svg | 2 +-
doc/release/index.rst | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/doc/release/_images/releases_calendar.svg b/doc/release/_images/releases_calendar.svg
index bb1ffb517d..dcc860cec5 100644
--- a/doc/release/_images/releases_calendar.svg
+++ b/doc/release/_images/releases_calendar.svg
@@ -1,4 +1,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/doc/release/index.rst b/doc/release/index.rst
index d4f20eed6e..cfcc27d90a 100644
--- a/doc/release/index.rst
+++ b/doc/release/index.rst
@@ -19,6 +19,13 @@ To learn more, read the :doc:`Compatibility guarantees ` article.
Supported versions
------------------
+.. ifconfig:: builder not in ('latex', )
+
+ .. image:: _images/releases_calendar.svg
+ :target: ../../_images/releases_calendar.svg
+ :align: center
+ :alt: releases_calendar.svg
+
Every Tarantool release series has :ref:`the same lifecycle `
defined by the release policy.
Below you can find the lifecycle of currently supported Tarantool versions. For
From 3f385ad0f9522940ef19b412871482161a9fa3bb Mon Sep 17 00:00:00 2001
From: Pavel Semyonov
Date: Mon, 26 Feb 2024 20:36:21 +0700
Subject: [PATCH 04/11] Draw new calendar
---
doc/release/_images/releases_calendar.svg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/release/_images/releases_calendar.svg b/doc/release/_images/releases_calendar.svg
index dcc860cec5..22031699a9 100644
--- a/doc/release/_images/releases_calendar.svg
+++ b/doc/release/_images/releases_calendar.svg
@@ -1,4 +1,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
From 0a65dbe41579c4f7b9e87ade78cce87b51a57df8 Mon Sep 17 00:00:00 2001
From: Pavel Semyonov
Date: Tue, 27 Feb 2024 11:48:54 +0700
Subject: [PATCH 05/11] Adjust texts in Releases
---
doc/release/_images/releases_calendar.svg | 2 +-
doc/release/eol_versions.rst | 12 ++++++++---
doc/release/index.rst | 25 ++++++++++++++---------
doc/release/major-features.rst | 8 ++++++++
4 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/doc/release/_images/releases_calendar.svg b/doc/release/_images/releases_calendar.svg
index 22031699a9..bfc5bd52d0 100644
--- a/doc/release/_images/releases_calendar.svg
+++ b/doc/release/_images/releases_calendar.svg
@@ -1,4 +1,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/doc/release/eol_versions.rst b/doc/release/eol_versions.rst
index 4bb58c0271..b06f247475 100644
--- a/doc/release/eol_versions.rst
+++ b/doc/release/eol_versions.rst
@@ -1,12 +1,18 @@
+.. _release_eol:
EOL versions
============
This section contains information about Tarantool versions that have reached
their end of life in accordance with the :doc:`release policy `. This
-means that these version don't receive updates and fixes anymore, although we still
-provide technical support for some of them. Supported versions are shown in **bold**.
+means that these versions don't receive updates and fixes anymore. However, we still
+provide technical support for most recent of them. Supported versions are shown in **bold**.
+For information about major changes between EOL versions, see :ref:`releases_eol_major_features`.
+
+.. note::
+
+ Before 2.10.0, version numbers were subject to the :doc:`legacy versioning policy `.
.. container:: table
@@ -211,6 +217,7 @@ provide technical support for some of them. Supported versions are shown in **bo
:maxdepth: 1
major-features
+ legacy-policy
2.10.8
2.10.7
2.10.6
@@ -259,4 +266,3 @@ provide technical support for some of them. Supported versions are shown in **bo
1.8
1.7
1.6
- legacy-policy
diff --git a/doc/release/index.rst b/doc/release/index.rst
index cfcc27d90a..f6a38c7896 100644
--- a/doc/release/index.rst
+++ b/doc/release/index.rst
@@ -19,6 +19,10 @@ To learn more, read the :doc:`Compatibility guarantees ` article.
Supported versions
------------------
+Every Tarantool release series has :ref:`the same lifecycle `
+defined by the release policy. The following diagram visualises the lifecycle of currently
+supported Tarantool versions:
+
.. ifconfig:: builder not in ('latex', )
.. image:: _images/releases_calendar.svg
@@ -26,16 +30,17 @@ Supported versions
:align: center
:alt: releases_calendar.svg
-Every Tarantool release series has :ref:`the same lifecycle `
-defined by the release policy.
-Below you can find the lifecycle of currently supported Tarantool versions. For
-information about earlier versions, see :doc:`eol_versions`.
-
-*End of life* means the release series will no longer receive any patches, updates,
-or feature improvements after the specified date. Versions that haven't reached
-their end of life yet are shown in **bold**.
-*End of support* means that we won't provide technical support to product versions
-after the specified date.
+The table below provides information about supported versions with links to their
+*What's new* pages in the documentation and detailed changelogs on GitHub.
+For information about earlier versions, see :doc:`eol_versions`.
+
+.. note::
+ *End of life* (*EOL*) means the release series will no longer receive any patches,
+ updates, or feature improvements after the specified date. Versions that haven't
+ reached their end of life yet are shown in **bold**.
+
+ *End of support* (*EOS*) means that we won't provide technical support to product
+ versions after the specified date.
.. container:: table
diff --git a/doc/release/major-features.rst b/doc/release/major-features.rst
index 3b51c0ac92..e17e3fbb92 100644
--- a/doc/release/major-features.rst
+++ b/doc/release/major-features.rst
@@ -1,6 +1,14 @@
+.. _release_eol_major_features:
+
Major features
==============
+.. important::
+
+ This table lists major changes in Tarantool versions up to 2.11.0.
+ For overviews of new features introduces in newer versions, see
+ their *What's new* pages inside :doc:`releases`.
+
Every released version of Tarantool brings some notable features and fixes, which are all listed in
the :doc:`release notes `.
From fe41fe6303312e663ee2ffcdfbc0665902236118 Mon Sep 17 00:00:00 2001
From: Pavel Semyonov
Date: Tue, 27 Feb 2024 12:26:38 +0700
Subject: [PATCH 06/11] Move EE SDK changelog to the releases section
---
doc/enterprise/index.rst | 1 -
doc/release/calendar.rst | 65 -------------------
.../enterprise-changelog.rst} | 8 +--
doc/release/eol_versions.rst | 6 +-
doc/release/index.rst | 16 ++++-
doc/release/legacy-policy.rst | 5 ++
doc/release/major-features.rst | 11 ++--
doc/release/policy.rst | 4 +-
doc/release/policy_index.rst | 28 --------
9 files changed, 33 insertions(+), 111 deletions(-)
delete mode 100644 doc/release/calendar.rst
rename doc/{enterprise/changelog.rst => release/enterprise-changelog.rst} (99%)
delete mode 100644 doc/release/policy_index.rst
diff --git a/doc/enterprise/index.rst b/doc/enterprise/index.rst
index 44d2f0d8cf..22461c29cb 100644
--- a/doc/enterprise/index.rst
+++ b/doc/enterprise/index.rst
@@ -64,7 +64,6 @@ Tarantool Enterprise Edition
.. toctree::
:hidden:
- changelog
setup
security
audit
diff --git a/doc/release/calendar.rst b/doc/release/calendar.rst
deleted file mode 100644
index 3189acdcd9..0000000000
--- a/doc/release/calendar.rst
+++ /dev/null
@@ -1,65 +0,0 @@
-Release calendar
-================
-
-Every Tarantool release series has :ref:`the same lifecycle `.
-Below you can find the lifecycle of all Tarantool versions starting from 1.10.x,
-as well as currently supported versions visualised as a calendar:
-
-.. ifconfig:: builder not in ('latex', )
-
- .. image:: _images/releases_calendar.svg
- :target: ../../_images/releases_calendar.svg
- :align: left
- :alt: releases_calendar.svg
-
-.. _release-table:
-
-Release lifetime table
-----------------------
-
-The release lifetime table lists all currently supported Tarantool versions.
-Each link leads to the release notes page of the corresponding version.
-*End of life* means the release series will no longer receive any patches, updates,
-or feature improvements after the specified date.
-*End of support* means that we won't provide technical support to product versions
-after the specified date.
-Versions that haven't reached their end of life yet are highlighted with **bold**.
-
-.. container:: table
-
- .. list-table::
-
- * - Version
- - Release date
- - End of life
- - End of support
-
- * - `3.0.1 `_
- - **January 25, 2024**
- - **December 26, 2025**
- - **Not planned yet**
-
- * - :doc:`3.0.0 `
- - **December 26, 2023**
- - **December 26, 2025**
- - **Not planned yet**
-
- * - `2.11.2 LTS `_
- - **December 7, 2023**
- - **May 24, 2025**
- - **Not planned yet**
-
- * - `2.11.1 LTS `_
- - **August 17, 2023**
- - **May 24, 2025**
- - **Not planned yet**
-
- * - :doc:`2.11.0 LTS `
- - **May 24, 2023**
- - **May 24, 2025**
- - **Not planned yet**
-
-
-
-
-
diff --git a/doc/enterprise/changelog.rst b/doc/release/enterprise-changelog.rst
similarity index 99%
rename from doc/enterprise/changelog.rst
rename to doc/release/enterprise-changelog.rst
index cc6092d554..a12dbbe3d5 100644
--- a/doc/enterprise/changelog.rst
+++ b/doc/release/enterprise-changelog.rst
@@ -1,12 +1,12 @@
-.. _enterprise_changelog:
+.. _release-enterprise-changelog:
-Changelog
-=========
+Enterprise SDK changelog
+========================
Versioning policy
-----------------
-A Tarantool Enterprise SDK version consists of two parts:
+A :ref:`Tarantool Enterprise SDK ` version consists of two parts:
.. code-block:: text
diff --git a/doc/release/eol_versions.rst b/doc/release/eol_versions.rst
index b06f247475..fc24d2e230 100644
--- a/doc/release/eol_versions.rst
+++ b/doc/release/eol_versions.rst
@@ -1,14 +1,14 @@
-.. _release_eol:
+.. _release-eol-versions:
EOL versions
============
This section contains information about Tarantool versions that have reached
-their end of life in accordance with the :doc:`release policy `. This
+their *end of life* in accordance with the :ref:`release-policy`. This
means that these versions don't receive updates and fixes anymore. However, we still
provide technical support for most recent of them. Supported versions are shown in **bold**.
-For information about major changes between EOL versions, see :ref:`releases_eol_major_features`.
+For information about major changes between EOL versions, see :ref:`release-eol-major-features`.
.. note::
diff --git a/doc/release/index.rst b/doc/release/index.rst
index f6a38c7896..50c33afba2 100644
--- a/doc/release/index.rst
+++ b/doc/release/index.rst
@@ -6,16 +6,26 @@
Releases
========
-This section contains information about Tarantool releases: release notes, lifetime
-information, release policy.
+This section contains information about Tarantool releases: release notes, lifecycle
+information, release policy, and other documents.
To download Tarantool releases, check the `Download `_ page.
-Tarantool versioning is defined by the :doc:`release policy`.
+All currently supported versions are listed on this page :ref:`below .
+The information about earlier versions is provided in :ref:`release-eol-versions`.
+
+The Enterprise Edition of Tarantool is distributed in the form of an SDK that has
+its own versioning. See the :ref:`release-enterprise-changelog` to learn about
+SDK version numbering and changes.
+
+The detailed information about Tarantool version numbering and release lifecycle
+is available in :ref:`release-policy`.
Backwards compatibility is guaranteed between all versions in the same :term:`release series`.
It is also appreciated but not guaranteed between different release series (major number changes).
To learn more, read the :doc:`Compatibility guarantees ` article.
+.. _release_supported_versions:
+
Supported versions
------------------
diff --git a/doc/release/legacy-policy.rst b/doc/release/legacy-policy.rst
index dbb7078bb3..44e64cd6fd 100644
--- a/doc/release/legacy-policy.rst
+++ b/doc/release/legacy-policy.rst
@@ -1,6 +1,11 @@
Tarantool legacy release policy
===============================
+.. important::
+
+ This page describes the release policy that was used for Tarantool versions **before 2.10.0**.
+
+ For information about the current release policy, see :ref:`release-policy`.
A Tarantool release is identified by three digits, for example, 2.6.2 or 1.10.9:
diff --git a/doc/release/major-features.rst b/doc/release/major-features.rst
index e17e3fbb92..2762171abf 100644
--- a/doc/release/major-features.rst
+++ b/doc/release/major-features.rst
@@ -1,18 +1,19 @@
-.. _release_eol_major_features:
+.. _release-eol-major-features:
Major features
==============
.. important::
- This table lists major changes in Tarantool versions up to 2.11.0.
- For overviews of new features introduces in newer versions, see
- their *What's new* pages inside :doc:`releases`.
+ This page is no longer maintained.
+
+ The table below lists major changes in Tarantool versions **up to 2.11.0**.
+ For overviews of changes in newer versions, see their *What's new* pages inside :ref:`release`.
Every released version of Tarantool brings some notable features and fixes, which are all listed in
the :doc:`release notes `.
-To keep track of the major features in each version of the Tarantool easier, you can use the table below.
+To keep track of the major features in Tarantool versions, you can use the table below.
Later versions inherit features from earlier ones in the same release series.
Note that versions before 2.10.* are numbered according to the :doc:`legacy release policy `,
diff --git a/doc/release/policy.rst b/doc/release/policy.rst
index f3d72724b2..fe5d451ca7 100644
--- a/doc/release/policy.rst
+++ b/doc/release/policy.rst
@@ -1,8 +1,8 @@
+.. _release-policy:
+
Tarantool release policy
========================
-.. _release-policy:
-
Summary
-------
diff --git a/doc/release/policy_index.rst b/doc/release/policy_index.rst
deleted file mode 100644
index f504ecbff2..0000000000
--- a/doc/release/policy_index.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-Release policies
-================
-
-Since version 2.10, there's a :doc:`new release policy for Tarantool `.
-In short, Tarantool version numbers consist of three parts:
-
-.. code-block:: text
-
- MAJOR.MINOR.PATCH
-
-Any version without extra prefixes is a release version.
-If you need a version for production use, pick the latest release.
-For evaluation and development, you can use beta versions.
-They are marked with ``-betaN`` suffixes.
-
-Before 2.10.0, version numbers were subject to the
-:doc:`legacy versioning policy `:
-
-.. code-block:: text
-
- MAJOR_VERSION.RELEASE_SERIES.RELEASE
-
-.. toctree::
- :hidden:
- :maxdepth: 2
-
- policy
- legacy-policy
From 3136d64c2b599de65f8357a1ef587b591ea63e85 Mon Sep 17 00:00:00 2001
From: Pavel Semyonov
Date: Tue, 27 Feb 2024 12:35:37 +0700
Subject: [PATCH 07/11] Fix links and toc
---
doc/release/enterprise-changelog.rst | 2 +-
doc/release/index.rst | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/doc/release/enterprise-changelog.rst b/doc/release/enterprise-changelog.rst
index a12dbbe3d5..03563636d3 100644
--- a/doc/release/enterprise-changelog.rst
+++ b/doc/release/enterprise-changelog.rst
@@ -523,4 +523,4 @@ r455
----
- Added :ref:`binary protocol encryption `.
-- Added :doc:`tuple field compression `.
\ No newline at end of file
+- Added :ref:`tuple field compression `.
\ No newline at end of file
diff --git a/doc/release/index.rst b/doc/release/index.rst
index 50c33afba2..c3683a1932 100644
--- a/doc/release/index.rst
+++ b/doc/release/index.rst
@@ -10,7 +10,7 @@ This section contains information about Tarantool releases: release notes, lifec
information, release policy, and other documents.
To download Tarantool releases, check the `Download `_ page.
-All currently supported versions are listed on this page :ref:`below .
+All currently supported versions are listed on this page :ref:`below `.
The information about earlier versions is provided in :ref:`release-eol-versions`.
The Enterprise Edition of Tarantool is distributed in the form of an SDK that has
@@ -24,7 +24,7 @@ Backwards compatibility is guaranteed between all versions in the same :term:`re
It is also appreciated but not guaranteed between different release series (major number changes).
To learn more, read the :doc:`Compatibility guarantees ` article.
-.. _release_supported_versions:
+.. _release-supported-versions:
Supported versions
------------------
@@ -105,5 +105,6 @@ For information about earlier versions, see :doc:`eol_versions`.
3.0.0
2.11.0
eol_versions
+ enterprise-changelog
policy
compatibility
From 0340b113e594ae6dda52d7560638f5314ff050b7 Mon Sep 17 00:00:00 2001
From: Pavel Semyonov
Date: Tue, 27 Feb 2024 14:53:28 +0700
Subject: [PATCH 08/11] Apply suggestions from code review
Co-authored-by: Andrey Aksenov <38073144+andreyaksenov@users.noreply.github.com>
---
doc/release/eol_versions.rst | 2 +-
doc/release/index.rst | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/release/eol_versions.rst b/doc/release/eol_versions.rst
index fc24d2e230..f5fdfa36b3 100644
--- a/doc/release/eol_versions.rst
+++ b/doc/release/eol_versions.rst
@@ -6,7 +6,7 @@ EOL versions
This section contains information about Tarantool versions that have reached
their *end of life* in accordance with the :ref:`release-policy`. This
means that these versions don't receive updates and fixes anymore. However, we still
-provide technical support for most recent of them. Supported versions are shown in **bold**.
+provide technical support for the most recent of them. Supported versions are shown in **bold**.
For information about major changes between EOL versions, see :ref:`release-eol-major-features`.
diff --git a/doc/release/index.rst b/doc/release/index.rst
index c3683a1932..d6e9d83e04 100644
--- a/doc/release/index.rst
+++ b/doc/release/index.rst
@@ -20,7 +20,7 @@ SDK version numbering and changes.
The detailed information about Tarantool version numbering and release lifecycle
is available in :ref:`release-policy`.
-Backwards compatibility is guaranteed between all versions in the same :term:`release series`.
+Backward compatibility is guaranteed between all versions in the same :term:`release series`.
It is also appreciated but not guaranteed between different release series (major number changes).
To learn more, read the :doc:`Compatibility guarantees ` article.
@@ -30,7 +30,7 @@ Supported versions
------------------
Every Tarantool release series has :ref:`the same lifecycle `
-defined by the release policy. The following diagram visualises the lifecycle of currently
+defined by the release policy. The following diagram visualizes the lifecycle of currently
supported Tarantool versions:
.. ifconfig:: builder not in ('latex', )
From 48ab26da5630a732201ca403b42de57d8ac83103 Mon Sep 17 00:00:00 2001
From: Pavel Semyonov
Date: Tue, 27 Feb 2024 15:09:41 +0700
Subject: [PATCH 09/11] Fix
---
doc/release/eol_versions.rst | 6 ++++--
doc/release/index.rst | 11 +++++------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/doc/release/eol_versions.rst b/doc/release/eol_versions.rst
index f5fdfa36b3..4d2d558923 100644
--- a/doc/release/eol_versions.rst
+++ b/doc/release/eol_versions.rst
@@ -6,7 +6,8 @@ EOL versions
This section contains information about Tarantool versions that have reached
their *end of life* in accordance with the :ref:`release-policy`. This
means that these versions don't receive updates and fixes anymore. However, we still
-provide technical support for the most recent of them. Supported versions are shown in **bold**.
+provide technical support for certain time after a version's EOL. The current support
+status is reflected by the **End of support** column of the table below.
For information about major changes between EOL versions, see :ref:`release-eol-major-features`.
@@ -17,6 +18,7 @@ For information about major changes between EOL versions, see :ref:`release-eol-
.. container:: table
.. list-table::
+ :header-rows: 1
* - Version
- Release date
@@ -214,7 +216,7 @@ For information about major changes between EOL versions, see :ref:`release-eol-
- February 20, 2023
.. toctree::
- :maxdepth: 1
+ :hidden:
major-features
legacy-policy
diff --git a/doc/release/index.rst b/doc/release/index.rst
index d6e9d83e04..8ff3aec7ff 100644
--- a/doc/release/index.rst
+++ b/doc/release/index.rst
@@ -33,18 +33,16 @@ Every Tarantool release series has :ref:`the same lifecycle
Date: Wed, 28 Feb 2024 14:05:33 +0700
Subject: [PATCH 10/11] Fix 2.11 EOL period
---
doc/release/2.11.0.rst | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/release/2.11.0.rst b/doc/release/2.11.0.rst
index 5963006fc6..79aef8cd81 100644
--- a/doc/release/2.11.0.rst
+++ b/doc/release/2.11.0.rst
@@ -8,11 +8,11 @@ Releases on GitHub: :tarantool-release:`2.11.2`, :tarantool-release:`2.11.1`, :t
The 2.11 release of Tarantool includes many new features and fixes.
This document provides an overview of the most important features for the Enterprise and Community editions.
-2.11 is the long-term support (LTS) release with four years of maintenance.
-This means that you will continue to receive all the necessary security fixes and bug fixes throughout this period.
+2.11 is the long-term support (LTS) release with two years of maintenance.
+This means that you will receive all the necessary security fixes and bug fixes throughout this period, and
+be able to get technical support afterward.
You can learn more about the Tarantool release policy from the :doc:`corresponding document `.
-
.. container:: table
.. list-table::
From 43e22703c5874e202fa989d1691ed447aa2126e5 Mon Sep 17 00:00:00 2001
From: Pavel Semyonov
Date: Wed, 28 Feb 2024 14:43:50 +0700
Subject: [PATCH 11/11] Fix table
---
doc/release/eol_versions.rst | 72 ++++++++++++++++++------------------
1 file changed, 36 insertions(+), 36 deletions(-)
diff --git a/doc/release/eol_versions.rst b/doc/release/eol_versions.rst
index 4d2d558923..6ebee38b3b 100644
--- a/doc/release/eol_versions.rst
+++ b/doc/release/eol_versions.rst
@@ -26,64 +26,64 @@ For information about major changes between EOL versions, see :ref:`release-eol-
- End of support
* - :doc:`2.10.8 `
- - **September 14, 2023**
- - **September 14, 2023**
- - **Not planned yet**
+ - September 14, 2023
+ - September 14, 2023
+ - Not planned yet
* - :doc:`2.10.7 `
- - **May 24, 2023**
- - **September 14, 2023**
- - **Not planned yet**
+ - May 24, 2023
+ - September 14, 2023
+ - Not planned yet
* - :doc:`2.10.6 `
- - **March 22, 2023**
- - **September 14, 2023**
- - **Not planned yet**
+ - March 22, 2023
+ - September 14, 2023
+ - Not planned yet
* - :doc:`2.10.5 `
- - **February 20, 2023**
- - **September 14, 2023**
- - **Not planned yet**
+ - February 20, 2023
+ - September 14, 2023
+ - Not planned yet
* - :doc:`2.10.4 `
- - **November 11, 2022**
- - **September 14, 2023**
- - **Not planned yet**
+ - November 11, 2022
+ - September 14, 2023
+ - Not planned yet
* - :doc:`2.10.3 `
- - **September 30, 2022**
- - **September 14, 2023**
- - **Not planned yet**
+ - September 30, 2022
+ - September 14, 2023
+ - Not planned yet
* - :doc:`2.10.2 `
- - **September 1, 2022**
- - **September 14, 2023**
- - **Not planned yet**
+ - September 1, 2022
+ - September 14, 2023
+ - Not planned yet
* - :doc:`2.10.1 `
- - **August 8, 2022**
- - **September 14, 2023**
- - **Not planned yet**
+ - August 8, 2022
+ - September 14, 2023
+ - Not planned yet
* - :doc:`2.10.0 `
- - **May 22, 2022**
- - **September 14, 2023**
- - **Not planned yet**
+ - May 22, 2022
+ - September 14, 2023
+ - Not planned yet
* - :doc:`2.8.4 `
- - **April 25, 2022**
- - **April 25, 2022**
- - **December 31, 2024**
+ - April 25, 2022
+ - April 25, 2022
+ - December 31, 2024
* - :doc:`2.8.3 `
- - **December 22, 2021**
- - **April 25, 2022**
- - **December 31, 2024**
+ - December 22, 2021
+ - April 25, 2022
+ - December 31, 2024
* - :doc:`2.8.2 `
- - **August 19, 2021**
- - **April 25, 2022**
- - **December 31, 2024**
+ - August 19, 2021
+ - April 25, 2022
+ - December 31, 2024
* - :doc:`2.7.3 `
- August 19, 2021