Update release notes for stable release

* don't redirect to /download/prerelease/ but /download/ on the stable release announcement
* mention stable release on rc1 webpage
* properly sort list of contributors

diff --git a/changelogs/README-grml-2018.12-rc1/index.html.tt2 b/changelogs/README-grml-2018.12-rc1/index.html.tt2
index 20b5080..4a8f05d 100644 (file)
--- a/changelogs/README-grml-2018.12-rc1/index.html.tt2
+++ b/changelogs/README-grml-2018.12-rc1/index.html.tt2
@@ -26,6 +26,8 @@
 
         <h1>Release Notes for Grml 2018.12-rc1 - codename <a href="/faq/#releasename">Gnackwatschn</a></h1>
 
+       <p><strong>NOTE: the <a href="/changelogs/README-grml-2018.12/">stable release 2018.12</a> is already available!</strong></p>
+
         <p><a href="/download/prerelease/">Download Now</a></p>
 
         <h3>About</h3>
@@ -43,7 +45,7 @@
           If you should notice a slow boot and want to force the startup of the haveged service (independent of usage of ssh boot option)
           you can start the service via boot option `services=haveged`.
           See e.g. <a href="https://daniel-lange.com/archives/152-Openssh-taking-minutes-to-become-available,-booting-takes-half-an-hour-...-because-your-server-waits-for-a-few-bytes-of-randomness.html">Openssh
-            taking minutes to become available [...]</a> for further information.
+          taking minutes to become available [...]</a> for further information.
 
           <li>The cpufrequtils package with its loadcpufreq handling has been dropped. The cpufreq drivers are autoloaded and the powersave/ondemand driver is mature enough. The linux-cpupower tools provide the binaries as replacement for what cpufrequtils provided so far.
 
@@ -228,26 +230,25 @@ Guillem Jover,
 Helmut Grohne,
 hex2a,
 James Tocknell
+joeran,
+karlh1,
 Leo Bergolth,
 luke2261git,
 Marc Haber,
 Marcos Mello,
 Markus Lindberg,
 Martin Besser,
+maximebuy,
 Michael Biebl,
 Michael Eischer,
 Michael Schierl,
 Moviuro,
-Patrick Schleizer,
-Paul Menzel,
-Ralf Moll,
-sl0n,
-maximebuy,
 Mykola Malkov,
-karlh1,
 Patrick Neumann,
-joeran,
-
+Patrick Schleizer,
+Paul Menzel,
+Ralf Moll +
+sl0n
         for their contributions.</p>
 
         <h3>More Information</h3>

diff --git a/changelogs/README-grml-2018.12/index.html.tt2 b/changelogs/README-grml-2018.12/index.html.tt2
index e4d18ee..255c477 100644 (file)
--- a/changelogs/README-grml-2018.12/index.html.tt2
+++ b/changelogs/README-grml-2018.12/index.html.tt2
@@ -26,7 +26,7 @@
 
         <h1>Release Notes for Grml 2018.12 - codename <a href="/faq/#releasename">Gnackwatschn</a></h1>
 
-        <p><a href="/download/prerelease/">Download Now</a></p>
+        <p><a href="/download/">Download Now</a></p>
 
         <h3>About</h3>
 
@@ -43,7 +43,7 @@
           If you should notice a slow boot and want to force the startup of the haveged service (independent of usage of ssh boot option)
           you can start the service via boot option `services=haveged`.
           See e.g. <a href="https://daniel-lange.com/archives/152-Openssh-taking-minutes-to-become-available,-booting-takes-half-an-hour-...-because-your-server-waits-for-a-few-bytes-of-randomness.html">Openssh
-            taking minutes to become available [...]</a> for further information.
+          taking minutes to become available [...]</a> for further information.
 
           <li>The cpufrequtils package with its loadcpufreq handling has been dropped. The cpufreq drivers are autoloaded and the powersave/ondemand driver is mature enough. The linux-cpupower tools provide the binaries as replacement for what cpufrequtils provided so far.