Merge branch 'hotfix/4.17.1'

delphidabbler · delphidabbler · commit d03ee3453e06 · 2020-07-31T12:54:22.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,14 @@ This change log begins with the first ever pre-release version of _CodeSnip_. Re
 From v4.1.0 the version numbering has attempted to adhere to the principles of [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## Release v4.17.1 of 31 July 2020
+
+Hotfix release.
+
+* Corrected "What's New" dialogue box content that is displayed _only_ when updating from v4.15.1 and earlier. The correction is to ensure the text makes sense when release 4.16.0 has been skipped. This change should have been made in v4.17.0.
+* Removed a redundant resource.
+
+
 ## Release v4.17.0 of 31 July 2020
 
 + Added support for test compilation with, and detection of, Delphi 10.2 Tokyo, Delphi 10.3 Rio and Delphi 10.4 Sydney compilers.
diff --git a/Src/HTML.hrc b/Src/HTML.hrc
@@ -28,9 +28,6 @@ Res\HTML\dlg-comperror-tplt.html
 # active text preview dialogue
 Res\HTML\dlg-activetext-preview-tplt.html
 
-# news dialogue
-Res\HTML\dlg-rssnews.html
-
 # SWAG import dialogue
 Res\HTML\dlg-swag-import-intro-tplt.html
 Res\HTML\dlg-swag-import-outro-tplt.html
diff --git a/Src/Res/HTML/dlg-rssnews.html b/Src/Res/HTML/dlg-rssnews.html
diff --git a/Src/Res/HTML/dlg-whatsnew.html b/Src/Res/HTML/dlg-whatsnew.html
@@ -21,18 +21,9 @@
   </head>
 
   <body>
-<!--
-	*** This para to be used in release after 4.16.0:
 		<p class="lead">
 			You seem to be updating from a version of CodeSnip prior to v4.16.0.
 		</p>
--->
-<!--
-	*** Following para to be removed from release after 4.16.0
--->
-		<p class="lead">
-			Important information about CodeSnip v4.16.0
-		</p>
 		<p>
 			<strong>There are several important differences from your old version of CodeSnip that you need to know about.</strong>
 		</p>
diff --git a/Src/VCodeSnip.vi b/Src/VCodeSnip.vi
@@ -8,8 +8,8 @@
 
 
 [Fixed File Info]
-File Version #=4, 17, 0, 258
-Product Version #=4, 17, 0, 0
+File Version #=4, 17, 1, 259
+Product Version #=4, 17, 1, 0
 File OS=4
 File Type=1
 File Sub-Type=0
diff --git a/Src/VCodeSnipPortable.vi b/Src/VCodeSnipPortable.vi
@@ -8,8 +8,8 @@
 
 
 [Fixed File Info]
-File Version #=4, 17, 0, 258
-Product Version #=4, 17, 0, 0
+File Version #=4, 17, 1, 259
+Product Version #=4, 17, 1, 0
 File OS=4
 File Type=1
 File Sub-Type=0
