Merge branch 'v2.3' into v2.4

[makedoc]

src/bias/ReweightBias.cpp

@@ -46,7 +46,7 @@ we use reweighting into order to discount the effect of the bias from our final
 \plumedfile
 x: DISTANCE ATOMS=1,2
 RESTRAINT ARG=x SLOPE=1.0 AT=0.0
-as: REWEIGHT_BIAS TEMP=300
+bias: REWEIGHT_BIAS TEMP=300
 
 HISTOGRAM ...
   ARG=x
@@ -54,7 +54,7 @@ HISTOGRAM ...
   GRID_MAX=3.0
   GRID_BIN=100
   BANDWIDTH=0.1
-  LOGWEIGHTS=as
+  LOGWEIGHTS=bias
   LABEL=hB
 ... HISTOGRAM
 

src/bias/ReweightMetad.cpp

@@ -44,7 +44,7 @@ a: ANGLE ATOMS=1,2,3
 x: DISTANCE ATOMS=1,2
 METAD ARG=x PACE=100 SIGMA=0.1 HEIGHT=1.5 BIASFACTOR=5 GRID_MIN=0 GRID_MAX=10 GRID_BIN=100 REWEIGHTING_NGRID=100 REWEIGHTING_NHILLS=50
 
-as: REWEIGHT_METAD TEMP=300
+bias: REWEIGHT_METAD TEMP=300
 
 HISTOGRAM ...
   ARG=a