Merge tag 'upstream/6.4.0'

Upstream version 6.4.0

1 files changed, 2 insertions, 2 deletions

diff --git a/scripts/set_version.py b/scripts/set_version.py
index 289aaef..38ea03c 100755
--- a/scripts/set_version.py
+++ b/scripts/set_version.py
@@ -23,7 +23,7 @@ def sed_like_thing(pattern, repl, path):
         outf.write(data)
 
 if __name__ == "__main__":
-    print("New version number: ", end="")
+    print("New version number (in format X.Y.Z): ", end="")
     sys.stdout.flush()
     version = sys.stdin.readline().strip()
 
@@ -34,5 +34,5 @@ if __name__ == "__main__":
     sed_like_thing("version = '.+'", "version = '{0}'".format(version), os.path.join('docs', 'sphinx', 'conf.py'))
     sed_like_thing("release = '.+'", "release = '{0}'".format(version), os.path.join('docs', 'sphinx', 'conf.py'))
     sed_like_thing('__version__ = ".*"', '__version__ = "{0}"'.format(version), os.path.join('nikola', '__init__.py'))
-    sed_like_thing('New in Master', 'New in {0}'.format(version), 'CHANGES.txt')
+    sed_like_thing('New in master', 'New in v{0}'.format(version), 'CHANGES.txt')
     os.system("help2man -h help -N --version-string='{0}' nikola > {1}".format(version, os.path.join('docs', 'man', 'nikola.1')))