From 533b9d65b6f96fc35dc915690d05232b68c777c6 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Sat, 12 Dec 2009 20:40:54 +0000
Subject: [PATCH] tools: version cleanup

---
 Makefile | 9 ++++-----
 VERSION  | 4 +---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index c4ded22dd..5e1c9e63c 100644
--- a/Makefile
+++ b/Makefile
@@ -368,8 +368,8 @@ hoogleindex: $(MAIN)
 
 # Build a release, tag the repo, prepare a cabal package
 # Don't forget to update VERSION first. Examples:
-# releasing 0.5:          set VERSION to 0.5, make release
-# doing a bugfix release: set VERSION to 0.5.1, make release
+# normal release:   echo 0.7   >VERSION; make release
+# a bugfix release: echo 0.7.1 >VERSION; make release
 release: releasetest setandrecordversion tagrelease sdist
 
 # Upload the latest cabal package and update hledger.org
@@ -402,9 +402,8 @@ Version.hs: $(VERSIONFILE)
 # update the version string in local files. Triggered by "make".
 setversion: $(VERSIONFILES)
 
-# update the version string in local files, and record them (and
-# $VERSIONFILE) if changed.  Be careful, will record all changes in those
-# files (so prompts interactively). Triggered by "make release".
+# update the version number in local files, and prompt to record changes
+# in these files. Triggered by "make release".
 setandrecordversion: setversion
 	darcs record -m "update version" $(VERSIONFILE) $(VERSIONFILES)
 
diff --git a/VERSION b/VERSION
index 7d37d2324..0e2c93950 100644
--- a/VERSION
+++ b/VERSION
@@ -1,3 +1 @@
--- the release version. Normally major.minor[.bugfix], must be numeric.
--- examples: 0.5, 0.5.1 (a bugfix release), 0.5.98 (0.6 alpha), 0.5.99 (0.6 beta)
-0.7.0
\ No newline at end of file
+0.7
\ No newline at end of file