Update ReleaseNotes and README for the upcoming release of 4.2

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

2 files changed, 36 insertions, 44 deletions

diff --git a/README b/README
index d61d0c065..da25f293d 100644
--- a/README
+++ b/README
@@ -1,35 +1,10 @@
+This is the README file for Subsurface 4.2
 
-This is the README file for Subsurface 4.1.94, the fifth Beta for 4.2
-
-It turns out a number of problems were caused by us still relying on Qt4
-for the Windows (and Mac) binaries. In part that was because Qt5 32bit
-installer for Windows were failing in strange ways.
-
-To work around this issues we made a rather drastic decision - there's now
-a 64bit Windows installer that includes Qt5 (and the Mac binaries have
-been moved over to Qt5 as well).
-
-While redoing the supporting cast we also switched to a newer Marble build
-and a newer libdivecomputer for the Mac and Windows installers.
-
-This (plus a bunch of patches) seems to have fixed a respectable number of
-bugs in Beta 4. Let's see how Beta 5 goes...
-
-Another new feature is a Russian translation of the manual, in addition to
-English and Spanish.
-
-Please be very careful when using it on your real data - while this is
-reasonably well tested by our developers, there's always a risk that this
-could eat your data file in unexpected ways (as Beta 2 has shown).
+Please check the ReleaseNotes.txt for details about new features and
+changes since Subsurface 4.1
 
 Report bugs and issues at http://trac.hohndel.org
 
-Previous REAMDE
-===============
-
-This is mainly a bug fix release, but there are rather significant changes
-under the hood. Check the ReleaseNotes.txt for details.
-
 License: GPLv2
 
 Subsurface can be found at http://subsurface.hohndel.org
@@ -44,12 +19,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.1  (or whatever the last release is)
+git checkout v4.2  (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.1.tgz
+http://subsurface.hohndel.org/downloads/Subsurface-4.2.tgz
 
 
 Basic Usage:
@@ -58,8 +33,17 @@ Basic Usage:
 Install and start from the desktop, or you can run it locally from the
 build directory:
 
+On Linux:
+
 $ ./subsurface
 
+On Mac:
+
+$ open Subsurface.app
+
+Native builds on Windows are not really supported (the official Windows
+installers are both cross-built on Linux).
+
 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.
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 63202fd85..510ed0521 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -44,20 +44,28 @@ Some of the changes since 4.1
 - There is still a deprecated 32bit installer including Qt4, but that has
   several known issues (among others, printing has a number of bugs that
   were fixed in Qt5).
-- The Mac installer has already been updated to Qt5
+- The Mac installer has also been updated to Qt5
 - A current development version of libdivecomputer is used for the Windows
   and Mac builds.
-- Dive Planner got added again, using the graphical profile editor
-  (we still cannot re-plan a planned dive - this is on the todo list)
-  print of the dive plan (without graphic profile) possible
+- A Dive Planner got added again, using the graphical profile editor; it
+  supports different ascent speeds, backgas breaks during deco and many
+  other interesting features; it allows the user to print just the dive
+  plan (without graphic profile); one shortcoming is that currently one
+  cannot re-plan a planned dive, i.e., once you save a dive plan, you can
+  no longer edit / change the plan; you have to start from scratch again.
+  This is on the todo list.
 - Pictures can be associated with dives and shown in the profile
-- Printing is much improved (but see above)
+- Printing is much improved (but see above), including a "1 dive per page"
+  mode and better rendering of dives an (in our mind) better data
+  presented per dive.
 - Data entry for dives is much more intuitive and consistent
-- Further work on the HTML exporter
-- Support to import dive log files from Seabear dive computers
-- user survey added to learn more about the needs of out users
-- new user manuals in Spanish and Russian
+- We have a reasonably functional HTML exporter for the dive log (it's
+  still work in progress but already quite powerful).
+- Support to import dive log files from Seabear dive computers.
+- We added a user survey to learn more about the interests and needs of
+  out users
 - improved and extended user manuals
+- new translated user manuals in Spanish and Russian
 
 Known issues:
 
@@ -70,12 +78,10 @@ Known issues:
   e.g. Calibri.
 
 - (Windows specific) When upgrading from Subsurface 4.1, after saving of a
-  logfile the logfiles name may be listed a second time in the files menua
+  logfile the logfiles name may be listed a second time in the files menue
   because of a change in the representation of logfiles filename in the
   Windows registry.
 
-Known bugs:
-
 - There are a number of small inconsistencies in the UI when editing
   multiple dives. For example, if multiple dives are edited and some of
   them already have coordinates set, under certain circumstances the
@@ -88,8 +94,10 @@ Known bugs:
 - When using the globe / map widget to edit dive locations, double clicks
   some times fail to set the correct position.
 
-- Sometimes Marble will show the same pane several times. Try to zoom in
-  or out of the location.
+- Sometimes the globe will show the same pane several times. Try to zoom
+  in or out of the location and give the system time to download the map
+  tiles in the background - on slower network connections this can take a
+  while.
 
 
 New in version 4.1 (compared to Subsurface 4.0.3):