From edb96c300a560f35ed8f8d6dd87d3159e1edbbe2 Mon Sep 17 00:00:00 2001
From: Parabola <dev@list.parabolagnulinux.org>
Date: Wed, 29 Dec 2010 21:38:35 +0000
Subject: Revert "Various changes, plus licenses are now pointing to the real
 licenses. (gtklocker)"

This reverts commit d8fe78f471f2b7821a99f7c2697e0e2ab0a374c1.

Conflicts:

	media/devs/gtklocker.png
---
 templates/public/install.html | 191 ------------------------------------------
 1 file changed, 191 deletions(-)
 delete mode 100644 templates/public/install.html

(limited to 'templates/public')

diff --git a/templates/public/install.html b/templates/public/install.html
deleted file mode 100644
index 8244f971..00000000
--- a/templates/public/install.html
+++ /dev/null
@@ -1,191 +0,0 @@
-{% extends "base.html" %}
-{% load cache %}
-
-{% block title %}Parabola - Install it!{% endblock %}
-{% block navbarclass %}anb-download{% endblock %}
-
-{% block content %}
-<div id="arch-downloads" class="box">
-
-    <h2>Parabola Downloads</h2>
-
-    {% with "2010.05" 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> <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>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>
-            </ul>
-        </li>
-    </ul>
-
-    <p><strong>Links and Instructions:</strong></p>
-
-    <ul id="download-help">
-        <li><a href="http://www.archlinux.org/iso/{{ version }}/README"
-            title="Official download instructions">Readme and Instructions</a></li>
-        <li><a href="https://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide"
-            title="Official Installation Guide">Arch Linux Install Guide</a></li>
-    </ul>
-
-    <h3>Existing Arch Users</h3>
-    <p>If you already have installed Arch, you can easily upgrade to Parabola by
-    doing several simple things. First, you have to download our own mirrorlist! We
-    can guarantee that you'll be happy with that.</p>
-
-    <pre><code>pacman -U
-    http://repo.parabolagnulinux.org/free/core/os/any/pacman-mirrorlist-libre-20101017-1-any.pkg.tar.gz</code></pre>
-
-    <p>It is also proposed that you clean up your package cache, so that your
-    old packages don't get mixed up with the Parabola ones. It's as easy as
-    <pre><code>pacman -Scc</code></pre>.</p>
-
-    <p>Next step is to force pacman to update the databases. You may already
-    know that, but if you don't, all you have to do is <pre><code>pacman
-    -Syy</code></pre>.</p>
-
-    </p>At this point, you have to install the libre kernel. Easy step, thanks
-    to pacman: <pre><code>pacman -Sf kernel26</code></pre>. Oh, don't forget the
-    headers! <pre><code>pacman -Sf kernel26-headers</code></pre>.</p>
-
-    <p>It seems like the only thing remaining is a <pre><code>pacman
-    -Suu</code></pre>. Reboot and say hello to your brand new Parabola
-    system!</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>Description</th>
-            </tr>
-        </thead>
-        <tbody>
-            <tr>
-                <td>
-                    Netinstall Image
-                </td><td class="cpu-arch">
-                    <a
-                    href="http://repo.parabolagnulinux.org/isos/i686/parabola-{{version}}-core-i686.torrent" 
-                        title="Download for i686 architecture">Download</a>
-                </td><td class="cpu-arch">
-                    <a
-                    href="http://repo.parabolagnulinux.org/isos/i/parabola-2010.09.30-core-i686.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">
-                    Downloads and installs packages versions via FTP for absolute freshness.
-                </td>
-            </tr><tr>
-                <td>
-                    Core Image
-                </td><td class="cpu-arch">
-                    <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{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" 
-                    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">
-                    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 %}
-
-    <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>
-
-</div>
-{% endblock %}
-- 
cgit v1.2.3-54-g00ecf