Prepare for 2018.6

Change-Id: Ie71adbecb99819aae1ba87c6f886d44a97958165

diff --git a/cmake/gmxVersionInfo.cmake b/cmake/gmxVersionInfo.cmake
index 82df216d8fd237198630ffe953eb73a518a597f5..149e69d83f664326d96976e68734ab0dc2177f33 100644 (file)
--- a/cmake/gmxVersionInfo.cmake
+++ b/cmake/gmxVersionInfo.cmake
@@ -186,7 +186,7 @@
 # The GROMACS convention is that these are the version number of the next
 # release that is going to be made from this branch.
 set(GMX_VERSION_MAJOR 2018)
-set(GMX_VERSION_PATCH 5)
+set(GMX_VERSION_PATCH 6)
 # The suffix, on the other hand, is used mainly for betas and release
 # candidates, where it signifies the most recent such release from
 # this branch; it will be empty before the first such release, as well

diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 35f1572480d3c26b4c45c1b2b54067dcdf0fd7b7..0fadd5ab54f0e831b5f301ceb2bfa9d80323e53b 100644 (file)
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -1,7 +1,7 @@
 #
 # This file is part of the GROMACS molecular simulation package.
 #
-# Copyright (c) 2014,2015,2016,2017,2018, by the GROMACS development team, led by
+# Copyright (c) 2014,2015,2016,2017,2018,2019, by the GROMACS development team, led by
 # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
 # and including many others, as listed in the AUTHORS file in the
 # top-level source directory and at http://www.gromacs.org.
@@ -125,6 +125,7 @@ if (SPHINX_FOUND)
         fragments/doxygen-links.rst
         install-guide/index.rst
         release-notes/index.rst
+        release-notes/2018/2018.6.rst
         release-notes/2018/2018.5.rst
         release-notes/2018/2018.4.rst
         release-notes/2018/2018.3.rst

diff --git a/docs/release-notes/2018/2018.6.rst b/docs/release-notes/2018/2018.6.rst
new file mode 100644 (file)
index 0000000..a2ee52c
--- /dev/null
+++ b/docs/release-notes/2018/2018.6.rst
@@ -0,0 +1,19 @@
+GROMACS 2018.6 release notes
+----------------------------
+
+This version was released on TODO, 2019. These release notes document
+the changes that have taken place in GROMACS since version 2018.5, to fix known
+issues. It also incorporates all fixes made in version TODO and
+earlier, which you can find described in the :ref:`release-notes`.
+
+Fixes where mdrun could behave incorrectly
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Fixes for ``gmx`` tools
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Fixes to improve portability
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Miscellaneous
+^^^^^^^^^^^^^

diff --git a/docs/release-notes/index.rst b/docs/release-notes/index.rst
index 1122fc781014171c89875c0cb0a23765f7fcb5e8..e4c1fd7315c9536fd783aeda8a4a54ce47961bbe 100644 (file)
--- a/docs/release-notes/index.rst
+++ b/docs/release-notes/index.rst
@@ -29,6 +29,7 @@ Patch releases
 .. toctree::
    :maxdepth: 1
 
+   2018/2018.6
    2018/2018.5
    2018/2018.4
    2018/2018.3