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, 3 insertions, 3 deletions

diff --git a/templates/public/keys.html b/templates/public/keys.html
index 257a16ae..4afc6d6b 100644
--- a/templates/public/keys.html
+++ b/templates/public/keys.html
@@ -2,13 +2,13 @@
 {% load static from staticfiles %}
 {% load pgp %}
 
-{% block title %}Parabola - Master Signing Keys{% endblock %}
+{% block title %}{{ BRANDING_DISTRONAME }} - Master Signing Keys{% endblock %}
 
 {% block content %}
 <div id="signing-keys" class="box">
     <h2>Master Signing Keys</h2>
 
-    <p>This page lists the Parabola Master Keys. This is a distributed set of
+    <p>This page lists the {{ BRANDING_DISTORNAME }} Master Keys. This is a distributed set of
     keys that are seen as "official" signing keys of the distribution. Each key
     is held by a different developer, and a revocation certificate for the key
     is held by a different developer. Thus, no one developer has absolute hold
@@ -53,7 +53,7 @@
     personal key of the developer is signed by the given master key. A 'No'
     indicates it has not been signed; however, this does not necessarily mean
     the key should not be trusted.</p>
-    <p>All official Arch Linux developers and trusted users should have their
+    <p>All official {{ BRANDING_DISTRONAME }} developers and trusted users should have their
     key signed by at least three master keys if they are responsible for
     packaging software in the repositories. This is in accordance with the PGP
     <em>web of trust</em> concept. If a user is willing to marginally trust all