Merge remote-tracking branch 'origin/v2.4' into v2.4

[makedoc]

src/colvar/ContactMap.cpp

@@ -35,6 +35,7 @@ namespace colvar {
 //+PLUMEDOC COLVAR CONTACTMAP
 /*
 Calculate the distances between a number of pairs of atoms and transform each distance by a switching function.
+
 The transformed distance can be compared with a reference value in order to calculate the squared distance
 between two contact maps. Each distance can also be weighted for a given value. CONTACTMAP can be used together
 with \ref FUNCPATHMSD to define a path in the contactmap space.