Getting ready for 4.1 Beta 2

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

4 files changed, 29 insertions, 11 deletions

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index f6badc758..ef13e4874 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1,5 +1,5 @@
-// Subsurface 4.0.1 User Manual
-// ============================
+// Subsurface 4.1 User Manual
+// ==========================
 // :author: Manual authors: Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,
 // Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Willem
 // Ferguson, Salvador Cuñat
@@ -16,7 +16,7 @@ image::images/Subsurface4Banner.png["Banner",align="center"]
 [big]#USER MANUAL#
 
 *Manual authors*: Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,
-Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert,  Salvador Cuñat
+Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat
 
 [blue]#_Version 4.1,  May 2014_#
 
diff --git a/README b/README
index 9077c4dd7..3ca4aa206 100644
--- a/README
+++ b/README
@@ -1,10 +1,8 @@
 
-This is the README file for Subsurface 4.1 BETA1
+This is the README file for Subsurface 4.1 BETA2
 
 This is mainly a bug fix release, but there are rather significant changes
-under the hood.
-
-The latest public version is Subsurface 4.0.3, released in February of 2014.
+under the hood. Check the ReleaseNotes.txt for details.
 
 License: GPLv2
 
@@ -20,12 +18,12 @@ You can also browse the sources via gitweb at git.hohndel.org
 If you want the latest release (instead of the bleeding edge
 development version) you can either get this via
 
-git checkout v4.0.3  (or whatever the last release is)
+git checkout v4.1  (or whatever the last release is)
 
 if you have already cloned the git repository as shown above or you
 can get a tar ball from
 
-http://subsurface.hohndel.org/downloads/Subsurface-4.0.3.tgz
+http://subsurface.hohndel.org/downloads/Subsurface-4.1.tgz
 
 
 Basic Usage:
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 8fecfbbab..76e3be265 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -40,9 +40,30 @@ air consumption) during the dive through the coloring of the graphs.
 New in version 4.1 (compared to Subsurface 4.0.3):
 --------------------------------------------------
 
+- new and improved profile widget with animations, better info box, and
+  a new toolbox to turn on and off many of the additional graphs and
+  information displays
+- improved CVS import and added CVS export
+- generalized import dialog
+- much improved consistency for dialog boxes, keyboard shortcuts, etc
+- improved error handling when downloading from divecomputer
+- export an HTML world map with dive sites
+- make backups before overwriting XML files
+- lots of code cleanup, style fixes, improved consistency
+- improve Qt5 support (but there are still some visual oddities)
+- many improvements to the build infrastructure (out of tree builds,
+  ability to build without Marble, make WIP planner a config option)
+- more than 50 bugs fixed
+- new translation (Greek, British-English, Latvian, and Romanian)
+- experimental "check for updates" feature (mostly for Windows and Mac)
+- experimental undocumented alternative storage format
+
 New in version 4.0.3 (compared to Subsurface 4.0.2):
 ----------------------------------------------------
 
+- fixed unitinialized variable bug that caused errors downloading from
+  divecomputers
+
 New in version 4.0.2 (compared to Subsurface 4.0.1):
 ----------------------------------------------------
 
@@ -268,4 +289,3 @@ Uwatec
 	Smart, Galileo (infraread)
 Zeagle
 	N2iTiON 3
-
diff --git a/subsurface.pro b/subsurface.pro
index e00bea5a0..12b8922df 100644
--- a/subsurface.pro
+++ b/subsurface.pro
@@ -13,7 +13,7 @@ DEPENDPATH += qt-ui
 mac: TARGET = Subsurface
 else: TARGET = subsurface
 
-VERSION = 4.0.95
+VERSION = 4.0.97
 
 # enable or disable the dive planner
 planner {