Merge release-2019 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 a036d333c0ac8fab9bc3202b25726bdef9f6cb28..3ed1cf3c45354ee65c9d0b47e1ccdec45b6bec3b 100644 (file)
--- a/docs/release-notes/index.rst
+++ b/docs/release-notes/index.rst
@@ -8,18 +8,38 @@ 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 2019
-series and the 2018 series. In the latter, only highly conservative
+Two versions of |Gromacs| are under active maintenance, the NEXT
+series and the 2019 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 2018 ends, but we keep 2018 in the name so users understand how
+year 2019 ends, but we keep 2018 in the name so users understand how
 up to date their version is. Such fixes will also be incorporated into
-the 2019 release series, as appropriate. Around the time the 2020
-release is made, the 2018 series will no longer be maintained.
+the NEXT release series, as appropriate. Around the time the NEXT+1
+release is made, the 2019 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.
 
+|Gromacs| NEXT series
+---------------------
+
+Major release
+^^^^^^^^^^^^^
+
+.. toctree::
+   :maxdepth: 1
+
+   2020/major/highlights
+   2020/major/features
+   2020/major/performance
+   2020/major/tools
+   2020/major/bugs-fixed
+   2020/major/deprecated-functionality
+   2020/major/removed-functionality
+   2020/major/portability
+   2020/major/miscellaneous
+
+
 |Gromacs| 2019 series
 ---------------------