From 71f884e2963f451bf2a2ee4a9d1774aaf7f53071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Sun, 6 Feb 2011 20:36:42 -0300
Subject: Revert "Added warning for download"

This reverts commit 0a4e96473845aa0e1e44b533847ef5e47759af26.
---
 templates/public/download.html | 123 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 116 insertions(+), 7 deletions(-)

(limited to 'templates/public/download.html')

diff --git a/templates/public/download.html b/templates/public/download.html
index dac84394..db77df71 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -9,15 +9,32 @@
 
     <h2>Parabola Downloads</h2>
 
-	<p> Right now we are making changes of our repo structure and for
-	now our previous iso images won't work.</p>
+    {% with "2010.12.29" as version %} <h3>Release Info</h3>
 
-	<p> When we fix entirely our repo structure we will compile another
-	iso and that will be avaliable from this page.</p>
+    <p>All available images can be burned to a CD, mounted as an ISO file,
+    or be directly written to a USB stick using a utility like `dd`. These
+    are intended for new installations only; an existing Parabola system
+    can always be updated with `pacman -Syu`.</p>
 
-	<p> For the moment being the only way to install Parabola GNU/Linux
-	is to <a href=http://wiki.parabolagnulinux.org/migration>
-	migrate from Archlinux</a></p>
+    <ul>
+        <li><strong>Current Release:</strong> {{ version }}</li>
+        <li><strong>Included Kernel:</strong> 2.6.36.2</li>
+        <li><strong>Resources:</strong>
+            <ul>
+                <li><a
+                    href="http://list.parabolagnulinux.org/listinfo.cgi/dev-parabolagnulinux.org"
+                    title="Parabola Hackers Discussion List">Mailing List</a></li>
+            </ul>
+        </li>
+        <li><strong>Instructions:</strong>
+            <ul>
+                <li><a
+                    href="https://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide"
+                    title="Official Installation Guide">Arch Install Guide</a>.
+                For now you can use Arch's guide.</li>
+            </ul>
+        </li>
+    </ul>
 
     <h3>Existing Arch Users</h3>
 
@@ -27,5 +44,97 @@
     as in freedom one. <a href='http://wiki.parabolagnulinux.org/Migration'
         title='Migration Guide'>More here.</a></p>
 
+    <h3>BitTorrent Download (recommended)</h3>
+
+    <p>If you can spare the bytes, please leave the client open after your
+    download is finished, so you can seed it back to others.
+    <em>A web-seed capable client is recommended for fastest download speeds.</em></p>
+
+    <table id="download-torrents" class="pretty1">
+        <thead>
+            <tr>
+                <th>Format</th>
+                <th class="cpu-arch">i686 CPU</th>
+                <th class="cpu-arch">x86-64 CPU</th>
+                <th class="magnet-link" colspan="2">Magnet Links</th>
+                <th>Description</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td>
+                    Netinstall Image
+                </td>
+
+                <td class="cpu-arch">
+                    <a href="http://repo.parabolagnulinux.org/isos/i686/parabola-{{version}}-netinstall-i686.iso.torrent" 
+                        title="Download for i686 architecture">Download</a>
+                </td>
+
+                <td class="cpu-arch">
+                    <a href="http://repo.parabolagnulinux.org/isos/x86_64/parabola-{{version}}-netinstall-x86_64.iso.torrent" 
+                    title="Download for x86-64 architecture">Download</a>
+                </td>
+
+                <td class="magnet-link">
+                    <a href="magnet:?xt=urn:btih:6dac9ac183e18632c33eef3f1823c1f8ce67eaa4&dn=parabola-2010.12.29-netinstall-i686.iso&tr=http%3A%2F%2Ftracker.publicbt.com%2Fannounce"
+                        title="Magnet Link for ISO image">i686 Magnet</a>
+                </td>
+
+                <td class="magnet-link">
+                    <a href="magnet:?xt=urn:btih:f589fa6d0ab73d5fdf3c2f43e64bd3fc250a8daf&dn=parabola-2010.12.29-netinstall-x86_64.iso&tr=http%3A%2F%2Ftracker.publicbt.com%2Fannounce"
+                        title="Magnet Link for ISO image">x86_64 Magnet</a>
+                </td>
+
+                <td class="wrap">
+                    Downloads and installs packages versions via FTP for absolute freshness.
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    Core Image
+                </td>
+
+                <td class="cpu-arch">
+                    <a href="http://repo.parabolagnulinux.org/isos/i686/parabola-{{version}}-core-i686.iso.torrent" 
+                    title="Download for i686 architecture">Download</a>
+                </td>
+                
+                <td class="cpu-arch">
+                    <a href="http://repo.parabolagnulinux.org/isos/x86_64/parabola-{{version}}-core-x86_64.iso.torrent" 
+                    title="Download for x86-64 architecture">Download</a>
+                </td>
+
+                <td class="magnet-link">
+                    <a
+                        href="magnet:?xt=urn:btih:d9bb9f9641a222d2d302988da95225f570bcdb6d&dn=parabola-2010.12.29-core-i686.iso&tr=http%3A%2F%2Ftracker.publicbt.com%2Fannounce"
+                    title="Magnet Link for ISO image">i686 Magnet</a>
+                </td>
+
+                <td class="magnet-link">
+                    <a
+                        href="magnet:?xt=urn:btih:fae6de60f0dfa703165e94df5a77e9bd607ef4cf&dn=parabola-2010.12.29-core-x86_64.iso&tr=http%3A%2F%2Ftracker.publicbt.com%2Fannounce"
+                    title="Magnet Link for ISO image">x86_64 Magnet</a>
+                </td>
+
+                <td class="wrap">
+                    Core packages are included on the media. Good for basic off-line installation.
+                </td>
+            </tr>
+        </tbody>
+    </table>
+
+    <h3>HTTP/FTP Direct Downloads</h3>
+
+    <p>In addition to the BitTorrent links above, install images can also be
+    downloaded via HTTP from the site listed below. Please ensure the download
+    image matches the checksum from the MD5SUMS or SHA256SUMS file in the same
+    directory as the image.</p>
+
+    <p><a href='http://repo.parabolagnulinux.org/isos/' title='Parabola ISOs
+        directory'>Go to the Parabola ISOs directory.</a></p>
+
+    {%endwith%}
+
 </div>
 {% endblock %}
-- 
cgit v1.2.3-2-g168b