Merge branch 'v2.3' into v2.4

CHANGES/v2.3.md

 @page CHANGES-2-3 Version 2.3
 
-Version 2.3 (Dec 12, 2016)
-----------------------------
+## Version 2.3 (Dec 12, 2016)
 
-Version
-2.3 contains several improvements with respect to 2.2. Users currently working with 2.2
+Version 2.3 contains several improvements with respect to 2.2. Users currently working with 2.2
 should have a look at the section "Changes leading to incompatible behavior" below and
 might need tiny adjustments in their input files.
 
@@ -127,8 +125,7 @@ For developers:
    are now passed by const ref) and false positives marked as such.
 - Added coverage scan.
 
-Version 2.3.1 (Mar 31, 2017)
--------------
+## Version 2.3.1 (Mar 31, 2017)
 
 - Fix to FIT_TO_TEMPLATE as in 2.2.5. Notice that in 2.3.0 also the case with TYPE=OPTIMAL was affected. This is fixed now.
 - small change in \ref CS2BACKBONE to symmetrise the ring current contribution with respect to ring rotations (also faster)
@@ -141,8 +138,8 @@ For developers:
 - Cppcheck on travis-ci has been updated to 1.77.
 - Doxygen on travis-ci has been updated to 1.8.13
 
-Version 2.3.2 (Jun 12, 2017)
--------------
+## Version 2.3.2 (Jun 12, 2017)
+
 See branch \branch{v2.3} on git repository.
 
 - Resolved problem with nan in \ref SMAC with SPECIESA and SPECIESB involving molecules that are the same
@@ -186,9 +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
--------------
-See branch \branch{v2.3} on git repository.
+## Version 2.3.3
 
 For users:
 - Fixed a bug in \ref switchingfunction MATHEVAL, leading to inconsistent results when using OpenMP with multiple threads (see \issue{249}).

CHANGES/v2.4.md

 @page CHANGES-2-4 Version 2.4
 
-Version 2.4 (coming soon)
-----------------------------
+## Version 2.4 (coming soon)
 
-Version
-2.4 contains several improvements with respect to 2.3. Users currently working with 2.3
+Version 2.4 contains several improvements with respect to 2.3. Users currently working with 2.3
 should have a look at the section "Changes leading to incompatible behavior" below and
 might need tiny adjustments in their input files.
 Notice that version 2.4 includes already all the fixes in branch 2.3 up to 2.3.2 indicated in \ref CHANGES-2-3 .

release.sh

@@ -20,14 +20,14 @@ confirm () {
 update_changelog() {
   echo $1 $2 $3
   awk -v version="$2" -v shortversion="$3" -v date="$4" '{
-    if(version == shortversion ".0" && $1=="Version" && $2==shortversion){
-      print "Version " shortversion " (" date ")"
+    if(version == shortversion ".0" && $1=="##" && $2=="Version" && $3==shortversion){
+      print "## Version " shortversion " (" date ")"
       done=1
-    } else if($1=="Version" && $2==version){
-      print "Version " version " (" date ")"
+    } else if($1=="##" && $2=="Version" && $3==version){
+      print "## Version " version " (" date ")"
       done=1
-    } else if(!done && $1=="Unreleased" && $2=="changes"){
-      print "Version " version " (" date ")"
+    } else if(!done && $1=="##" && $2=="Unreleased" && $3=="changes"){
+      print "## Version " version " (" date ")"
     } else print
   }' $1 > $1.tmp
   mv $1.tmp $1