Merge branch 'master' of /srv/git/repositories/parabolaweb

Conflicts:
	media/admin_media

5 files changed, 9 insertions, 9 deletions

diff --git a/templates/mirrors/index.html b/templates/mirrors/index.html
index 7091229e..c77bf44d 100644
--- a/templates/mirrors/index.html
+++ b/templates/mirrors/index.html
@@ -7,8 +7,8 @@
 
     <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
+    Parabola. 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 +28,8 @@
     <h3>Customized by country mirrorlist</h3>
 
     <p>The following form can generate a custom up-to-date
-    <a href="https://wiki.parabola.kiwwwi.org/index.php/Pacman"
-        title="ArchWiki: Pacman">pacman</a> mirrorlist based on geography and
+    <a href="//wiki.parabolagnulinux.org/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/packages/flag.html b/templates/packages/flag.html
index bb6b274f..27ff73b0 100644
--- a/templates/packages/flag.html
+++ b/templates/packages/flag.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load package_extras %}
 
-{% block title %}Arch Linux - Flag Package - {{ package.pkgname }} {{ package.full_version }} ({{ package.arch.name }}){% endblock %}
+{% block title %}Parabola - Flag Package - {{ package.pkgname }} {{ package.full_version }} ({{ package.arch.name }}){% endblock %}
 {% block head %}<meta name="robots" content="noindex"/>{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
diff --git a/templates/packages/signoff_options.html b/templates/packages/signoff_options.html
index ee9b8b47..950c80c1 100644
--- a/templates/packages/signoff_options.html
+++ b/templates/packages/signoff_options.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Arch Linux - Package Signoff Options - {{ package.pkgbase }} {{ package.full_version }} ({{ package.arch.name }}){% endblock %}
+{% block title %}Parabola - Package Signoff Options - {{ package.pkgbase }} {{ package.full_version }} ({{ package.arch.name }}){% endblock %}
 {% block head %}<meta name="robots" content="noindex"/>{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
diff --git a/templates/public/keys.html b/templates/public/keys.html
index 2e7fcebe..20b91749 100644
--- a/templates/public/keys.html
+++ b/templates/public/keys.html
@@ -1,13 +1,13 @@
 {% extends "base.html" %}
 {% load pgp %}
 
-{% block title %}Arch Linux - Master Signing Keys{% endblock %}
+{% block title %}Parabola - Master Signing Keys{% endblock %}
 
 {% block content %}
 <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 Parabola 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
diff --git a/templates/visualize/index.html b/templates/visualize/index.html
index 99525e69..cc4593d2 100644
--- a/templates/visualize/index.html
+++ b/templates/visualize/index.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Arch Linux - Visualizations{% endblock %}
+{% block title %}Parabola - Visualizations{% endblock %}
 
 {% block content %}
 <div class="box">