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, 5 insertions, 4 deletions

diff --git a/feeds.py b/feeds.py
index 71b85ea3..9a5e2777 100644
--- a/feeds.py
+++ b/feeds.py
@@ -1,6 +1,7 @@
 import hashlib
 import pytz
 
+from django.conf import settings
 from django.contrib.sites.models import Site
 from django.contrib.syndication.views import Feed
 from django.db.models import Q
@@ -68,7 +69,7 @@ class PackageFeed(Feed):
         return obj
 
     def title(self, obj):
-        s = 'Parabola GNU/Linux-libre: Recent package updates'
+        s = settings.BRANDING_DISTRONAME+': Recent package updates'
         if 'repo' in obj:
             s += ' (%s [%s])' % (obj['arch'].name, obj['repo'].name.lower())
         elif 'arch' in obj:
@@ -76,7 +77,7 @@ class PackageFeed(Feed):
         return s
 
     def description(self, obj):
-        s = 'Recently updated packages in the Parabola GNU/Linux-libre package repositories'
+        s = 'Recently updated packages in the '+settings.BRANDING_DISTRONAME+' package repositories'
         if 'arch' in obj:
             s += ' for the \'%s\' architecture' % obj['arch'].name.lower()
             if not obj['arch'].agnostic:
@@ -117,9 +118,9 @@ def news_last_modified(request, *args, **kwargs):
 class NewsFeed(Feed):
     feed_type = GuidNotPermalinkFeed
 
-    title = 'Parabola GNU/Linux-libre: Recent news updates'
+    title = settings.BRANDING_DISTRONAME+': Recent news updates'
     link = '/news/'
-    description = 'The latest news from the Parabola GNU/Linux-libre distribution.'
+    description = 'The latest and greatest news from the '+settings.BRANDING_DISTRONAME+' distribution.'
     subtitle = description
     title_template = 'feeds/news_title.html'
     description_template = 'feeds/news_description.html'