From 01a1a421d55e452dc107ecf717245294984f5727 Mon Sep 17 00:00:00 2001
From: Bill Somerville <bill@classdesign.com>
Date: Fri, 5 Jun 2020 23:34:57 +0100
Subject: [PATCH] Release prep

---
 NEWS              | 40 ++++++++++++++++++++++++++++++++++++++++
 Release_Notes.txt |  6 +++---
 Versions.cmake    |  2 +-
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 626f697db..0ec8549f7 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,46 @@
 Copyright 2001 - 2020 by Joe Taylor, K1JT.
 
 
+		  Release: WSJT-X 2.2.1
+		       June 6, 2020
+		  ---------------------
+
+WSJT-X v2.2.1 is a bug fix release that fixes regressions found in the
+prior v2.2.0 release. Here is a brief summary;
+
+ - Incorporate a revised Hamlib version the address a regression in
+   rig control of some rigs including the Yaesu FT-991 and FT-891.
+
+ - Repair a defect in 6 character gridsquare lookup from the CALL3.TXT
+   database, and improve "Lookup" button processing.
+
+ - Repair a defect with selecting Wide Graph 2D spectrum types in
+   translated UIs.
+
+ - Repair a regression that blocked the Highlight Callsign UDP request
+   from highlighting terms including a '+' character.
+
+ - Repair  a  regression  where   occasional  Highlight  Callsign  UDP
+   requests with the 'Highlight last'  parameter as true highlighted a
+   match in a prior period. This fix include a performance improvement
+   when  processing any  Highlight  Callsign  request with  'Highlight
+   last' as true.
+
+ - Include support for the Yaesu FT-920 when controlled by Ham Radio
+   Deluxe. This change inadvertently missed the v2.2.0 GA release.
+
+ - Correct a documentation issue with the UDP Message Protocol
+   Status(1) message Special Operations Mode enumeration values ("WW
+   DIGI added", Fox, and Hound renumbered). Thanks to Sam, W2JDB, for
+   raising this issue.
+
+ - Updated Catalan UI translation, tnx Xavi, EA3W.
+
+ - Italian UI translation, tnx Marco, PY1ZRJ.
+
+ - Updated Spanish UI translation, tnx Cédric, EA4AC. 
+
+
 		   Release: WSJT-X 2.2
 		       June 2, 2020
 		   -------------------
diff --git a/Release_Notes.txt b/Release_Notes.txt
index ce6a8abaa..a1b300d4f 100644
--- a/Release_Notes.txt
+++ b/Release_Notes.txt
@@ -14,11 +14,11 @@ Copyright 2001 - 2020 by Joe Taylor, K1JT.
 
 
 		  Release: WSJT-X 2.2.1
-		       June 5, 2020
+		       June 6, 2020
 		  ---------------------
 
-WSJT-X 2.2.1 is a bug-fix release that fixes a critical defect found
-in the v2.2.0 GA release. Here is a brief summary;
+WSJT-X v2.2.1 is a bug fix release that fixes regressions found in the
+prior v2.2.0 release. Here is a brief summary;
 
  - Incorporate a revised Hamlib version the address a regression in
    rig control of some rigs including the Yaesu FT-991 and FT-891.
diff --git a/Versions.cmake b/Versions.cmake
index a36497a1d..d71b6bb0e 100644
--- a/Versions.cmake
+++ b/Versions.cmake
@@ -2,5 +2,5 @@
 set (WSJTX_VERSION_MAJOR 2)
 set (WSJTX_VERSION_MINOR 2)
 set (WSJTX_VERSION_PATCH 1)
-set (WSJTX_RC 4)		 # release candidate number, comment out or zero for development versions
+#set (WSJTX_RC 1)		 # release candidate number, comment out or zero for development versions
 set (WSJTX_VERSION_IS_RELEASE 1) # set to 1 for final release build