Merge branch 'origin/release-2020' into merge-release-2020-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 93af555709b6f6d9aa3796fc3e9043a8b2091efa..dfb12c7e5a2ae8c581cdd8be8d075811cf75af58 100644 (file)
--- a/docs/release-notes/index.rst
+++ b/docs/release-notes/index.rst
@@ -8,17 +8,39 @@ 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 2020
-series and the 2019 series. In the latter, only highly conservative
+Two versions of |Gromacs| are under active maintenance, the 2021
+series and the 2020 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 2019 ends, but we keep 2019 in the name so users understand how
+year 2020 ends, but we keep 2019 in the name so users understand how
 up to date their version is. Such fixes will also be incorporated into
-the 2020 release series, as appropriate. Around the time the 2021
-release is made, the 2019 series will no longer be maintained.
+the 2021 release series, as appropriate. Around the time the 2022
+release is made, the 2020 series will no longer be maintained.
 
 Where issue numbers are reported in these release notes, more details
-can be found at https://redmine.gromacs.org at that issue number.
+can be found at https://gitlab.com/gromacs/gromacs/-/issues at that issue number.
+
+|Gromacs| 2021 series
+---------------------
+
+.. todolist::
+
+Major release
+^^^^^^^^^^^^^
+
+.. toctree::
+   :maxdepth: 1
+
+   2021/major/highlights
+   2021/major/features
+   2021/major/performance
+   2021/major/tools
+   2021/major/bugs-fixed
+   2021/major/deprecated-functionality
+   2021/major/removed-functionality
+   2021/major/portability
+   2021/major/miscellaneous
+
 
 |Gromacs| 2020 series
 ---------------------