Sync download and prerelease webpages with each other

* provide same information on both pages
* make look and feel more consistent
* don't use absolut URLs but relative ones only

diff --git a/download/index.html.tt2 b/download/index.html.tt2
index b6a5a52..50d85dd 100644 (file)
--- a/download/index.html.tt2
+++ b/download/index.html.tt2
@@ -129,13 +129,12 @@
     <br />
 
     <div style="font-size: 14pt;">
     <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>
     </div>
     </div>
 

-

     <div class="download_panel" id="download_panel2"><div>
     <!-- fallback cgi buttons -->
     <div id="formbuttons">
     <div class="download_panel" id="download_panel2"><div>
     <!-- fallback cgi buttons -->
     <div id="formbuttons">


@@ -197,7 +196,7 @@
     <b>Alternate downloads</b><br /><br />
     <a href="https://daily.grml.org/">Daily images</a><br />
     <a href="http://download.grml.org/">Older releases</a><br />
     <b>Alternate downloads</b><br /><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>
     <br/>
     Netboot packages:<br/>
     <a href="http://download.grml.org/grml_netboot_package_grml64-full_2017.05.tar.bz2">64-bit</a>

diff --git a/download/prerelease/index.html.tt2 b/download/prerelease/index.html.tt2
index 415650d..358a4b1 100644 (file)
--- a/download/prerelease/index.html.tt2
+++ b/download/prerelease/index.html.tt2
@@ -33,7 +33,7 @@ exit;
     width: 288px;
     margin-bottom: 2em;
     margin-top: 1em;
     width: 288px;
     margin-bottom: 2em;
     margin-top: 1em;

-    font-size: 11px;
+    font-size: 10pt;

 }
 .download_panel>div {
     margin-right: 20px;
 }
 .download_panel>div {
     margin-right: 20px;


@@ -128,8 +128,13 @@ exit;
     <br />
     <br />
     <br />
     <br />
     <br />
     <br />

-    <a href="/changelogs/README-grml-2018.12-rc1/">Release Notes</a>
-    </div></div>
+
+    <div style="font-size: 14pt;">
+    <p><a href="/changelogs/README-grml-2018.12-rc1/">Release Notes</a></p>
+
+    </div>
+    </div>
+    </div>

 
     <div class="download_panel" id="download_panel2"><div>
     <!-- fallback cgi buttons -->
 
     <div class="download_panel" id="download_panel2"><div>
     <!-- fallback cgi buttons -->


@@ -139,6 +144,7 @@ exit;
     <button name="filetype" value="bt" id="download_button_bt" type="submit">Download using BitTorrent</button><br />
 -->
     <button name="filetype" value="signature" id="download_button_signature" type="submit">Get Checksum/Signature</button><br />
     <button name="filetype" value="bt" id="download_button_bt" type="submit">Download using BitTorrent</button><br />
 -->
     <button name="filetype" value="signature" id="download_button_signature" type="submit">Get Checksum/Signature</button><br />

+    <a href="http://grml.org/download/mirrors/">Download from a specific mirror</a><br/>

     </div>
     <!-- JS links -->
     <div id="linkbuttons" style="display:none;">
     </div>
     <!-- JS links -->
     <div id="linkbuttons" style="display:none;">


@@ -147,6 +153,7 @@ exit;
     <a id="download_link_bt">BitTorrent Download</a><br />
 -->
     <a id="download_link_signature">Get Checksum/Signature</a><br />
     <a id="download_link_bt">BitTorrent Download</a><br />
 -->
     <a id="download_link_signature">Get Checksum/Signature</a><br />

+    <a href="http://grml.org/download/mirrors/">Download from a specific mirror</a><br/>

     </div>
     </div></div>
 
     </div>
     </div></div>
 


@@ -192,30 +199,50 @@ exit;
 
     <div class="download_panel" id="download_panel3"><div>
     <b>Alternate downloads</b><br /><br />
 
     <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/devel/grml_sources-2018.12-rc1.tar.gz">Source code</a> (one tgz for both architectures)<br />
     <a href="http://download.grml.org/">Older releases</a><br />
     <a href="http://download.grml.org/devel/grml_sources-2018.12-rc1.tar.gz">Source code</a> (one tgz for both architectures)<br />

+    <br/>
+    Netboot packages:<br/>
+    <a href="http://download.grml.org/devel/grml_netboot_package_grml64-full_2018.12-rc1.tar.bz2">64-bit</a>
+    <a href="http://download.grml.org/devel/grml_netboot_package_grml64-full_2018.12-rc1.tar.bz2.asc">(sig)</a>
+    <a href="http://download.grml.org/devel/grml_netboot_package_grml32-full_2018.12-rc1.tar.bz2">32-bit</a>
+    <a href="http://download.grml.org/devel/grml_netboot_package_grml32-full_2018.12-rc1.tar.bz2.asc">(sig)</a>
+
+    <br />

     <br />
     <br />

-    <a href="http://debian.netcologne.de/grml/gnupg-michael-prokop.txt">Signing Key</a><br />
+    <b>Signing Key</b>

     <br />
     Please verify all downloads using GnuPG!
     <br />
     Please verify all downloads using GnuPG!

+    <br />
+    For each released ISO image there is also a signature file, that should be verified with the following
+    <a href="https://grml.org/download/gnupg-michael-prokop.txt">signing key</a>:
+    <pre>pub  4096R/96A87872B7EA3737 2010-07-14 Michael Prokop &lt;mail (at) michael-prokop.at&gt;
+Key fingerprint = 33CC B136 401A FEC8 43A3  8763 96A8 7872 B7EA 3737
+sub  4096R/257B6FD52892CF7E 2010-07-14</pre>

     </div></div>
 
     <div class="download_panel" id="download_panel4"><div>
     </div></div>
 
     <div class="download_panel" id="download_panel4"><div>

-    <b>Boot from USB stick</b><br />
+    <b>Boot from USB key</b><br />

     <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_2018.12-rc1.iso of=/dev/USB_STICK</code>
+    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=grml_2018.12-rc1.iso of=/dev/USB_KEY</code>

     <br /><br />
 
     <b>Troubleshooting</b><br /><br />
     <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>
 
     </div>
 
     <br /><br />
 
     </div></div>
 
     </div>
 

+    <h2>Git repositories</h2>
+
+    <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>
+

     <div style="clear: both;"></div>
 
 </div>
     <div style="clear: both;"></div>
 
 </div>