From 1f9ed0beb285815b257983134d13ea5cb535e63c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Sun, 2 Jan 2011 20:05:14 -0300
Subject: Added Parabola specific download description

---
 templates/public/download.html | 159 ++++++++++++++++-------------------------
 1 file changed, 63 insertions(+), 96 deletions(-)

(limited to 'templates/public')

diff --git a/templates/public/download.html b/templates/public/download.html
index 30b2abad..dafe7275 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -9,8 +9,7 @@
 
     <h2>Parabola Downloads</h2>
 
-    {% with "2010.05" as version %}
-    <h3>Release Info</h3>
+    {% with "2010.12.29" as version %} <h3>Release Info</h3>
 
     <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
@@ -18,14 +17,13 @@
     can always be updated with `pacman -Syu`.</p>
 
     <ul>
-        <li><strong>Current Release:</strong> <a href="https://wiki.archlinux.org/index.php/DeveloperWiki:{{ version }}">{{ version }}</a></li>
-        <li><strong>Included Kernel:</strong> 2.6.33.4</li>
+        <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="https://bugs.archlinux.org/index.php?project=6"
-                    title="Parabola Bugtracker:Release Engineering">Bug Tracker</a></li>
-                <li><a href="http://mailman.archlinux.org/mailman/listinfo/arch-releng"
-                    title="Parabola Release Engineering mailing list">Mailing List</a></li>
+                <li><a
+                    href="http://list.parabolagnulinux.org/listinfo.cgi/dev-parabolagnulinux.org"
+                    title="Parabola Hackers Discussion List">Mailing List</a></li>
             </ul>
         </li>
     </ul>
@@ -41,9 +39,11 @@
 
     <h3>Existing Arch Users</h3>
 
-    <p>If you are an existing Arch user, there is no need to download a new ISO
-    to update your existing system. You may be looking for
-    <a href="{% url mirrorlist %}">an updated mirrorlist</a> instead.</p>
+    <p>If you are an existing Arch user, there is no need to download the ISO
+    to update your existing system to Parabola. You can just follow the
+    instructions in our wiki to convert your existing Arch system into a free
+    as in freedom one. <a href='http://wiki.parabolagnulinux.org/Migration'
+        title='Migration Guide'>More here.</a></p>
 
     <h3>BitTorrent Download (recommended)</h3>
 
@@ -57,7 +57,7 @@
                 <th>Format</th>
                 <th class="cpu-arch">i686 CPU</th>
                 <th class="cpu-arch">x86-64 CPU</th>
-                <th class="cpu-arch">Dual Architecture</th>
+                <th class="magnet-link" colspan="2">Magnet Links</th>
                 <th>Description</th>
             </tr>
         </thead>
@@ -65,108 +65,75 @@
             <tr>
                 <td>
                     Netinstall Image
-                </td><td class="cpu-arch">
-                    <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-netinstall-i686.iso.torrent" 
+                </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://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-netinstall-x86_64.iso.torrent" 
+                </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="cpu-arch">
-                    <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-netinstall-dual.iso.torrent" 
-                    title="Download for both architectures">Download</a>
-                </td><td class="wrap">
+                </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>
+            </tr>
+            <tr>
                 <td>
                     Core Image
-                </td><td class="cpu-arch">
-                    <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-i686.iso.torrent" 
+                </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://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-x86_64.iso.torrent" 
+                </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="cpu-arch">
-                    <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-dual.iso.torrent" 
-                    title="Download for both architectures">Download</a>
-                </td><td class="wrap">
+                </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>
 
-{% comment %}
-    <h3>Get Parabola on CD</h3>
-
-<!-- we should seek for a service provider like this -->
-
-    <p>The following suppliers donate a portion of their proceeds to the
-    Parabola project:</p>
-
-    <ul id="cd-vendors-donate">
-        <li><a href="http://www.osdisc.com/cgi-bin/view.cgi/products/linux/arch?affiliate=archlinux"
-            title="Purchase a CD from OSDisc">Purchase a CD from OSDisc</a></li>
-        <li><a href="http://www.shoplinuxonline.com/index.php?main_page=index&amp;cPath=1_46&amp;zenid=ecd15b48affe8976130bc575c1276ee4"
-            title="Purchase a CD from Shop Linux Online">Purchase a CD from Shop Linux Online</a></li>
-    </ul>
-
-    <p>Parabola CDs are also available for purchase from these suppliers:</p>
-
-    <ul id="cd-vendors">
-        <li><a href="http://www.linuxcd.org/view_distro.php?id_distro=48" 
-            title="Purchase a CD from LinuxCD">Purchase a CD from LinuxCD</a></li>
-    </ul>
-{% endcomment %}
-
     <h3>HTTP/FTP Direct Downloads</h3>
 
     <p>In addition to the BitTorrent links above, install images can also be
-    downloaded via HTTP or FTP from the mirror sites listed below. Please
-    ensure the download image matches the checksum from the md5sums.txt or
-    sha1sums.txt file in the same directory as the image.</p>
-
-    <h4>Checksums</h4>
-
-    <p>File integrity checksums for the latest releases can be found below:</p>
-
-    <ul>
-        <li><a href="http://www.archlinux.org/iso/{{version}}/sha1sums.txt" 
-            title="Get the latest SHA1 checksums">SHA1 checksums</a></li>
-        <li><a href="http://www.archlinux.org/iso/{{version}}/md5sums.txt" 
-            title="Get the latest MD5 checksums">MD5 checksums</a></li>
-    </ul>
-    {% endwith %}
-
-    {% cache 600 download-mirrors %}
-    <table id="download-mirrors">
-        <thead>
-            <tr>
-                <th><h4>Server Location</h4></th>
-                <th><h4>Download</h4></th>
-            </tr>
-        </thead> 
-        <tbody>
-            <tr><td colspan="2">
-                    {% for mirror_url in mirror_url_list %}
-                    {% ifchanged mirror_url.mirror.country %}
-            </td></tr>
-            <tr><td class="mirror-country" colspan="2"><strong>{{mirror_url.mirror.country}}</strong>
-                    {% endifchanged %}
-                    {% ifchanged mirror_url.mirror.name %}
-            </td></tr>
-            <tr><td class="mirror-server">{{mirror_url.mirror.name}}</td><td>
-                    {% endifchanged %}
-                    <a href="{{mirror_url.url}}iso/" 
-                        title="Download from {{mirror_url.url}}iso/">{{mirror_url.protocol.protocol|upper}}</a>
-                    {% endfor %}
-            </td></tr>
-        </tbody>
-    </table>
-    {% endcache %}
+    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>If you want to become an Official Parabola Mirror please follow the
-    instructions listed <a href="https://wiki.archlinux.org/index.php/DeveloperWiki:NewMirrors">here</a>.</p>
+    <p><a href='http://repo.parabolagnulinux.org/isos/' title='Parabola ISOs
+        directory'>Go to the Parabola ISOs directory.</a></p>
 
 </div>
 {% endblock %}
-- 
cgit v1.2.3-2-g168b