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

diff --git a/templates/mirrors/mirrorlist_generate.html b/templates/mirrors/mirrorlist_generate.html
index 35d84ddc..2025eec2 100644
--- a/templates/mirrors/mirrorlist_generate.html
+++ b/templates/mirrors/mirrorlist_generate.html
@@ -1,14 +1,15 @@
 {% extends "base.html" %}
 {% load package_extras %}
-{% block title %}Parabola - Pacman Mirrorlist Generator{% endblock %}
+{% load wiki %}
+{% block title %}{{ BRANDING_DISTRONAME }} - Pacman Mirrorlist Generator{% endblock %}
 
 {% block content %}
 <div id="mirrorlist-gen" class="box">
 
     <h2>Pacman Mirrorlist Generator</h2>
 
-    <p>This page generates the most up-to-date mirrorlist possible for
-    Parabola. The data used here comes straight from the developers' internal
+    <p>This page generates the most up-to-date mirrorlist possible for {{ BRANDING_DISTRONAME }}.
+    The data used here comes straight from the developers' internal
     mirror database used to track mirror availability and tiering. There are
     two main options: get a mirrorlist with every available mirror, or get a
     mirrorlist tailored to your geography.</p>
@@ -28,8 +29,8 @@
     <h3>Customized by country mirrorlist</h3>
 
     <p>The following form can generate a custom up-to-date
-    <a href="https://wiki.parabolagnulinux.org/Pacman">pacman</a>
-    mirrorlist based on geography and
+    <a href="{% wiki_url 'Pacman' %}"
+        title="{{BRANDING_WIKINAME}}: Pacman">pacman</a> mirrorlist based on geography and
     desired protocol(s).  Simply replace the contents of
     <code>/etc/pacman.d/mirrorlist</code> with your generated list.
     Additionally, the mirror status data can be incorporated into the generated