Merge commit '91c451'

Conflicts:
	devel/views.py
	feeds.py
	local_settings.py.example
	packages/management/commands/signoff_report.py
	packages/views/flag.py
	public/views.py
	templates/404.html
	templates/base.html
	templates/devel/clock.html
	templates/devel/index.html
	templates/devel/packages.html
	templates/devel/profile.html
	templates/general_form.html
	templates/mirrors/mirror_details.html
	templates/mirrors/mirrorlist.txt
	templates/mirrors/mirrorlist_generate.html
	templates/mirrors/mirrorlist_status.txt
	templates/mirrors/mirrors.html
	templates/mirrors/status.html
	templates/news/add.html
	templates/news/delete.html
	templates/news/list.html
	templates/news/view.html
	templates/packages/details.html
	templates/packages/differences.html
	templates/packages/files.html
	templates/packages/flag.html
	templates/packages/flag_confirmed.html
	templates/packages/flagged.html
	templates/packages/flaghelp.html
	templates/packages/groups.html
	templates/packages/opensearch.xml
	templates/packages/packages_list.html
	templates/packages/search.html
	templates/packages/signoff_options.html
	templates/packages/signoffs.html
	templates/packages/stale_relations.html
	templates/public/about.html
	templates/public/art.html
	templates/public/blank.html
	templates/public/donate.html
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	templates/public/keys.html
	templates/public/svn.html
	templates/public/userlist.html
	templates/registration/login.html
	templates/registration/logout.html
	templates/releng/add.html
	templates/releng/results.html
	templates/releng/thanks.html
	templates/todolists/list.html
	templates/todolists/public_list.html
	templates/todolists/todolist_confirm_delete.html
	templates/todolists/view.html
	templates/visualize/index.html
	todolists/views.py

1 files changed, 74 insertions, 13 deletions

diff --git a/templates/public/feeds.html b/templates/public/feeds.html
index 11c050a0..9fdd3162 100644
--- a/templates/public/feeds.html
+++ b/templates/public/feeds.html
@@ -1,32 +1,29 @@
-{% extends "base.html" %}
-{% block title %}Parabola - RSS Feeds{% endblock %}
+{% extends "base.html" %}{% load wiki %}
+{% block title %}{{ BRANDING_DISTRONAME }} - RSS Feeds{% endblock %}
 
 {% block content %}
 <div id="rss-feeds" class="box">
 
     <h2>RSS Feeds</h2>
 
-    <p>Several RSS feeds are available for consumption from the Parabola website.
+    <p>Several RSS feeds are available for consumption from the {{ BRANDING_SHORTNAME }} website.
     The majority of these are package-related and allow feeds to be customized
     for the updates you care about.</p>
 
     <h3>News and Activity Feeds</h3>
 
-    <p>Grab the <a href="/feeds/news/" class="rss" title="Parabola News
-        feed">news item feed</a> to keep up-to-date with the latest news from
-    the Parabola 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="https://wiki.parabolagnulinux.org/index.php?title=Special:RecentChanges&feed=atom"
-        title="ParabolaWiki Recent Changes feed" class="rss">Parabola Wiki: Recent
-        changes feed</a> is also available to track document changes from the
-    <a href="https://wiki.parabolagnulinux.org/" title="Parabola Wiki community
-        documentation">Parabola Wiki</a>.</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>
+    is also available to track document changes from the <a href="{% wiki_url %}"
+    title="{{ BRANDING_WIKINAME }} community documentation">{{ BRANDING_WIKINAME }}</a>.</p>
 
     <h3>Package Feeds</h3>
 
     <p>If you are interested in <a href="/feeds/packages/" class="rss"
-        title="Parabola package updates feed">all package updates</a>,
+        title="{{ BRANDING_DISTRONAME }} package updates feed">all package updates</a>,
     then grab this feed. Note that when a package is updated for multiple
     architectures, you will see each individual update show up here.
     Alternatively, you can select a packages feed from the below table that is
@@ -58,5 +55,69 @@
         </tbody>
     </table>
 
+    <h3>Development Feeds</h3>
+
+    <p>Subscribe to any of the following to track bug tickets and feature
+    requests from the <a href="{{BUGTRACKER_URL}}" title="{{BRANDING_DISTRONAME}} Bugs">{{BRANDING_DISTRONAME}} Bugtracker</a>:</p>
+
+    <table class="pretty2">
+        <thead>
+            <tr>
+                <th>Project</th>
+                <th>Activity</th>
+                <th>Issues</th>
+                <th>News</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td>All Projects</td>
+                <td><a href="https://labs.parabola.nu/activity.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/issues.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/news.atom" class="rss">Feed</a></td>
+            </tr><tr>
+                <td>Art4Parabola</td>
+                <td><a href="https://labs.parabola.nu/projects/art4parabola/activity.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/art4parabola/issues.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/art4parabola/news.atom" class="rss">Feed</a></td>
+            </tr><tr>
+                <td>Documentation</td>
+                <td><a href="https://labs.parabola.nu/projects/documentation/activity.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/documentation/issues.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/documentation/news.atom" class="rss">Feed</a></td>
+            </tr><tr>
+                <td>Installation media (i686 and x86_64)</td>
+                <td><a href="https://labs.parabola.nu/projects/isos/activity.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/isos/issues.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/isos/news.atom" class="rss">Feed</a></td>
+            </tr><tr>
+                <td>Libretools</td>
+                <td><a href="https://labs.parabola.nu/projects/libretools/activity.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/libretools/issues.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/libretools/news.atom" class="rss">Feed</a></td>
+            </tr><tr>
+                <td>Packages (i686 and x86_64)</td>
+                <td><a href="https://labs.parabola.nu/projects/issue-tracker/activity.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/issue-tracker/issues.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/issue-tracker/news.atom" class="rss">Feed</a></td>
+            </tr><tr>
+                <td>Ports</td>
+                <td><a href="https://labs.parabola.nu/projects/ports/activity.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/ports/issues.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/ports/news.atom" class="rss">Feed</a></td>
+            </tr><tr>
+                <td>Port: Loongson 2F (mips64el)</td>
+                <td><a href="https://labs.parabola.nu/projects/mips64el/activity.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/mips64el/issues.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/mips64el/news.atom" class="rss">Feed</a></td>
+            </tr><tr>
+                <td>Servers</td>
+                <td><a href="https://labs.parabola.nu/projects/servers/activity.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/servers/issues.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/servers/news.atom" class="rss">Feed</a></td>
+            </tr>
+        </tbody>
+    </table>
+
  </div>
 {% endblock %}