From: Michael Prokop <mika@grml.org>
Date: Thu, 17 May 2012 17:56:55 +0000 (+0200)
Subject: Enable 2012.05-rc1 on download and start page
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=bd656a12e8cfb6cec132b2a833860f37caf6b2cc;p=grml.org.git

Enable 2012.05-rc1 on download and start page
---

diff --git a/download/index.html.tt2 b/download/index.html.tt2
index 0736c6e..7cee4c2 100644
--- a/download/index.html.tt2
+++ b/download/index.html.tt2
@@ -80,7 +80,7 @@
     <h1>Download Grml 2011.12</h1>
 
     <p>Get the current stable release here.<br />
-<!--    <a href="prerelease/">Looking for the current pre-release version instead?</a></p> -->
+    <a href="prerelease/">Looking for the current pre-release version instead?</a></p>
 
     <p>Download Grml and then write it to a CD-R or an empty USB key.</p>
 
@@ -117,10 +117,10 @@
     <br />
     <br />
     <br />
-    <!--
-    <a href="/download/prerelease/" class="button" style="padding: 12px; font-weight: bold;"><span>Get 2011.12-rc1 instead!</span></a>
+
+    <a href="/download/prerelease/" class="button" style="padding: 12px; font-weight: bold;"><span>Get 2012.05-rc1 instead!</span></a>
     <br />
-     -->
+
     </div></div>
 
     <div class="download_panel" id="download_panel2"><div>
diff --git a/index.html.tt2 b/index.html.tt2
index f3b4388..86af481 100644
--- a/index.html.tt2
+++ b/index.html.tt2
@@ -48,18 +48,18 @@
             </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 2011.12-rc1</span></a>
+            <a href="/download/prerelease/" class="button" style="padding: 12px; font-weight: bold;"><span>Download Grml 2012.05-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>17 May 2012: Release candidate version <a href="/changelogs/README-grml-2012.05-rc1/">2012.05-rc1</a> available</p>
             <p>16 May 2012: New Grml developer: Evgeni Golov</p>
             <p>23 Feb 2012: Grml featured <a href="http://blog.grml.org/archives/373-Grml-featured-in-Linux-User-032012.html">in Linux User 03/2012</a></p>
             <p>17 Jan 2012: We want <a href="http://blog.grml.org/archives/372-We-want-you!.html">YOU!</a></p>