Prepare for 2020 beta 2

TODO use NEXT again after branching of release-2020

Change-Id: I82414c80ac70d214eefb2fbb3cb45b291d1350b9

diff --git a/cmake/gmxVersionInfo.cmake b/cmake/gmxVersionInfo.cmake
index 7ee447aa00552cdc8710b5ebdb9d7d719ad39e76..442338a0399fae5ac5ff8413481ecb5858ce2079 100644 (file)
--- a/cmake/gmxVersionInfo.cmake
+++ b/cmake/gmxVersionInfo.cmake
@@ -201,7 +201,7 @@ set(GMX_VERSION_PATCH 0)
 # candidates, where it signifies the most recent such release from
 # this branch; it will be empty before the first such release, as well
 # as after the final release is out.
-set(GMX_VERSION_SUFFIX "-beta1")
+set(GMX_VERSION_SUFFIX "-beta2")
 
 # Conventionally with libtool, any ABI change must change the major
 # version number, the minor version number should change if it's just

diff --git a/docs/release-notes/2020/major/deprecated-functionality.rst b/docs/release-notes/2020/major/deprecated-functionality.rst
index 0db28d450317b33d06e189e2a93870bec3a8943d..c1652d69e11f8e6f264d7937229a51a3443e8a10 100644 (file)
--- a/docs/release-notes/2020/major/deprecated-functionality.rst
+++ b/docs/release-notes/2020/major/deprecated-functionality.rst
@@ -6,7 +6,7 @@
    Also, please use the syntax :issue:`number` to reference issues on redmine, without the
    a space between the colon and number!
 
-Changes anticipated to |Gromacs| NEXT functionality
+Changes anticipated to |Gromacs| 2020 functionality
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Functionality deprecated in |Gromacs| 2020

diff --git a/docs/release-notes/2020/major/highlights.rst b/docs/release-notes/2020/major/highlights.rst
index 05bacdfb79c7928871e1db41246d668be7eaeb75..2cb6fd097f5ba93612bf871028021225a4bd72f4 100644 (file)
--- a/docs/release-notes/2020/major/highlights.rst
+++ b/docs/release-notes/2020/major/highlights.rst
@@ -1,7 +1,7 @@
 Highlights
 ^^^^^^^^^^
 
-|Gromacs| NEXT was released on INSERT DATE HERE. Patch releases may
+|Gromacs| 2020 was released on INSERT DATE HERE. Patch releases may
 have been made since then, please use the updated versions!  Here are
 some highlights of what you can expect, along with more detail in the
 links below!

diff --git a/docs/release-notes/index.rst b/docs/release-notes/index.rst
index af120cc8ae8e53d8720aefee01c74126e5a40eb4..a14cf5ef7f9cc46611abd74706b0630f54370446 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 NEXT
+Two versions of |Gromacs| are under active maintenance, the 2020
 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 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 NEXT release series, as appropriate. Around the time the NEXT+1
+the 2020 release series, as appropriate. Around the time the 2021
 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
+|Gromacs| 2020 series
 ---------------------
 
 Major release