Merge commit '822898e' (Merge branch 'django14')

Conflicts:
	requirements.txt
	requirements_prod.txt
	templates/base.html
	templates/devel/clock.html
	templates/public/download.html
	templates/public/index.html
	templates/releng/results.html

1 files changed, 16 insertions, 15 deletions

diff --git a/templates/public/index.html b/templates/public/index.html
index fa8bb8fb..73f48012 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load markup cache cdn %}
+{% load url from future %}
 
 {% block head %}
 <link rel="alternate" type="application/rss+xml" title="Parabola News Updates" href="/feeds/news/" />
@@ -25,13 +26,13 @@
     <p>You can find us on IRC at <a
     href="irc://irc.freenode.net/#parabola">irc.freenode.net/#parabola</a>.</p>
 
-    <p class="readmore"><a href="{% url page-about %}"
+    <p class="readmore"><a href="{% url 'page-about' %}"
         title="Learn more about Parabola">Learn more...</a></p>
 </div>
 
 <div id="news">
     <h3>
-        <a href="{% url news-list %}" title="Browse the news archives">Latest News</a>
+        <a href="{% url 'news-list' %}" title="Browse the news archives">Latest News</a>
         <span class="arrow"></span>
     </h3>
 
@@ -52,7 +53,7 @@
     {% else %}
     {% if forloop.counter0 == 5 %}
     <h3>
-        <a href="{% url news-list %}"
+        <a href="{% url 'news-list' %}"
             title="Browse the news archives">Older News</a>
         <span class="arrow"></span>
     </h3>
@@ -131,15 +132,15 @@
     <h4>Support</h4>
 
     <ul>
-        <li><a href="{% url page-donate %}" title="Help support Parabola">Donate</a></li>
+        <li><a href="{% url 'page-donate' %}" title="Help support Parabola">Donate</a></li>
     </ul>
 
     <h4>Tools</h4>
 
     <ul>
-        <li><a href="{% url mirrorlist %}"
+        <li><a href="{% url 'mirrorlist' %}"
             title="Get a custom mirrorlist from our database">Mirrorlist Updater</a></li>
-        <li><a href="{% url mirror-status %}"
+        <li><a href="{% url 'mirror-status' %}"
             title="Check the status of all known mirrors">Mirror Status</a></li>
         <li><a href="/packages/differences/"
             title="See differences in packages between available architectures">Differences Reports</a>
@@ -152,7 +153,7 @@
         <li><a href="https://projects.parabolagnulinux.org"
             title="Official Parabola projects (git)">Projects in Git</a></li>
 {% comment %}
-        <li><a href="{% url page-svn %}"
+        <li><a href="{% url 'page-svn' %}"
             title="View SVN entries for packages">SVN Repositories</a></li>
         <li><a href="https://wiki.archlinux.org/index.php/DeveloperWiki"
             title="Developer Wiki articles">Developer Wiki</a></li>
@@ -161,9 +162,9 @@
             title="View the available package groups">Package Groups</a></li>
         <li><a href="/todolists/"
             title="Hacker Todo Lists">Todo Lists</a></li>
-        <li><a href="{% url releng-test-overview %}"
+        <li><a href="{% url 'releng-test-overview' %}"
             title="Releng Testbuild Feedback">Releng Testbuild Feedback</a></li>
-        <li><a href="{% url visualize-index %}"
+        <li><a href="{% url 'visualize-index' %}"
             title="View visualizations">Visualizations</a>
         <img width="16" height="16" src="{% cdnprefix %}/media/new.png" alt="New"/></li>
     </ul>
@@ -171,16 +172,16 @@
     <h4>More Resources</h4>
 
     <ul>
-        <li><a href="{% url page-keys %}"
+        <li><a href="{% url 'page-keys' %}"
             title="Package/Database signing master keys">Signing Master Keys</a>
         <img width="16" height="16" src="{% cdnprefix %}/media/new.png" alt="New"/></li>
         <li><a href="https://wiki.parabolagnulinux.org/Media"
-            title="Parabola in the media">Media Appearances</a></li>
-        <li><a href="{% url page-art %}" title="Parabola logos and other artwork for promotional use">Logos &amp; Artwork</a></li>
-        <li><a href="{% url news-list %}" title="News Archives">News Archives</a></li>
+            title="Parabola in the media">Press Coverage</a></li>
+        <li><a href="{% url 'page-art' %}" title="Parabola logos and other artwork for promotional use">Logos &amp; Artwork</a></li>
+        <li><a href="{% url 'news-list' %}" title="News Archives">News Archives</a></li>
         <li><a href="/feeds/" title="Various RSS Feeds">RSS Feeds</a></li>
-        <li><a href="{% url page-devs %}" title="Active hackers">Hackers Profiles</a></li>
-        <li><a href="{% url page-fellows %}" title="Retired hackers">Fellows Profiles</a></li>
+        <li><a href="{% url 'page-devs' %}" title="Active hackers">Hackers Profiles</a></li>
+        <li><a href="{% url 'page-fellows' %}" title="Retired hackers">Fellows Profiles</a></li>
     </ul>
 
 </div>