From a273351ca5c96c57949977758cd07c38c57254c1 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Sat, 6 Jun 2020 15:01:13 +0200
Subject: [PATCH] Grml 2020.06-rc1, here we come

---
 changelogs/index.html.tt2 |  3 ++-
 download/index.html.tt2   |  2 --
 index.html.tt2            | 12 +++++-------
 static.inc                |  2 +-
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/changelogs/index.html.tt2 b/changelogs/index.html.tt2
index 5a1ba25..c3f4177 100644
--- a/changelogs/index.html.tt2
+++ b/changelogs/index.html.tt2
@@ -32,12 +32,13 @@
         <h2>Current release</h2>
 
         <p>
-        <a href="README-grml-2018.12/">Release announcement for Grml 2018.12 - codename Gnackwatschn</a>
+        <a href="/changelogs/README-grml-2020.06-rc1/">Release announcement for Grml 2020.06-rc1 - codename Ausgehfuahangl</a>
         </p>
 
         <h2>Previous releases</h2>
 
         <ul>
+          <li><a href="README-grml-2018.12/">Grml 2018.12</a> - codename Gnackwatschn</a>
           <li><a href="README-grml-2017.05/">Grml 2017.05</a> - codename Freedatensuppe</li>
           <li><a href="README-grml-2014.11/">Grml 2014.11</a> - codename Gschistigschasti</li>
           <li><a href="README-grml-2014.03/">Grml 2014.03</a> - codename Ponywagon</li>
diff --git a/download/index.html.tt2 b/download/index.html.tt2
index 975e865..accac91 100644
--- a/download/index.html.tt2
+++ b/download/index.html.tt2
@@ -81,9 +81,7 @@
 
     <p>Get the current stable release here.<br />
 
-    <!--
     <a href="prerelease/">Looking for the current pre-release version instead?</a></p>
-    -->
 
     <p>Download the Grml flavour you need, then write it to a CD-ROM/DVD or an empty USB stick.</p>
 
diff --git a/index.html.tt2 b/index.html.tt2
index a6464e8..58f8d33 100644
--- a/index.html.tt2
+++ b/index.html.tt2
@@ -10,7 +10,7 @@
 <meta name="fdse-index-as" content="http://grml.org/" />
 <meta name="Robots" content="index,follow" />
 <meta name="Language" content="english" />
-<meta name="identifier-url" content="http://grml.org/" />
+<meta name="identifier-url" content="https://grml.org/" />
 <meta name="MSSmartTagsPreventParsing" content="true" />
 <meta http-equiv="imagetoolbar" content="no" />
 <link rel="home" href="/" title="grml.org" />
@@ -33,7 +33,7 @@
             <h2>What is Grml?</h2>
 
             <p>Grml is a bootable live system (Live-CD) based on <a
-              href="http://www.debian.org/">Debian</a>. Grml includes a
+            href="https://www.debian.org/">Debian</a>. Grml includes a
             collection of GNU/Linux software especially for system
             administrators. Users don't have to install anything on fixed
             storage. Grml is especially well suited for administrative tasks like installation,
@@ -43,27 +43,25 @@
             <br />
 
             <p style="text-align: center;">
-	    <b>The <a href="/changelogs/README-grml-2018.12/">current release</a>:</b><br/><br/>
+            <b>The <a href="/changelogs/README-grml-2018.12/">current release</a>:</b><br/><br/>
             <a href="/download/" class="button" style="padding: 12px; font-weight: bold;"><span>Download Grml 2018.12</span></a>
             </p>
             <br />
 
-	    <!--
             <p style="text-align: center;">
             <b>Pre-Release:</b><br/><br/>
-            <a href="/download/prerelease/" class="button" style="padding: 12px; font-weight: bold;"><span>Download Grml 2018.12-rc1</span></a>
+            <a href="/download/prerelease/" class="button" style="padding: 12px; font-weight: bold;"><span>Download Grml 2020.06-rc1</span></a>
             </p>
             <br />
-	    -->
 
             <img style="float: right; margin-left: 20px" src="/img/grmltux_small.jpg" alt="*" />
             <br />
 
             <h2>News</h2>
             <div class="news">
+            <p>06 Jun 2020: New <a href="/changelogs/README-grml-2020.06-rc1/">release candidate version 2020.06-rc1</a></p>
             <p>11 Jan 2019: Grml/Debian <a href="https://blog.grml.org/archives/402-GrmlDebian-Bug-Squashing-Party-in-Salzburg,-2019.html">Bug Squashing Party in Salzburg</a> (April 2019)</p>
             <p>31 Dec 2018: New <a href="/changelogs/README-grml-2018.12/">stable release 2018.12</a></p>
-            <p>20 Dec 2018: New <a href="/changelogs/README-grml-2018.12-rc1/">release candidate version 2018.12-rc1</a></p>
             </div>
 
       </div>
diff --git a/static.inc b/static.inc
index c30bbe8..5703471 100644
--- a/static.inc
+++ b/static.inc
@@ -12,7 +12,7 @@
               </p>
             <h3>News</h3>
               <p>
-                <a class="plain" href="http://blog.grml.org/">Blog</a> &nbsp;
+                <a class="plain" href="https://blog.grml.org/">Blog</a> &nbsp;
                 <a href="https://www.twitter.com/grmlproject"><img src="/img/twitter.png" alt="Follow grmlproject on Twitter" class="absmiddle" /></a>
                 <br/>