Merge branch 'origin/release-2021' into merge-2021-into-master

[alexxy/gromacs.git] / docs / release-notes / index.rst

diff --git a/docs/release-notes/index.rst b/docs/release-notes/index.rst
index 6b41402eb98eb2ad7f5b0c7f8c9bd22fc1d504f0..90a44ee75e19e7f0aaac0cf48ab06651701a9568 100644 (file)
--- a/docs/release-notes/index.rst
+++ b/docs/release-notes/index.rst
@@ -8,19 +8,19 @@ releases of |Gromacs|. Major releases contain changes to the
 functionality supported, whereas patch releases contain only fixes for
 issues identified in the corresponding major releases.
 
-Two versions of |Gromacs| are under active maintenance, the 2021
-series and the 2020 series. In the latter, only highly conservative
+Two versions of |Gromacs| are under active maintenance, the 2022
+series and the 2021 series. In the latter, only highly conservative
 fixes will be made, and only to address issues that affect scientific
 correctness. Naturally, some of those releases will be made after the
-year 2020 ends, but we keep 2019 in the name so users understand how
+year 2021 ends, but we keep 2021 in the name so users understand how
 up to date their version is. Such fixes will also be incorporated into
-the 2021 release series, as appropriate. Around the time the 2022
-release is made, the 2020 series will no longer be maintained.
+the 2022 release series, as appropriate. Around the time the 2023
+release is made, the 2021 series will no longer be maintained.
 
 Where issue numbers are reported in these release notes, more details
 can be found on the `issue tracker`_ at that issue number.
 
-|Gromacs| 2021 series
+|Gromacs| 2022 series
 ---------------------
 
 .. todolist::
@@ -28,6 +28,26 @@ can be found on the `issue tracker`_ at that issue number.
 Major release
 ^^^^^^^^^^^^^
 
+.. toctree::
+   :maxdepth: 1
+
+   2022/major/highlights
+   2022/major/features
+   2022/major/performance
+   2022/major/tools
+   2022/major/bugs-fixed
+   2022/major/deprecated-functionality
+   2022/major/removed-functionality
+   2022/major/portability
+   2022/major/miscellaneous
+
+
+|Gromacs| 2021 series
+---------------------
+
+Major release
+^^^^^^^^^^^^^
+
 .. toctree::
    :maxdepth: 1
 
@@ -41,6 +61,10 @@ Major release
    2021/major/portability
    2021/major/miscellaneous
 
+
+Older (unmaintained) |Gromacs| series
+-------------------------------------------------------
+
 |Gromacs| 2020 series
 ---------------------
 
@@ -105,9 +129,6 @@ Major release
    2019/major/portability
    2019/major/miscellaneous
 
-Older (unmaintained) |Gromacs| series
--------------------------------------------------------
-
 |Gromacs| 2018 series
 ---------------------