From c9f1402ab8b9547b975c0d2706c3440b64c5d4fe Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Wed, 27 Feb 2013 18:42:12 +0100
Subject: [PATCH] misc fixes + adjustments for stable release (download, start
 page,...)

---
 changelogs/README-grml-2013.02/index.html.tt2 | 92 +++++++++++++--------------
 download/index.html.tt2                       | 36 ++++++-----
 index.html.tt2                                |  7 +-
 3 files changed, 70 insertions(+), 65 deletions(-)

diff --git a/changelogs/README-grml-2013.02/index.html.tt2 b/changelogs/README-grml-2013.02/index.html.tt2
index e19ffcb..470da03 100644
--- a/changelogs/README-grml-2013.02/index.html.tt2
+++ b/changelogs/README-grml-2013.02/index.html.tt2
@@ -30,13 +30,13 @@
         <h1>Release Notes for Grml 2013.02 - codename <a
         href="/faq/#releasename">Grumpy Grinch</a></h1>
 
-        <p><a href="http://grml.org/download/prerelease/">Download Now</a></p>
+        <p><a href="http://grml.org/download/">Download Now</a></p>
 
         <h3>About</h3>
 
-	<p>This release brings the Grml tools towards the upcoming Debian stable
-	release (AKA wheezy), provides up2date hardware support and fixes known
-	bugs from the previous Grml release.</p>
+        <p>This release brings the Grml tools towards the upcoming Debian stable
+        release (AKA wheezy), provides up2date hardware support and fixes known
+        bugs from the previous Grml release.</p>
 
         <h3>New features</h3>
 
@@ -44,24 +44,24 @@
 
           <li>ssh boot option: display SSH server key fingerprints
 
-	  <li>grml-hwinfo: added support for lsscsi, iscsiadm,
-	  proxmox/libvirt/openvz/vserver information retrieval, swapon, mdadm,
-	  LVM + dmsetup, now using 'lspci -nn' for lspci output
+          <li>grml-hwinfo: added support for lsscsi, iscsiadm,
+          proxmox/libvirt/openvz/vserver information retrieval, swapon, mdadm,
+          LVM + dmsetup, now using 'lspci -nn' for lspci output
 
-	  <li>grml-live: handling firmware related packages in GRMLBASE, added
-	  uuid-runtime to GRMLBASE
+          <li>grml-live: handling firmware related packages in GRMLBASE, added
+          uuid-runtime to GRMLBASE
 
-	  <li>grml-network: netcardconfig provides support to scan for available
-	  wireless networks
+          <li>grml-network: netcardconfig provides support to scan for available
+          wireless networks
 
-	  <li>grml-udev-config: Do not set mount options for NTFS partitions to
-	  "ro" any longer
+          <li>grml-udev-config: Do not set mount options for NTFS partitions to
+          "ro" any longer
 
           <li>grml2usb: verify that the bootflag is enabled
 
           <li>grml2iso: ISOs are dd-able by default
 
-	  <li>grml-debootstrap:
+          <li>grml-debootstrap:
 
           <ul>
 
@@ -69,22 +69,22 @@
             <li>Set wheezy as the new default release
             <li>Add acpi-support-base + firmware-linux-free to default package selection
 
-	  </ul>
+          </ul>
 
         </ul>
 
         <h3>Important Changes</h3>
 
-	<ul>
+        <ul>
 
-	  <li>/etc/apt/sources.list.d/debian.list no longer uses cdn.debian.net
-	  for the Debian repository, instead uses snapshot.debian.org with the
-	  according release date. This should make installation of additional
-	  software with regards to additional dependencies easier for users.
+          <li>/etc/apt/sources.list.d/debian.list no longer uses cdn.debian.net
+          for the Debian repository, instead uses snapshot.debian.org with the
+          according release date. This should make installation of additional
+          software with regards to additional dependencies easier for users.
 
           <li>Debian's live-boot changed the path from /live/image to
-	  /lib/live/mount/medium. If you're using /live/image anywhere inside
-	  your own custom scripts please adopt your code to use /lib/live/mount/medium
+          /lib/live/mount/medium. If you're using /live/image anywhere inside
+          your own custom scripts please adopt your code to use /lib/live/mount/medium
           starting with Grml 2013.02.
 
           <li>Debian's live-boot changed some persistency related settings.
@@ -141,7 +141,7 @@
         <h3>Download Grml 2013.02</h3>
 
         <p>Grml 2013.02 can be downloaded from
-        <a href="http://grml.org/download/">grml.org/download/prerelease/</a>.</p>
+        <a href="http://grml.org/download/">grml.org/download/</a>.</p>
 
         <h3>Feedback</h3>
 
@@ -155,29 +155,29 @@
         <a name="thanks"></a>
         <h3>Thanks</h3>
 
-	<p>Many thanks in this release go to (alphabetically)
-	Andras Korn,
-	Bernhard Tittelbach,
-	Charles A. Hewson,
-	Christian Hesse,
-	Christian Hofstaedtler,
-	Christoph Biedl,
-	Csillag Tamas,
-	Dominik Schips,
-	Evan Pitstick,
-	Florian Apolloner,
-	Florian Klien,
-	frenbu,
-	Gregor Herrmann,
-	Hendrik Jaeger,
-	Lukas Anzinger,
-	Pawel Sadkowski ,
-	Peter Palfrader,
-	Pierre Schmitz,
-	Raoul Raminder Andreas,
-	Thorsten Glaser and
-	Ulrich Dangel
-	for their contributions.</p>
+        <p>Many thanks in this release go to (alphabetically)
+        Andras Korn,
+        Bernhard Tittelbach,
+        Charles A. Hewson,
+        Christian Hesse,
+        Christian Hofstaedtler,
+        Christoph Biedl,
+        Csillag Tamas,
+        Dominik Schips,
+        Evan Pitstick,
+        Florian Apolloner,
+        Florian Klien,
+        frenbu,
+        Gregor Herrmann,
+        Hendrik Jaeger,
+        Lukas Anzinger,
+        Pawel Sadkowski ,
+        Peter Palfrader,
+        Pierre Schmitz,
+        Raoul Raminder Andreas,
+        Thorsten Glaser and
+        Ulrich Dangel
+        for their contributions.</p>
 
         <h3>More Information</h3>
 
diff --git a/download/index.html.tt2 b/download/index.html.tt2
index f6ad120..ced5927 100644
--- a/download/index.html.tt2
+++ b/download/index.html.tt2
@@ -77,10 +77,12 @@
 
 <div class="content">
 
-    <h1>Download Grml 2012.05</h1>
+    <h1>Download Grml 2012.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>
 
@@ -89,19 +91,19 @@
         <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/grml96-full_2012.05.iso">Grml96 full ISO</a> [<a href="http://download.grml.org/grml96-full_2012.05.iso.sha1.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/grml64-full_2012.05.iso">Grml64 full ISO</a> [<a href="http://download.grml.org/grml64-full_2012.05.iso.sha1.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/grml32-full_2012.05.iso">Grml32 full ISO</a> [<a href="http://download.grml.org/grml32-full_2012.05.iso.sha1.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/grml96-small_2012.05.iso">Grml96 small ISO</a> [<a href="http://download.grml.org/grml96-small_2012.05.iso.sha1.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/grml64-small_2012.05.iso">Grml64 small ISO</a> [<a href="http://download.grml.org/grml64-small_2012.05.iso.sha1.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/grml32-small_2012.05.iso">Grml32 small ISO</a> [<a href="http://download.grml.org/grml32-small_2012.05.iso.sha1.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/grml96-full_2012.03.iso">Grml96 full ISO</a> [<a href="http://download.grml.org/grml96-full_2012.03.iso.sha1.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/grml64-full_2012.03.iso">Grml64 full ISO</a> [<a href="http://download.grml.org/grml64-full_2012.03.iso.sha1.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/grml32-full_2012.03.iso">Grml32 full ISO</a> [<a href="http://download.grml.org/grml32-full_2012.03.iso.sha1.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/grml96-small_2012.03.iso">Grml96 small ISO</a> [<a href="http://download.grml.org/grml96-small_2012.03.iso.sha1.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/grml64-small_2012.03.iso">Grml64 small ISO</a> [<a href="http://download.grml.org/grml64-small_2012.03.iso.sha1.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/grml32-small_2012.03.iso">Grml32 small ISO</a> [<a href="http://download.grml.org/grml32-small_2012.03.iso.sha1.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="2012.05"/>
+    <input type="hidden" name="version" value="2012.03"/>
     <div class="download_panel" id="download_panel1"><div>
 
     <h2>Options</h2>
@@ -123,12 +125,12 @@
     <br />
 
     <!--
-    <a href="/download/prerelease/" class="button" style="padding: 12px; font-weight: bold;"><span>Get 2012.05-rc1 instead!</span></a>
+    <a href="/download/prerelease/" class="button" style="padding: 12px; font-weight: bold;"><span>Get 2012.03-rc1 instead!</span></a>
     <br />
     -->
 
     <div style="font-size: 14pt;">
-    <p><a href="http://grml.org/changelogs/README-grml-2012.05">Release Notes</a></p>
+    <p><a href="http://grml.org/changelogs/README-grml-2012.03">Release Notes</a></p>
 
     </div>
     </div>
@@ -162,7 +164,7 @@
     }
 
     function update_links() {
-        var current_version = "2012.05";
+        var current_version = "2012.03";
         var product = 'grml';
         var arch = document.getElementById('download_arch').value;
         var flavour = document.getElementById('download_flavour').value;
@@ -196,13 +198,13 @@
     <b>Alternate downloads</b><br /><br />
     <a href="http://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-2012.05.tar.gz">Source code</a> (both archs)<br />
+    <a href="http://download.grml.org/grml_sources-2012.03.tar.gz">Source code</a> (both archs)<br />
     <br/>
     Netboot packages:<br/>
-    <a href="http://download.grml.org/grml_netboot_package_grml64-full_2012.05.tar.bz2">64-bit</a>
-    <a href="http://download.grml.org/grml_netboot_package_grml64-full_2012.05.tar.bz2.sha1.asc">(sig)</a>
-    <a href="http://download.grml.org/grml_netboot_package_grml32-full_2012.05.tar.bz2">32-bit</a>
-    <a href="http://download.grml.org/grml_netboot_package_grml32-full_2012.05.tar.bz2.sha1.asc">(sig)</a>
+    <a href="http://download.grml.org/grml_netboot_package_grml64-full_2012.03.tar.bz2">64-bit</a>
+    <a href="http://download.grml.org/grml_netboot_package_grml64-full_2012.03.tar.bz2.sha1.asc">(sig)</a>
+    <a href="http://download.grml.org/grml_netboot_package_grml32-full_2012.03.tar.bz2">32-bit</a>
+    <a href="http://download.grml.org/grml_netboot_package_grml32-full_2012.03.tar.bz2.sha1.asc">(sig)</a>
 
     <br />
     <br />
@@ -215,7 +217,7 @@
     <b>Boot from USB key</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 key!<br /><br />
-    <code>dd if=grml64_2012.05.iso of=/dev/USB_KEY</code>
+    <code>dd if=grml64_2012.03.iso of=/dev/USB_KEY</code>
     <br /><br />
 
     <b>Troubleshooting</b><br /><br />
diff --git a/index.html.tt2 b/index.html.tt2
index 1a8935b..10c47a1 100644
--- a/index.html.tt2
+++ b/index.html.tt2
@@ -44,26 +44,29 @@
 
             <p style="text-align: center;">
             <b>The current release:</b><br/><br/>
-            <a href="/download/" class="button" style="padding: 12px; font-weight: bold;"><span>Download Grml 2012.05</span></a>
+            <a href="/download/" class="button" style="padding: 12px; font-weight: bold;"><span>Download Grml 2013.02</span></a>
             </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 2013.02-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>27 Feb 2013: New <a href="/changelogs/README-grml-2013.02/">stable release version 2013.02</a> is availa
+ble <a href="/download/">for download</a>.</p>
             <p>18 Feb 2013: Release candidate version <a href="/changelogs/README-grml-2013.02-rc1/">2013.02-rc1</a> available</p>
             <p>06 Jun 2012: New Grml developer: Markus Rekkenbeil</p>
             <p>29 May 2012: New <a href="/changelogs/README-grml-2012.05/">stable release version 2012.05</a> is available <a href="/download/">for download</a>.</p>
             <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>
             </div>
 
       </div>
-- 
2.1.4