Merge tag 'release_2011-11-09'

Too many new things to count

Conflicts:
	templates/public/download.html
	templates/public/index.html

1 files changed, 0 insertions, 128 deletions

diff --git a/templates/public/download.html b/templates/public/download.html
deleted file mode 100644
index 4a52f0fe..00000000
--- a/templates/public/download.html
+++ /dev/null
@@ -1,128 +0,0 @@
-{% extends "base.html" %}
-{% load cache %}
-
-{% block title %}Parabola - Downloads{% endblock %}
-{% block navbarclass %}anb-download{% endblock %}
-
-{% block content %}
-<div id="arch-downloads" class="box">
-
-    <h2>Parabola Downloads</h2>
-
-    {% 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
-    are intended for new installations only; an existing Parabola system
-    can always be updated with `pacman -Syu`.</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="https://lists.parabolagnulinux.org/mailman/listinfo/dev"
-                    title="Parabola Hackers Discussion List">Mailing List</a></li>
-            </ul>
-        </li>
-        <li><strong>Instructions:</strong>
-            <ul>
-                <li><a
-                    href="https://wiki.parabolagnulinux.org/installation_guide"
-                    title="Official Installation Guide">Parabola Install Guide</a>.
-                </li>
-            </ul>
-        </li>
-    </ul>
-
-    <h3>Existing Arch Users</h3>
-
-    <p>If you are an 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="https://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="https://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="https://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="https://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="https://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="https://repo.parabolagnulinux.org/isos/" title="Parabola ISOs
-        directory">Go to the Parabola ISOs directory.</a></p>
-
-    {%endwith%}
-
-</div>
-{% endblock %}