Merge branch 'archweb-generic2'

Conflicts:
	README.BRANDING
	local_settings.py.example
	packages/templatetags/package_extras.py
	public/views.py
	releng/views.py
	settings.py
	sitestatic/archnavbar/archnavbar.css
	sitestatic/silhouette.png
	templates/base.html
	templates/packages/differences.html
	templates/packages/opensearch.xml
	templates/packages/search.html
	templates/public/donate.html
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	urls.py

1 files changed, 21 insertions, 9 deletions

diff --git a/templates/public/feeds.html b/templates/public/feeds.html
index 9fdd3162..70d8eee6 100644
--- a/templates/public/feeds.html
+++ b/templates/public/feeds.html
@@ -12,8 +12,8 @@
 
     <h3>News and Activity Feeds</h3>
 
-    <p>Grab the <a href="/feeds/news/" class="rss" title="{{ BRANDING_DISTRONAME }} News feed">news item feed</a>
-    to keep up-to-date with the latest news from the {{ BRANDING_DISTRONAME }} development staff.</p>
+    <p>Grab the <a href="/feeds/news/" class="rss" title="{{BRANDING_DISTRONAME}} news feed">news item feed</a>
+    to keep up-to-date with the latest news from the {{BRANDING_DISTRONAME}} development staff.</p>
 
     <p>The <a href="{% wiki_url 'Special:RecentChanges?feed=rss' %}"
     title="{{ BRANDING_WIKINAME }} Recent Changes feed" class="rss">{{ BRANDING_WIKINAME }}: Recent changes feed</a>
@@ -35,19 +35,26 @@
     <table class="pretty2">
         <thead>
             <tr>
-                <th>Architecture</th>
-                <th>All Repos</th>
-                {% for repo in repos %}
-                <th>{{ repo }}</th>
+                <th></th>
+                <th>All Arches</th>
+                {% for arch in arches %}
+                <th>{{ arch }}</th>
                 {% endfor %}
             </tr>
         </thead>
         <tbody>
-            {% for arch in arches %}
             <tr>
-                <td><strong>{{ arch }}</strong></td>
+                <td><strong>All Repos</strong></td>
+                <td><a href="/feeds/packages/" class="rss">Feed</a></td>
+                {% for arch in arches %}
                 <td><a href="/feeds/packages/{{ arch }}/" class="rss">Feed</a></td>
-                {% for repo in repos %}
+                {% endfor %}
+            </tr>
+            {% for repo in repos %}
+            <tr>
+                <td><strong>{{ repo }}</strong></td>
+                <td><a href="/feeds/packages/all/{{ repo|lower }}/" class="rss">Feed</a></td>
+                {% for arch in arches %}
                 <td><a href="/feeds/packages/{{ arch }}/{{ repo|lower }}/" class="rss">Feed</a></td>
                 {% endfor %}
             </tr>
@@ -55,6 +62,11 @@
         </tbody>
     </table>
 
+    <h3>Release Feed</h3>
+
+    <p>Grab the <a href="/feeds/releases/" class="rss" title="{{BRANDING_DISTRONAME}} release feed">ISO release feed</a>
+    if you want to help seed the ISO release torrents as they come out.</p>
+
     <h3>Development Feeds</h3>
 
     <p>Subscribe to any of the following to track bug tickets and feature