7 files changed, 12 insertions, 12 deletions
diff --git a/templates/packages/flag.html b/templates/packages/flag.html
index bfca2a65..d7b86dde 100644
--- a/templates/packages/flag.html
+++ b/templates/packages/flag.html
@@ -29,7 +29,7 @@
 
     <p><strong>Note:</strong> Do <em>not</em> use this facility if the
     package is broken! The package will be unflagged and the report will be ignored!
-    <a href="https://bugs.archlinux.org/" title="Arch Linux Bugtracker">Use the
+    <a href="https://bugs.archlinux.org/" title="{{ BRANDING_DISTRONAME }} Bugtracker">Use the
     bugtracker to file a bug</a> instead.</p>
 
     <p>Please confirm your flag request for {{package.pkgname}}:</p>
diff --git a/templates/packages/flaghelp.html b/templates/packages/flaghelp.html
index 819a2f01..9080f611 100644
--- a/templates/packages/flaghelp.html
+++ b/templates/packages/flaghelp.html
@@ -30,7 +30,7 @@
 
         <p><strong>Note:</strong> Please do <em>not</em> use this facility if the
         package is broken! Use the <a target="_blank" href="https://bugs.archlinux.org"
-            title="Arch Linux Bugtracker">bugtracker</a> instead.</p>
+            title="{{ BRANDING_DISTRONAME }} Bugtracker">bugtracker</a> instead.</p>
 
     </body>
 </html>
diff --git a/templates/packages/opensearch.xml b/templates/packages/opensearch.xml
index 216be3e9..800b7890 100644
--- a/templates/packages/opensearch.xml
+++ b/templates/packages/opensearch.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-	<ShortName>Arch Linux Packages</ShortName>
-	<Description>Search the Arch Linux package repositories.</Description>
+	<ShortName>{{BRANDING_DISTRONAME}} Packages</ShortName>
+	<Description>Search the {{BRANDING_DISTRONAME}} package repositories.</Description>
 	<Tags>linux archlinux package software</Tags>
 	<Image height="16" width="16" type="image/x-icon">{{domain}}/static/favicon.ico</Image>
 	<Language>en-us</Language>
diff --git a/templates/public/feeds.html b/templates/public/feeds.html
index 9f62c4b7..764ebd90 100644
--- a/templates/public/feeds.html
+++ b/templates/public/feeds.html
@@ -6,14 +6,14 @@
 
     <h2>RSS Feeds</h2>
 
-    <p>Several RSS feeds are available for consumption from the Arch website.
+    <p>Several RSS feeds are available for consumption from the {{ BRANDING_SHORTNAME }} website.
     The majority of these are package-related and allow feeds to be customized
     for the updates you care about.</p>
 
     <h3>News and Activity Feeds</h3>
 
-    <p>Grab the <a href="/feeds/news/" class="rss" title="Arch Linux News feed">news item feed</a>
-    to keep up-to-date with the latest news from the Arch Linux development staff.</p>
+    <p>Grab the <a href="/feeds/news/" class="rss" title="{{ BRANDING_DISTRONAME }} News feed">news item feed</a>
+    to keep up-to-date with the latest news from the {{ BRANDING_DISTRONAME }} development staff.</p>
 
     <p>The <a href="https://wiki.archlinux.org/index.php?title=Special:RecentChanges&amp;feed=rss"
     title="ArchWiki Recent Changes feed" class="rss">Arch Wiki: Recent changes feed</a>
@@ -23,7 +23,7 @@
     <h3>Package Feeds</h3>
 
     <p>If you are interested in <a href="/feeds/packages/" class="rss"
-        title="Arch Linux package updates feed">all package updates</a>,
+        title="{{ BRANDING_DISTRONAME }} package updates feed">all package updates</a>,
     then grab this feed. Note that when a package is updated for multiple
     architectures, you will see each individual update show up here.
     Alternatively, you can select a packages feed from the below table that is
diff --git a/templates/public/index.html b/templates/public/index.html
index 86c0be05..4b2bdfa3 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -189,7 +189,7 @@
         <img width="16" height="16" src="{% static "new.png" %}" alt="New"/></li>
         <li><a href="https://wiki.archlinux.org/index.php/Arch_Linux_Press_Review"
             title="Arch Linux in the media">Press Coverage</a></li>
-        <li><a href="{% url 'page-art' %}" title="Arch logos and other artwork for promotional use">Logos &amp; Artwork</a></li>
+        <li><a href="{% url 'page-art' %}" title="{{ BRANDING_SHORTNAME }} logos and other artwork for promotional use">Logos &amp; Artwork</a></li>
         <li><a href="{% url 'news-list' %}" title="News Archives">News Archives</a></li>
         <li><a href="/feeds/" title="Various RSS Feeds">RSS Feeds</a></li>
         <li><a href="{% url 'page-devs' %}" title="Active developers">Developer Profiles</a></li>
diff --git a/templates/public/keys.html b/templates/public/keys.html
index 1a21827a..4afc6d6b 100644
--- a/templates/public/keys.html
+++ b/templates/public/keys.html
@@ -8,7 +8,7 @@
 <div id="signing-keys" class="box">
     <h2>Master Signing Keys</h2>
 
-    <p>This page lists the Arch Linux 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
diff --git a/templates/public/userlist.html b/templates/public/userlist.html
index 66c63400..197346c3 100644
--- a/templates/public/userlist.html
+++ b/templates/public/userlist.html
@@ -6,7 +6,7 @@
 {% block content %}
 {% cache 600 dev-tu-profiles user_type %}
 <div id="dev-tu-profiles" class="box">
-    <h2>Arch Linux {{user_type}}</h2>
+    <h2>{{BRANDING_DISTRONAME}} {{user_type}}</h2>
 
     <p>{{description}}</p>