Merge branch 'archweb' into archweb-generic2

Conflicts:
	devel/views.py
	feeds.py
	public/views.py
	settings.py
	sitestatic/archweb.js
	templates/base.html
	templates/devel/profile.html
	templates/mirrors/status.html
	templates/news/view.html
	templates/packages/flaghelp.html
	templates/packages/opensearch.xml
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	templates/registration/login.html
	templates/releng/results.html
	templates/todolists/public_list.html

1 files changed, 5 insertions, 5 deletions

diff --git a/templates/news/paginator.html b/templates/news/paginator.html
index fbd0546b..57fbeb15 100644
--- a/templates/news/paginator.html
+++ b/templates/news/paginator.html
@@ -1,20 +1,20 @@
 {% if is_paginated %}
 <div class="pagination">
-    <p>{{paginator.count}} news items, viewing page {{page_obj.number}} of {{paginator.num_pages}}.</p>
+    <p>{{ paginator.count }} news items, viewing page {{ page_obj.number }} of {{ paginator.num_pages }}.</p>
     <p class="news-nav">
     {% if page_obj.has_previous %}
-    <a class="prev" href="?page={{page_obj.previous_page_number}}"
+    <a class="prev" href="?page={{ page_obj.previous_page_number }}"
         title="Go to previous page">&lt; Prev</a>
     {% endif %}
     {% for num in paginator.page_range %}
     {% ifequal num page_obj.number %}
-    <span>{{num}}</span>
+    <span>{{ num }}</span>
     {% else %}
-    <a href="?page={{num}}" title="Go to page {{num}}">{{num}}</a>
+    <a href="?page={{ num }}" title="Go to page {{ num }}">{{ num }}</a>
     {% endifequal %}
     {% endfor %}
     {% if page_obj.has_next %}
-    <a class="next" href="?page={{page_obj.next_page_number}}"
+    <a class="next" href="?page={{ page_obj.next_page_number }}"
         title="Go to next page">Next &gt;</a>
     {% endif %}
     </p>