Merge branch 'master' of https://github.com/hmatuschek/kochmorse

README.md

@@ -2,8 +2,7 @@
 
 KochMorse is a simple morse-code tutor using the
 [Koch method](http://www.qsl.net/n1irz/finley.morse.html). It is written in C++ and uses
-[Qt5](https://qt-project.org) for the graphical user interface (GUI) and
-[PortAudio](http://www.portaudio.com/) as its audio backend.
+[Qt5](https://qt-project.org) for the graphical user interface (GUI).
 
 <img src="http://i60.tinypic.com/mlnhqc.png" alt="Koch Morse in action." align="middle"/>
 
@@ -12,22 +11,27 @@ KochMorse runs under Linux, MacOS X and even under Windows. See the
 
 
 ## Features
-Below, you will find a list of features of the current KochMorse release. The highlighted features
-are new features compared to the "old" python implementation.
-
- * *A simplified GUI* -- All settings are now accessible via the Preferences dialog.
- * A morse tutor using the Koch method (of course).
- * *A random morse tutor* -- Allows to select a set of characters and prosigns for practicing.
- * *A QSO tutor* -- Selects a random QSO from a set of over 900 for practicing.
+Below, you will find a list of features of the current KochMorse release.
+
+ * A morse tutor using the Koch method.
+ * A random morse tutor -- Allows to select a set of characters and prosigns for practicing.
+ * A QSO tutor -- Generates a random QSO text so you can practice reading typical QSOs.
+ * Customized text tutor -- This tutor allows you to listen to a plain-text file or to a text 
+   [generated](https://github.com/hmatuschek/kochmorse/wiki/TextGen) from a user-defined rules.
+ * A transmit tutor -- Connect your practice tone-generator to your microphone input and check your
+   transmissions with KochMorse.
+ * A chat tutor -- This tutor is a combination of the transmit tutor and the QSO tutor. Call CQ
+   and KochMorse will answer.
  * Different speed of characters and pauses. This allows to practice the reading in full speed,
    while having enough time to write the character down.
- * *Different tones for dashes and dots.*
- * *Noise audio effect* -- Increases the difficulty to read the morse code for practicing.
- * *Fading audio effect* -- Periodically fades the morse signal for practicing. In conjecture with
+ * Different tones for dashes and dots.
+ * Noise audio effect -- Increases the difficulty to read the morse code for practicing.
+ * Fading audio effect -- Periodically fades the morse signal for practicing. In conjecture with
    the noise effect, it simulates the conditions on HF bands pretty well.
 
 
 ## Releases 
+ * 2017-06-12 - [**Version 3.3.0**](https://github.com/hmatuschek/kochmorse/releases/tag/v3.3.0)
  * 2015-06-30 - [**Version 3.2.2**](https://github.com/hmatuschek/kochmorse/releases/tag/v3.2.2)
  * 2015-02-28 - [**Version 3.2.1**](https://github.com/hmatuschek/kochmorse/releases/tag/v3.2.1)
  * 2015-02-22 - [**Version 3.2.0**](https://github.com/hmatuschek/kochmorse/releases/tag/v3.2.0)
@@ -37,8 +41,10 @@ are new features compared to the "old" python implementation.
 
 ## History
 
-This is a C++/Qt reimplementation of my "old" python morse-code tutor (also called "kochmorse", https://kochmorse.googlecode.com). As the "old" implementation relied on ALSA for sound output, it was restricted to Linux. This reimplementation now uses PortAudio for the sound output and the GUI is implemented using Qt5, it is therefore more platform independent and runs under Linux, MacOS X and Windows.
-
-For this reimplementation, I simplified the GUI a lot. All settings are now "hidden" in a preferences dialog. All features of the "old" version are now present in this one and even some more...
+This is a C++/Qt reimplementation of my "old" python morse-code tutor (also called "kochmorse",
+https://kochmorse.googlecode.com). As the "old" implementation relied on ALSA for sound output,
+it was restricted to Linux. This reimplementation now uses PortAudio for the sound output and the
+GUI is implemented using Qt5, it is therefore more platform independent and runs under Linux,
+MacOS X and Windows.