From c6fcf46ec9905b036669bcc871bab1111159b301 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Mon, 26 Jul 2021 09:43:14 +0200
Subject: [PATCH] Further fine-tuning for 2021.07-rc1 -> 2021.07 (stable)

---
 beta/index.html.tt2       | 21 ++++-----------------
 changelogs/index.html.tt2 |  2 +-
 files/index.html.tt2      |  8 ++++----
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/beta/index.html.tt2 b/beta/index.html.tt2
index 2696f0b..79943e9 100644
--- a/beta/index.html.tt2
+++ b/beta/index.html.tt2
@@ -32,28 +32,15 @@
 
         <h2>Daily Build</h2>
 
-        <p><a href="http://daily.grml.org/">Daily builds</a> mostly reflect
+        <p><a href="https://daily.grml.org/">Daily builds</a> mostly reflect
         development of the next Grml release. These builds are not tested.</p>
 
-        <!--
-        <h2>Continuous Integration Build</h2>
-
-        <p>Our CI system builds a special version of the Grml amd64
-        flavour after every Grml git code change. This build is usually not
-        tested and includes experimental code that may not have been tested
-        either and that may never be released.
-        <a href="http://jenkins.grml.org/job/grml-full-amd64/">See here.</a></p>
-        -->
-
         <h2>Release Candidates</h2>
 
-        <p>Shortly before we publish a new release a release candidate version
-        is made available to the public.
-        <!--
-        Currently there's no release candidate
-        version available.</p>
-        -->
+        <p>Shortly before we publish a new release a release candidate version is made available to the public.
+        Currently there's no release candidate version available.</p>
 
+        <!--
         The CURRENT RELEASE CANDIDATE is available for
         <a href="/download/prerelease/">download NOW</a>.</p>
 
diff --git a/changelogs/index.html.tt2 b/changelogs/index.html.tt2
index 8fe758a..d825930 100644
--- a/changelogs/index.html.tt2
+++ b/changelogs/index.html.tt2
@@ -31,7 +31,7 @@
         <h2>Current release</h2>
 
         <p>
-        <a href="README-grml-2021.07-rc1/">Release announcement for Grml 2021.07-rc1 - codename JauKerl</a>
+        <a href="README-grml-2021.07/">Release announcement for Grml 2021.07 - codename JauKerl</a>
         </p>
 
         <p>
diff --git a/files/index.html.tt2 b/files/index.html.tt2
index 85b3923..c818352 100644
--- a/files/index.html.tt2
+++ b/files/index.html.tt2
@@ -83,7 +83,7 @@ sudo apt-get install grml-debian-keyring
 
         <h2><a name="debian"></a>Package lists for the current release</h2>
 
-        <h3>grml32-full 2021.07(-rc1)</h3>
+        <h3>grml32-full 2021.07</h3>
 
         <ul>
           <li><a href="grml32-full_2021.07/dpkg.selections">dpkg.selections</a> - software package listing</li>
@@ -92,7 +92,7 @@ sudo apt-get install grml-debian-keyring
           <li><a href="grml32-full_2021.07/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</li>
         </ul>
 
-        <h3>grml64-full 2021.07(-rc1)</h3>
+        <h3>grml64-full 2021.07</h3>
 
         <ul>
           <li><a href="grml64-full_2021.07/dpkg.selections">dpkg.selections</a> - software package listing</li>
@@ -101,7 +101,7 @@ sudo apt-get install grml-debian-keyring
           <li><a href="grml64-full_2021.07/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</li>
         </ul>
 
-        <h3>grml32-small 2021.07(-rc1)</h3>
+        <h3>grml32-small 2021.07</h3>
 
         <ul>
           <li><a href="grml32-small_2021.07/dpkg.selections">dpkg.selections</a> - software package listing</li>
@@ -109,7 +109,7 @@ sudo apt-get install grml-debian-keyring
           <li><a href="https://git.grml.org/?p=grml-live.git;a=blob_plain;f=templates/GRML/grml-cheatcodes.txt;hb=HEAD">grml-cheatcodes.txt</a> - boot options</li>
         </ul>
 
-        <h3>grml64-small 2021.07(-rc1)</h3>
+        <h3>grml64-small 2021.07</h3>
 
         <ul>
           <li><a href="grml64-small_2021.07/dpkg.selections">dpkg.selections</a> - software package listing</li>
-- 
2.1.4