Misc changes for 2017.05-rc1 release

diff --git a/download/prerelease/index.html.tt2 b/download/prerelease/index.html.tt2
index 49463e8..bd67217 100644 (file)
--- a/download/prerelease/index.html.tt2
+++ b/download/prerelease/index.html.tt2
@@ -82,33 +82,33 @@ exit;
 
 <div class="content">
 
-    <h1>Download Grml 2014.10-rc1</h1>
+    <h1>Download Grml 2017.05-rc1</h1>
 
     <p><strong>NOTE: This is a PRE-RELEASE, not a stable release yet.<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>
+    <p>Download the Grml flavour you need, then write it to a CD-ROM/DVD or an empty USB stick.</p>
 
     <div class="download_group" id="download_group1_noscript">
     <div class="download_panel" id="download_panel1_noscript"><div>
         <a href="http://grml.org/download/mirrors/">Download from a specific mirror</a><br/>
         <br/>
         Direct download links:<br/>
-        <a href="http://download.grml.org/devel/grml96-full_2014.10-rc1.iso">Grml96 full ISO</a> [<a href="http://download.grml.org/devel/grml96-full_2014.10-rc1.iso.sha1.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/devel/grml64-full_2014.10-rc1.iso">Grml64 full ISO</a> [<a href="http://download.grml.org/devel/grml64-full_2014.10-rc1.iso.sha1.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/devel/grml32-full_2014.10-rc1.iso">Grml32 full ISO</a> [<a href="http://download.grml.org/devel/grml32-full_2014.10-rc1.iso.sha1.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/devel/grml96-small_2014.10-rc1.iso">Grml96 small ISO</a> [<a href="http://download.grml.org/devel/grml96-small_2014.10-rc1.iso.sha1.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/devel/grml64-small_2014.10-rc1.iso">Grml64 small ISO</a> [<a href="http://download.grml.org/devel/grml64-small_2014.10-rc1.iso.sha1.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/devel/grml32-small_2014.10-rc1.iso">Grml32 small ISO</a> [<a href="http://download.grml.org/devel/grml32-small_2014.10-rc1.iso.sha1.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/devel/grml96-full_2017.05-rc1.iso">Grml96 full ISO</a> [<a href="http://download.grml.org/devel/grml96-full_2017.05-rc1.iso.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/devel/grml64-full_2017.05-rc1.iso">Grml64 full ISO</a> [<a href="http://download.grml.org/devel/grml64-full_2017.05-rc1.iso.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/devel/grml32-full_2017.05-rc1.iso">Grml32 full ISO</a> [<a href="http://download.grml.org/devel/grml32-full_2017.05-rc1.iso.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/devel/grml96-small_2017.05-rc1.iso">Grml96 small ISO</a> [<a href="http://download.grml.org/devel/grml96-small_2017.05-rc1.iso.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/devel/grml64-small_2017.05-rc1.iso">Grml64 small ISO</a> [<a href="http://download.grml.org/devel/grml64-small_2017.05-rc1.iso.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/devel/grml32-small_2017.05-rc1.iso">Grml32 small ISO</a> [<a href="http://download.grml.org/devel/grml32-small_2017.05-rc1.iso.asc">Signature</a>]<br/>
         <br/>
         </div></div>
     </div>
 
     <div class="download_group" id="download_group1" style="display:none;">
     <form method="get" action="/download/bounce/">
-    <input type="hidden" name="version" value="2014.10-rc1"/>
+    <input type="hidden" name="version" value="2017.05-rc1"/>
     <div class="download_panel" id="download_panel1"><div>
 
     <h2>Options</h2>
@@ -128,7 +128,7 @@ exit;
     <br />
     <br />
     <br />
-    <a href="/changelogs/README-grml-2014.10-rc1/">Release Notes</a>
+    <a href="/changelogs/README-grml-2017.05-rc1/">Release Notes</a>
     </div></div>
 
     <div class="download_panel" id="download_panel2"><div>
@@ -160,7 +160,7 @@ exit;
     }
 
     function update_links() {
-        var current_version = "2014.10-rc1";
+        var current_version = "2017.05-rc1";
         var product = 'grml';
         var arch = document.getElementById('download_arch').value;
         var flavour = document.getElementById('download_flavour').value;
@@ -172,7 +172,7 @@ exit;
         document.getElementById('download_link_mirror').href = mirror_url + iso;
         document.getElementById('download_link_mirror').innerHTML = '<br />Download Now<div class="download_relinfo">' + product + '-' + flavour + ' ' + current_version + '</div>';
         // document.getElementById('download_link_bt').href = mirror_url + iso + '.torrent';
-        document.getElementById('download_link_signature').href = mirror_url + iso + '.sha1.asc';
+        document.getElementById('download_link_signature').href = mirror_url + iso + '.asc';
     }
 
     // hook update function
@@ -197,7 +197,7 @@ exit;
 <!--
     <a href="http://download.grml.org/devel/">chroots for remastering</a> (prerelease)<br />
 -->
-    <a href="http://download.grml.org/devel/grml_sources-2014.10-rc1.tar.gz">Source code</a> (one tgz for both architectures)<br />
+    <a href="http://download.grml.org/devel/grml_sources-2017.05-rc1.tar.gz">Source code</a> (one tgz for both architectures)<br />
     <br />
     <a href="http://debian.netcologne.de/grml/gnupg-michael-prokop.txt">Signing Key</a><br />
     <br />
@@ -208,7 +208,7 @@ exit;
     <b>Boot from USB stick</b><br />
     <br />
     Just <tt>dd(1)</tt> the downloaded ISO to an <abbr title="Any existing data will be overwritten by the dd command!">empty</abbr> USB stick!<br /><br />
-    <code>dd if=grml_2014.10-rc1.iso of=/dev/USB_STICK</code>
+    <code>dd if=grml_2017.05-rc1.iso of=/dev/USB_STICK</code>
     <br /><br />
 
     <b>Troubleshooting</b><br /><br />

diff --git a/faq/index.html.tt2 b/faq/index.html.tt2
index 3fbe85e..d1f0fd2 100644 (file)
--- a/faq/index.html.tt2
+++ b/faq/index.html.tt2
@@ -121,7 +121,10 @@
 
         <h3><a name="releasename"></a><a href="#toc">What about the release name?</a></h3>
 
-        <p>Codename of Grml 2014.11 is "Gschistigschasti", which is colloquial for 'fuss' in Austria.</p>
+        <p>Codename of Grml 2017.05 is "Freedatensuppe", which is
+        a wordplay (free data soup) on an austrian dish called <a href="https://de.wikipedia.org/wiki/Frittatensuppe">Frittatensuppe</a>.
+        (We stumbled upon this wordplay through <a href="https://twitter.com/shroombab/status/715650750689517568">a tweet from Barbara Wimmer</a>,
+        referencing a flyer based on a <a href="https://zwerkstatt.at/index.php/produkt/freedaten_h_indiaink/">shirt by zwerkstatt</a>.</p>
 
         <h3><a name="requirements"></a><a href="#toc">Requirements for running Grml</a></h3>
 

diff --git a/index.html.tt2 b/index.html.tt2
index 6ea886a..f3b3853 100644 (file)
--- a/index.html.tt2
+++ b/index.html.tt2
@@ -48,19 +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 2014.10-rc1</span></a>
+            <a href="/download/prerelease/" class="button" style="padding: 12px; font-weight: bold;"><span>Download Grml 2017.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>08 May 2017: New <a href="/changelogs/README-grml-2017.05-rc1/">release candidate version 2017.05-rc1</a></p>
             <p>07 Jan 2016: <a href="http://blog.grml.org/archives/394-Is-Grml-still-alive.html">Is Grml still alive?</a></p>
             <p>17 Nov 2014: New <a href="/changelogs/README-grml-2014.11/">stable release version 2014.11</a> available</p>
             </div>