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, 6 insertions, 9 deletions

diff --git a/templates/public/art.html b/templates/public/art.html
index b32cbd92..8aad43f4 100644
--- a/templates/public/art.html
+++ b/templates/public/art.html
@@ -1,28 +1,25 @@
 {% extends "base.html" %}
 {% load static from staticfiles %}
 
-{% block title %}Parabola - Artwork{% endblock %}
+{% block title %}{{ BRANDING_DISTRONAME }} - Artwork{% endblock %}
 
 {% block content %}
 <div id="artwork" class="box">
 
-    <h2>Parabola Logos and Artwork</h2>
+    <h2>{{ BRANDING_DISTRONAME }} Logos and Artwork</h2>
     
-    <p>You can help by creating artwork for Parabola GNU/Linux-libre.</p>
+    <p>You can help by creating artwork for {{ BRANDING_DISTRONAME }}.</p>
 
     <p>Send your designs to dev@lists.parabolagnulinux.org and state they are CC-by-sa
       or another free culture friendly license.</p>
 
-
-
-      {% comment %}
+{% comment %}
     <h3>Logos for Press Usage</h3>
 
-    <p>The following Parabola logos are available for press and other use.</p>
+    <p>The following {{BRANDING_DISTRONAME}} logos are available for press and other use.</p>
 
-    <p><strong>Two-color standard version</strong><br/>
+    <p><strong>Two-color standard version</strong><br />
 
-{% comment %}
 <!-- This is an example of how images should be added here -->
     <em>Also available in print-quality
         <a href="{% static "logos/parabola-logo-dark-1200dpi.png" %}"