Sync download and prerelease webpages with each other

[grml.org.git] / download / index.html.tt2

diff --git a/download/index.html.tt2 b/download/index.html.tt2
index 9d7e361..50d85dd 100644 (file)
--- a/download/index.html.tt2
+++ b/download/index.html.tt2
@@ -81,9 +81,7 @@
 
     <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-ROM/DVD or an empty USB stick.</p>
 
@@ -110,14 +108,14 @@
     <h2>Options</h2>
 
     <select name="flavour" id="download_flavour" style="width:100%;">
-    <option value="full" selected="selected">grml-full (~600MB)</option>
-    <option value="small">grml-small (~280MB)</option>
+    <option value="full" selected="selected">grml-full (~670MB)</option>
+    <option value="small">grml-small (~320MB)</option>
     </select>
     <br /><br />
     <select name="arch" id="download_arch" style="width:100%;">
     <option value="amd64" selected="selected">64-bit PC (amd64)</option>
-    <option value="i386">32-bit PC (i586+)</option>
-    <option value="96">One for both (~1.2GB)</option>
+    <option value="i386">32-bit PC (i686+)</option>
+    <option value="96">One for both (~1.3GB)</option>
     </select>
     <br />
     <br />
@@ -125,21 +123,18 @@
     <br />
     <br />
 
-    <!--
-    <a href="/download/prerelease/" class="button" style="padding: 12px; font-weight: bold;"><span>Get 2014.10-rc1 instead!</span></a>
+    <a href="/download/prerelease/" class="button" style="padding: 12px; font-weight: bold;"><span>Get 2018.12-rc1 instead!</span></a>
     <br />
     <br />
     <br />
-    -->
 
     <div style="font-size: 14pt;">
-    <p><a href="http://grml.org/changelogs/README-grml-2017.05">Release Notes</a></p>
+    <p><a href="/changelogs/README-grml-2017.05">Release Notes</a></p>
 
     </div>
     </div>
     </div>
 
-
     <div class="download_panel" id="download_panel2"><div>
     <!-- fallback cgi buttons -->
     <div id="formbuttons">
@@ -161,8 +156,8 @@
     <script type="text/javascript">
     function update_arch() {
         var flavour = document.getElementById('download_flavour').value;
-        if (flavour == 'small') document.getElementById('download_arch').innerHTML = '<option value="amd64">64-bit PC (amd64)</option><option value="i386">32-bit PC (i586+)</option><option value="96">One for both (~444MB)</option>';
-        if (flavour == 'full') document.getElementById('download_arch').innerHTML = '<option value="amd64">64-bit PC (amd64)</option><option value="i386">32-bit PC (i586+)</option><option value="96">One for both (~913MB)</option>';
+        if (flavour == 'small') document.getElementById('download_arch').innerHTML = '<option value="amd64">64-bit PC (amd64)</option><option value="i386">32-bit PC (i686+)</option><option value="96">One for both (~550MB)</option>';
+        if (flavour == 'full') document.getElementById('download_arch').innerHTML = '<option value="amd64">64-bit PC (amd64)</option><option value="i386">32-bit PC (i686+)</option><option value="96">One for both (~1.2GB)</option>';
         update_links();
     }
 
@@ -199,9 +194,9 @@
 
     <div class="download_panel" id="download_panel3"><div>
     <b>Alternate downloads</b><br /><br />
-    <a href="http://daily.grml.org/">Daily images</a><br />
+    <a href="https://daily.grml.org/">Daily images</a><br />
     <a href="http://download.grml.org/">Older releases</a><br />
-    <a href="http://download.grml.org/grml_sources-2017.05.tar.gz">Source code</a> (both archs)<br />
+    <a href="http://download.grml.org/grml_sources-2017.05.tar.gz">Source code</a> (one tgz for both archs)<br />
     <br/>
     Netboot packages:<br/>
     <a href="http://download.grml.org/grml_netboot_package_grml64-full_2017.05.tar.bz2">64-bit</a>
@@ -230,7 +225,7 @@ sub  4096R/257B6FD52892CF7E 2010-07-14</pre>
     <br /><br />
 
     <b>Troubleshooting</b><br /><br />
-    <a href="http://git.grml.org/?p=grml-live.git;a=blob_plain;f=templates/GRML/grml-cheatcodes.txt;hb=HEAD">Boot option guide</a>
+    <a href="https://git.grml.org/?p=grml-live.git;a=blob_plain;f=templates/GRML/grml-cheatcodes.txt;hb=HEAD">Boot option guide</a>
     <br /><br />
 
     </div></div>
@@ -239,7 +234,7 @@ sub  4096R/257B6FD52892CF7E 2010-07-14</pre>
 
     <h2>Git repositories</h2>
 
-    <p>The Grml team uses <a href="http://git-scm.com/">git</a> for
+    <p>The Grml team uses <a href="https://git-scm.com/">git</a> for
     managing software and packages. The repositories are available
     online at <a href="https://github.com/grml/">GitHub</a>.</p>