Normalize whitespace in {{ VARNAME }}

10 files changed, 27 insertions, 27 deletions

diff --git a/templates/mirrors/mirrorlist_generate.html b/templates/mirrors/mirrorlist_generate.html
index c2a79fa8..7501a9af 100644
--- a/templates/mirrors/mirrorlist_generate.html
+++ b/templates/mirrors/mirrorlist_generate.html
@@ -30,7 +30,7 @@
 
     <p>The following form can generate a custom up-to-date
     <a href="{% wiki_url 'Pacman' %}"
-        title="{{BRANDING_WIKINAME}}: Pacman">pacman</a> mirrorlist based on geography and
+        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/news/list.html b/templates/news/list.html
index 8662a91b..7bc65721 100644
--- a/templates/news/list.html
+++ b/templates/news/list.html
@@ -4,7 +4,7 @@
 {% block title %}{{ BRANDING_DISTRONAME }} - News{% endblock %}
 
 {% block head %}
-<link rel="alternate" type="application/rss+xml" title="{{BRANDING_DISTRONAME}} News Updates" href="/feeds/news/" />
+<link rel="alternate" type="application/rss+xml" title="{{ BRANDING_DISTRONAME }} News Updates" href="/feeds/news/" />
 {% endblock %}
 
 {% block content %}
diff --git a/templates/packages/opensearch.xml b/templates/packages/opensearch.xml
index 0004b996..4c0f9acf 100644
--- a/templates/packages/opensearch.xml
+++ b/templates/packages/opensearch.xml
@@ -1,9 +1,9 @@
 {% load static from staticfiles %}<?xml version="1.0" encoding="UTF-8"?>
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-	<ShortName>{{BRANDING_SHORTNAME}} Packages</ShortName>
-	<LongName>{{BRANDING_DISTRONAME}} Package Repository Search</LongName>
-	<Description>Search the {{BRANDING_DISTRONAME}} package repositories by keyword in package names and descriptions.</Description>
-	<Tags>{{BRANDING_OSEARCH_TAGS}}</Tags>
+	<ShortName>{{ BRANDING_SHORTNAME }} Packages</ShortName>
+	<LongName>{{ BRANDING_DISTRONAME }} Package Repository Search</LongName>
+	<Description>Search the {{ BRANDING_DISTRONAME }} package repositories by keyword in package names and descriptions.</Description>
+	<Tags>{{ BRANDING_OSEARCH_TAGS }}</Tags>
 	<Image height="16" width="16" type="image/x-icon">{{ domain }}{% static "favicon.ico" %}</Image>
 	<Image height="64" width="64" type="image/png">{{ domain }}{% static "logos/icon-transparent-64x64.png" %}</Image>
 	<Language>en-us</Language>
diff --git a/templates/packages/search.html b/templates/packages/search.html
index a7433934..8037a413 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -7,7 +7,7 @@
 
 {% block head %}
 {% if is_paginated and page_obj.number > 1 %}<meta name="robots" content="noindex, nofollow"/>{% endif %}
-<link rel="alternate" type="application/rss+xml" title="{{BRANDING_DISTRONAME}} Package Updates" href="/feeds/packages/" />
+<link rel="alternate" type="application/rss+xml" title="{{ BRANDING_DISTRONAME }} Package Updates" href="/feeds/packages/" />
 {% endblock %}
 
 {% block content %}
diff --git a/templates/public/art.html b/templates/public/art.html
index 40fd9bad..b8b1d886 100644
--- a/templates/public/art.html
+++ b/templates/public/art.html
@@ -10,9 +10,9 @@
 
     <h3>Logos for Press Usage</h3>
 
-    <p>The following {{BRANDING_DISTRONAME}} logos are available for press and other use, subject to
+    <p>The following {{ BRANDING_DISTRONAME }} logos are available for press and other use, subject to
     the restrictions of our <a href="{% wiki_url 'DeveloperWiki:TrademarkPolicy' %}"
-        title="{{BRANDING_DISTRONAME}} Trademark Policy">trademark policy</a>.</p>
+        title="{{ BRANDING_DISTRONAME }} Trademark Policy">trademark policy</a>.</p>
 
     <p><strong>Two-color standard version</strong><br />
     <em>Also available in print-quality
diff --git a/templates/public/download.html b/templates/public/download.html
index c0251d2f..63398dde 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -8,7 +8,7 @@
 
 {% block head %}
 <link rel="stylesheet" type="text/css" href="{% static "flags/fam.css" %}" media="screen, projection" />
-<link rel="alternate" type="application/rss+xml" title="{{BRANDING_DISTRONAME}} Releases" href="/feeds/releases/" />
+<link rel="alternate" type="application/rss+xml" title="{{ BRANDING_DISTRONAME }} Releases" href="/feeds/releases/" />
 {% endblock %}
 
 {% block navbarclass %}anb-download{% endblock %}
@@ -16,13 +16,13 @@
 {% block content %}
 <div id="arch-downloads" class="box">
 
-    <h2>{{BRANDING_DISTRONAME}} Downloads</h2>
+    <h2>{{ BRANDING_DISTRONAME }} Downloads</h2>
 
     <h3>Release Info</h3>
 
     <p>The image can be burned to a CD, mounted as an ISO file,
     or be directly written to a USB stick using a utility like `dd`. It
-    is intended for new installations only; an existing {{BRANDING_DISTRONAME}} system
+    is intended for new installations only; an existing {{ BRANDING_DISTRONAME }} system
     can always be updated with `pacman -Syu`.</p>
 
     <ul>
@@ -46,9 +46,9 @@
     <div class="article-content">{{ release.info_html }}</div>
     {% endif %}
 
-    <h3>Existing {{BRANDING_SHORTNAME}} Users</h3>
+    <h3>Existing {{ BRANDING_SHORTNAME }} Users</h3>
 
-    <p>If you are an existing {{BRANDING_SHORTNAME}} user, there is no need to download a new ISO
+    <p>If you are an existing {{ BRANDING_SHORTNAME }} user, there is no need to download a new ISO
     to update your existing system. You may be looking for
     <a href="{% url 'mirrorlist' %}">an updated mirrorlist</a> instead.</p>
 
@@ -70,7 +70,7 @@
     <p>If you have a wired connection, you can boot the latest release directly over the network.</p>
     <ul>
         <li><a href="{% url 'releng-netboot-info' %}"
-            title="{{BRANDING_DISTRONAME}} Netboot">{{BRANDING_DISTRONAME}} Netboot</a></li>
+            title="{{ BRANDING_DISTRONAME }} Netboot">{{ BRANDING_DISTRONAME }} Netboot</a></li>
     </ul>
 
     <h3>HTTP Direct Downloads</h3>
@@ -107,7 +107,7 @@
     </div>
     {% endcache %}
 
-    <p>If you want to become an Official {{BRANDING_DISTRONAME}} Mirror please follow the
+    <p>If you want to become an Official {{ BRANDING_DISTRONAME }} Mirror please follow the
     instructions listed <a href="{% wiki_url 'DeveloperWiki:NewMirrors' %}">here</a>.</p>
 
 </div>
diff --git a/templates/public/feeds.html b/templates/public/feeds.html
index 9936944e..fd1ad77a 100644
--- a/templates/public/feeds.html
+++ b/templates/public/feeds.html
@@ -12,8 +12,8 @@
 
     <h3>News and Activity Feeds</h3>
 
-    <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>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="{% wiki_url 'Special:RecentChanges?feed=rss' %}"
     title="{{ BRANDING_WIKINAME }} Recent Changes feed" class="rss">{{ BRANDING_WIKINAME }}: Recent changes feed</a>
@@ -67,13 +67,13 @@
 
     <h3>Release Feed</h3>
 
-    <p>Grab the <a href="/feeds/releases/" class="rss" title="{{BRANDING_DISTRONAME}} release feed">ISO release feed</a>
+    <p>Grab the <a href="/feeds/releases/" class="rss" title="{{ BRANDING_DISTRONAME }} release feed">ISO release feed</a>
     if you want to help seed the ISO release torrents as they come out.</p>
 
     <h3>Development Feeds</h3>
 
     <p>Subscribe to any of the following to track bug tickets and feature
-    requests from the <a href="{{BUGTRACKER_URL}}" title="{{BRANDING_DISTRONAME}} Bugs">{{BRANDING_DISTRONAME}} Bugtracker</a>:</p>
+    requests from the <a href="{{ BUGTRACKER_URL }}" title="{{ BRANDING_DISTRONAME }} Bugs">{{ BRANDING_DISTRONAME }} Bugtracker</a>:</p>
 
     <table class="pretty2">
         <thead>
diff --git a/templates/public/index.html b/templates/public/index.html
index f28f43ce..0898a6cd 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -13,7 +13,7 @@
 <div id="intro" class="box">
     <h2>A simple, lightweight distribution</h2>
 
-    <p>You've reached the website for <strong>{{BRANDING_DISTRONAME}}</strong>, a
+    <p>You've reached the website for <strong>{{ BRANDING_DISTRONAME }}</strong>, a
     lightweight and flexible Linux® distribution that tries to Keep It
     Simple.</p>
 
@@ -29,8 +29,8 @@
     and <a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/"
         title="{{ BRANDING_SHORTNAME }} Mailing Lists">mailing lists</a>
     to get your feet wet.  Also glance through our <a href="{% wiki_url %}"
-        title="{{BRANDING_WIKINAME}}">wiki</a>
-    if you want to learn more about {{BRANDING_SHORTNAME}}.</p>
+        title="{{ BRANDING_WIKINAME }}">wiki</a>
+    if you want to learn more about {{ BRANDING_SHORTNAME }}.</p>
 
     <p class="readmore"><a href="{% url 'page-about' %}"
         title="Learn more about {{ BRANDING_DISTRONAME }}">Learn more...</a></p>
@@ -125,7 +125,7 @@
         <li><a href="https://planet.archlinux.org/"
             title="Arch in the blogosphere">Planet Arch</a></li>
         <li><a href="{% wiki_url 'International_communities' %}"
-            title="{{DISTRO_SHORTNAME}} communities in your native language">International Communities</a></li>
+            title="{{ BRANDING_SHORTNAME }} communities in your native language">International Communities</a></li>
     </ul>
 
     <h4>Support</h4>
@@ -155,7 +155,7 @@
     <h4>Development</h4>
     <ul>
         <li><a href="{{ PROJECTS_URL }}"
-            title="Official {{BRANDING_SHORTNAME}} projects (git)">Projects in Git</a></li>
+            title="Official {{ BRANDING_SHORTNAME }} projects (git)">Projects in Git</a></li>
         <li><a href="{% url 'page-svn' %}"
             title="View SVN entries for packages">SVN Repositories</a></li>
         <li><a href="{% wiki_url 'DeveloperWiki' %}"
diff --git a/templates/public/userlist.html b/templates/public/userlist.html
index d49a1539..dffd0a17 100644
--- a/templates/public/userlist.html
+++ b/templates/public/userlist.html
@@ -9,7 +9,7 @@
 {% block content %}
 {% cache 600 dev-tu-profiles group.name %}
 <div id="dev-tu-profiles" class="box">
-    <h2>{{BRANDING_DISTRONAME}} {{ group.name }}</h2>
+    <h2>{{ BRANDING_DISTRONAME }} {{ group.name }}</h2>
 
     <p>{{ group.description }}</p>
 
diff --git a/templates/releng/release_list.html b/templates/releng/release_list.html
index 3f442d07..1f4a7887 100644
--- a/templates/releng/release_list.html
+++ b/templates/releng/release_list.html
@@ -5,7 +5,7 @@
 {% block title %}{{ BRANDING_DISTRONAME }} - Releases{% endblock %}
 
 {% block head %}
-<link rel="alternate" type="application/rss+xml" title="{{BRANDING_DISTRONAME}} News Updates" href="/feeds/releases/" />
+<link rel="alternate" type="application/rss+xml" title="{{ BRANDING_DISTRONAME }} News Updates" href="/feeds/releases/" />
 {% endblock %}
 
 {% block content %}