Inching towards the 4.0 release

Updates to README, ReleaseNotes.txt and subsurface.pro

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

3 files changed, 30 insertions, 16 deletions

diff --git a/README b/README
index 94eee1f85..b4feaa027 100644
--- a/README
+++ b/README
@@ -1,15 +1,26 @@
 
 This is the README file for Subsurface 4.0.
 
-After the release of Subsurface 3.1 we merged the Qt branch into
-master and started developing the Qt port of Subsurface in the master
-branch. At this stage the Qt version has by and large reached
-functional parity with version 3.1; two notable features are missing:
-the filter by event type and the dive planner. The user experience and
-look and feel on the other hand far surpass what was available in 3.1
+After the release of Subsurface 3.1 the Subsurface developer team
+decided to make a major change in the development direction of the
+project. We switched to Qt as our UI toolkit and slowly, step by step
+replaced all the Gtk with corresponding Qt code.
+
+This caused lots of changes, from adding C++ code, switching build
+systems to use qmake, to refactoring the tightly intervoven UI and
+logic code that we had up until 3.1. The vast majority of this work
+was done by just a handful of people with Tomaz Canabrava carrying the
+biggest part of the load. As we had hoped, the switch to Qt brought us
+many new active developers and the Qt community has been extremely
+helpful supporting us when we ran into trouble.
+
+At this stage the Qt version has by and large reached functional
+parity with version 3.1; two notable features are missing: the filter
+by event type and the dive planner. The user experience and look and
+feel on the other hand far surpass what was available in 3.1.
 
 As always in a massive rewrite like this, there are still a small
-handful of known bugs and issues - please check ReleaseNotes.tzt and
+handful of known bugs and issues - please check ReleaseNotes.txt and
 our bug tracker at trac.hohndel.org.
 
 The latest public version is Subsurface 4.0, released in December of 2013.
@@ -39,13 +50,14 @@ http://subsurface.hohndel.org/downloads/Subsurface-4.0.tgz
 Basic Usage:
 ============
 
-Install and start from the desktop (or you can run it locally from the
-build directory).
+Install and start from the desktop, or you can run it locally from the
+build directory:
 
-./subsurface
+$ ./subsurface
 
-You can give a data file as command line argument, or Subsurface picks a
-default file for you when started from the desktop or without an argument.
+You can give a data file as command line argument, or (once you have
+set this up in the Preferences) Subsurface picks a default file for
+you when started from the desktop or without an argument.
 
 If you have a dive computer supported by libdivecomputer, you can just
 select "Import from Divecomputer" from the "Import" menu, select which
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index f028b7571..47cbd7745 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -12,7 +12,7 @@ large number of supported dive computers. Subsurface is able to track
 single- and multi-tank dives using air, Nitrox or TriMix. It displays
 a dive profile with all related information including air consumption
 and alarms. It also allows logging of information like weights and
-exposure protection used, dive masters and dive buddies and enables
+exposure protection used, dive masters and dive buddies, and enables
 the user to rate dives and provide additional dive notes.
 
 With Subsurface the user can track dive locations including GPS
@@ -48,7 +48,7 @@ for quite a bit of cleanup and many improvements.
 
 The basic concepts are the same, most of the basic features are the
 same, but trying to create a concise list of changes that summarizes
-the more than 1700 commits that have gone in since version 3.1 seems a
+the more than 1600 commits that have gone in since version 3.1 seems a
 daunting task.
 
 Here are some of the highlights:
@@ -65,7 +65,7 @@ Here are some of the highlights:
 - addition of a "ruler" tool in the profile window that allows
   measuring of many properties between two points in the profile
 - better tag system with both predefined user-specified free text tags
-- better integration with divelogs.de (upload support)
+- better integration with divelogs.de (upload & download support)
 - ability to show the user manual from within the application without
   a life internet connection and without opening the manual in an
   external browser window
@@ -76,6 +76,8 @@ Known issues:
 - Filter->Select Events is not implemented
 - Dive planner has been disabled for now
 
+
+
 New in version 3.1 (compared to Subsurface 3.0.2):
 --------------------------------------------------
 
diff --git a/subsurface.pro b/subsurface.pro
index 1616ec2ab..d833cb8f7 100644
--- a/subsurface.pro
+++ b/subsurface.pro
@@ -6,7 +6,7 @@ INCLUDEPATH += qt-ui $$PWD
 mac: TARGET = Subsurface
 else: TARGET = subsurface
 
-VERSION = 3.9.2
+VERSION = 4.0
 
 HEADERS = \
 	color.h \