From 777d357b3524db4818e0bf729893f76132d0d7d7 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Thu, 9 Oct 2014 10:30:10 +0200
Subject: [PATCH] Update changelog, download + faq page for new release

---
 changelogs/index.html.tt2 | 3 ++-
 download/index.html.tt2   | 7 ++-----
 faq/index.html.tt2        | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/changelogs/index.html.tt2 b/changelogs/index.html.tt2
index 0a72a63..102fcf4 100644
--- a/changelogs/index.html.tt2
+++ b/changelogs/index.html.tt2
@@ -32,12 +32,13 @@
         <h2>Current release</h2>
 
         <p>
-        <a href="README-grml-2014.03/">Release announcement for Grml 2014.03 - codename Ponywagon</a>
+        <a href="README-grml-2014.03/">Release announcement for Grml 2014.10-rc1 - codename Gschistigschasti</a>
         </p>
 
         <h2>Previous releases</h2>
 
         <ul>
+          <li><a href="README-grml-2014.03/">Grml 2014.03</a> - codename Ponywagon</li>
           <li><a href="README-grml-2013.09/">Grml 2013.09</a> - codename Hefeknuddler</li>
           <li><a href="README-grml-2013.02/">Grml 2013.02</a> - codename Grumpy Grinch</li>
           <li><a href="README-grml-2012.05/">Grml 2012.05</a> - codename Ponyhof</li>
diff --git a/download/index.html.tt2 b/download/index.html.tt2
index c6fc595..5099593 100644
--- a/download/index.html.tt2
+++ b/download/index.html.tt2
@@ -80,9 +80,8 @@
     <h1>Download Grml 2014.03</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>
 
@@ -124,10 +123,8 @@
     <br />
     <br />
 
-    <!--
-    <a href="/download/prerelease/" class="button" style="padding: 12px; font-weight: bold;"><span>Get 2014.03-rc1 instead!</span></a>
+    <a href="/download/prerelease/" class="button" style="padding: 12px; font-weight: bold;"><span>Get 2014.10-rc1 instead!</span></a>
     <br />
-    -->
 
     <div style="font-size: 14pt;">
     <p><a href="http://grml.org/changelogs/README-grml-2014.03">Release Notes</a></p>
diff --git a/faq/index.html.tt2 b/faq/index.html.tt2
index 0f2f325..63c1a51 100644
--- a/faq/index.html.tt2
+++ b/faq/index.html.tt2
@@ -28,7 +28,7 @@
 
         <h1 align="center">FAQ for grml</h1>
 
-        <p><strong>Up2date:</strong> applies to Grml version 2014.03</p>
+        <p><strong>Up2date:</strong> applies to Grml version 2014.10</p>
 
         <p><a name="toc"></a><strong>Index:</strong></p>
 
@@ -120,8 +120,7 @@
 
         <h3><a name="releasename"></a><a href="#toc">What about the release name?</a></h3>
 
-        <p>Codename of Grml 2014.03 is "Ponywagon", which might be understood if a
-        carinthian talks about "Bahnübergang" (german for railroad crossing).</p>
+        <p>Codename of Grml 2014.10 is "Gschistigschasti", which is colloquial for 'fuss' in Austria.</p>
 
         <h3><a name="requirements"></a><a href="#toc">Requirements for running Grml</a></h3>
 
-- 
2.1.4