put prerelease links and news into place

diff --git a/beta/index.php b/beta/index.php
index 8653213..75bec2d 100644 (file)
--- a/beta/index.php
+++ b/beta/index.php
@@ -50,6 +50,11 @@
         <p>Shortly before a release will happen, a release candidate will
         usually be announced on <a href="/irc/">IRC</a>.</p>
 
+        <!--
+        -->
+        <p>The CURRENT RELEASE CANDIDATE is available for
+        <a href="/download/prerelease/">download NOW</a>.</p>
+
       </div>
 
 <?php include '../static_bottom.inc'; ?>

diff --git a/download/index.php b/download/index.php
index 3b7b271..3793ad2 100644 (file)
--- a/download/index.php
+++ b/download/index.php
@@ -79,10 +79,8 @@
 
     <h1>Download Grml 2011.05</h1>
 
-    <!--
     <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-R or an empty USB stick.</p>
 

diff --git a/download/prerelease/index.php b/download/prerelease/index.php
index 2553a72..59444c2 100644 (file)
--- a/download/prerelease/index.php
+++ b/download/prerelease/index.php
@@ -79,11 +79,12 @@
 
     <h1>Download Grml 2011.12-rc1</h1>
 
+    <!--
     <p><strong>NOTE:</strong> There is no current pre-release.</p>
+    -->
 
-    <!--
     <p><strong>NOTE: This is a PRE-RELEASE, not a stable release yet.<br />
-    You have been warned.</strong><br /> -->
+    You have been warned.</strong><br />
     <a href="../">Looking for the stable release version instead?</a></p>
 
     <p>Download the Grml flavour you need, then write it to a CD-R or an empty USB stick.</p>

diff --git a/index.php b/index.php
index 26bb25c..ffd551b 100644 (file)
--- a/index.php
+++ b/index.php
@@ -52,6 +52,7 @@
 
             <h2>News</h2>
             <div class="news">
+            <p>09 Dec 2011: New <a href="/changelogs/README-grml-2011.12-rc1/">release candidate 2011.12-rc1</a> is available <a href="/download/prerelease/">for download</a>.</p>
             <p>29 May 2011: New <a href="/changelogs/README-grml-2011.05/">stable release version 2011.05</a> is available <a href="/download/">for download</a>.</p>
             </div>