6 files changed, 14 insertions, 12 deletions
diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index 64009380..5fe1c585 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -4,8 +4,9 @@
 {% load mirror_status %}
 {% load flags %}
 {% load admin_urls %}
+{% load bugs %}
 
-{% block title %}Arch Linux - {{ mirror.name }} - Mirror Details{% endblock %}
+{% block title %}{{ BRANDING_DISTRONAME }} - {{ mirror.name }} - Mirror Details{% endblock %}
 
 {% block head %}<link rel="stylesheet" type="text/css" href="{% static "flags/fam.css" %}" media="screen, projection" />{% endblock %}
 
@@ -63,7 +64,7 @@
         </tr>
         <tr>
             <th>Flyspray Issue:</th>
-            <td>{% if mirror.bug %}<a href="https://bugs.archlinux.org/task/{{ mirror.bug }}">FS#{{ mirror.bug }}</a>{% endif %}</td>
+            <td>{% if mirror.bug %}{% bug_link mirror.bug %}{% endif %}</td>
         </tr>
         <tr>
             <th>Notes:</th>
diff --git a/templates/mirrors/mirrorlist.txt b/templates/mirrors/mirrorlist.txt
index a7f8e2af..b8eada93 100644
--- a/templates/mirrors/mirrorlist.txt
+++ b/templates/mirrors/mirrorlist.txt
@@ -4,7 +4,7 @@ them, sacrifices have to be made. If editing this template, it is easiest to
 forget about where line breaks are happening until you are done getting the
 content right, and then go back later to fix it all up.
 {% endcomment %}{% autoescape off %}##
-## Arch Linux repository mirrorlist
+## {{ BRANDING_DISTRONAME }} repository mirrorlist
 ## Generated on {% now "Y-m-d" %}
 ##{% for mirror_url in mirror_urls %}{% ifchanged %}
 
diff --git a/templates/mirrors/mirrorlist_generate.html b/templates/mirrors/mirrorlist_generate.html
index 59b0d358..c2a79fa8 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 %}Arch Linux - 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 Arch
-    Linux. 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.archlinux.org/index.php/Pacman"
-        title="ArchWiki: 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
diff --git a/templates/mirrors/mirrorlist_status.txt b/templates/mirrors/mirrorlist_status.txt
index c69075a3..746aae76 100644
--- a/templates/mirrors/mirrorlist_status.txt
+++ b/templates/mirrors/mirrorlist_status.txt
@@ -4,7 +4,7 @@ them, sacrifices have to be made. If editing this template, it is easiest to
 forget about where line breaks are happening until you are done getting the
 content right, and then go back later to fix it all up.
 {% endcomment %}{% autoescape off %}##
-## Arch Linux repository mirrorlist
+## {{ BRANDING_DISTRONAME }} repository mirrorlist
 ## Sorted by mirror score from mirror status page
 ## Generated on {% now "Y-m-d" %}
 ##
diff --git a/templates/mirrors/mirrors.html b/templates/mirrors/mirrors.html
index f55bd875..3450d439 100644
--- a/templates/mirrors/mirrors.html
+++ b/templates/mirrors/mirrors.html
@@ -3,7 +3,7 @@
 {% load static from staticfiles %}
 {% load flags %}
 
-{% block title %}Arch Linux - Mirror Overview{% endblock %}
+{% block title %}{{ BRANDING_DISTRONAME }} - Mirror Overview{% endblock %}
 
 {% block head %}<link rel="stylesheet" type="text/css" href="{% static "flags/fam.css" %}" media="screen, projection" />{% endblock %}
 
diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html
index 530e3ff5..f11d57ca 100644
--- a/templates/mirrors/status.html
+++ b/templates/mirrors/status.html
@@ -3,14 +3,14 @@
 {% load mirror_status %}
 {% load flags %}
 
-{% block title %}Arch Linux - Mirror Status{% if tier != None %} - Tier {{ tier }}{% endif %}{% endblock %}
+{% block title %}{{ BRANDING_DISTRONAME }} - Mirror Status{% if tier != None %} - Tier {{ tier }}{% endif %}{% endblock %}
 
 {% block head %}<link rel="stylesheet" type="text/css" href="{% static "flags/fam.css" %}" media="screen, projection" />{% endblock %}
 
 {% block content %}
 <div id="mirrorstatus" class="box">
     <h2>Mirror Status{% if tier != None %} - Tier {{ tier }}{% endif %}</h2>
-    <p>This page reports the status of all known, public, and active Arch Linux
+    <p>This page reports the status of all known, public, and active {{ BRANDING_DISTRONAME }}
     mirrors. All data on this page reflects the status of the mirrors within
     the <em>last {{ cutoff|hours }}</em>. All listed times are UTC. The check script runs
     on a regular basis and polls for the <tt>lastsync</tt> file in the root of