Merge branch 'master' into release-v2.4.0

scripts/docs.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 if [ "$1" != "build" -a "$1" != "start" ];then
-  echo "usage: npm run docsite (build|start)" >&2
+  echo "usage: npm run docs (build|start)" >&2
   exit 1
 fi
 

scripts/release/update-changelog-release-date.js

@@ -7,7 +7,8 @@ const fs = require('fs');
 const cp = require('child_process');
 
 const pkg = require('../../package.json');
-if (pkg.version.indexOf('-rc') !== -1) {
+const suffix = process.env.PRERELEASE_SUFFIX || 'rc';
+if (pkg.version.indexOf('-' + suffix) !== -1) {
   process.exit(0);
 }