git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: b3fb20b)
Merge branch 'develop' into releases/Release_2_11_2_Branch Release_2_11_2_3
authorJim Procter <j.procter@dundee.ac.uk>
Tue, 5 Jul 2022 21:53:03 +0000 (22:53 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Tue, 5 Jul 2022 21:53:03 +0000 (22:53 +0100)
build.gradle patch | blob | history
help/markdown/releases/release-2_11_2_3.md patch | blob | history
help/templates/whatsNew.html patch | blob | history

diff --git a/build.gradle b/build.gradle
index 4f9798c..a62e85a 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -1561,6 +1561,7 @@ task releasesTemplates {
       whatsnewHtml = whatsnewTemplateFile.text.replaceAll("__WHATS_NEW__", whatsnewHtml)
       whatsnewHtmlFile.text = hugoTemplateSubstitutions(whatsnewHtml,
         [
+            VERSION: JALVIEW_VERSION,
           DISPLAY_DATE: wnDisplayDate
         ]
       )
diff --git a/help/markdown/releases/release-2_11_2_3.md b/help/markdown/releases/release-2_11_2_3.md
index f78868f..e229cb0 100644 (file)
--- a/help/markdown/releases/release-2_11_2_3.md
+++ b/help/markdown/releases/release-2_11_2_3.md
@@ -1,6 +1,6 @@
 ---
 version: 2.11.2.3
-date: 2022-07-05
+date: 2022-07-06
 channel: "release"
 ---
 
diff --git a/help/templates/whatsNew.html b/help/templates/whatsNew.html
index 52df728..70deea4 100755 (executable)
--- a/help/templates/whatsNew.html
+++ b/help/templates/whatsNew.html
@@ -24,12 +24,11 @@
 </head>
 <body>
   <p>
-    <strong>Welcome to Jalview Version $$Version-Rel$$ !!</strong><br/>
+    <strong>Welcome to Jalview Version __VERSION__ (released __DISPLAY_DATE__)!!</strong><br/>
   </p>
-  <p><em>__DISPLAY_DATE__</em></p>
 __WHATS_NEW__
   <p>
-    This release series provides support for two popular 3D
+    The 2.11.2 release series provides support for two popular 3D
     structure visualisation tools, new features for discovery of 3D
     structures, improved platform integration and a new command line
     tool allowing Jalview to be more easily called from scripts.</p>
@@ -79,7 +78,7 @@ __WHATS_NEW__
 
   <p>
       For the full details, see <a
-        href="releases.html#Jalview.2.11.2.1">the Jalview 2.11.2.1
+        href="releases.html#Jalview.2.11.2">the Jalview 2.11.2 series
         release notes</a>.
     </p>
   <p>