Merge branch 'v2.3' into v2.4

CHANGES/v2.3.md

@@ -183,7 +183,7 @@ For developers:
 - On travis-ci, docs for unofficial or unsupported branches are set not to be indexed by search engines (see \issue{239})
 - Cppcheck on travis-ci has been updated to 1.79.
 
-## Version 2.3.3
+## Version 2.3.3 (coming soon)
 
 For users:
 - Fixed a bug in \ref switchingfunction MATHEVAL, leading to inconsistent results when using OpenMP with multiple threads (see \issue{249}).

user-doc/Doxyfile

@@ -238,7 +238,7 @@ ALIASES                = \
                          "tarball{1}=<a href=\"tutorial-resources/\1.tar.gz\" style=\"font-weight:bold\" style=\"color:green\" download=\"\1.tar.gz\"> TARBALL </a>" \
                          "plumedfile=\verbatim BEGIN_PLUMED_FILE" \
                          "endplumedfile=\endverbatim" \
-                         "plumednotmaintained=\warning This branch is not maintained. Users are invited to upgrade to a newest version"
+                         "plumednotmaintained=\warning This branch is not maintained. Users are invited to upgrade to a newer version"
 
 # This tag can be used to specify a number of word-keyword mappings (TCL only).
 # A mapping has the form "name=value". For example adding "class=itcl::class"