From ae9ee14ff153698dd90c6560437e42ff124a6d0b Mon Sep 17 00:00:00 2001
From: Luke Shumaker
The Arch Linux name and logo are recognized - trademarks. Some rights reserved.
The registered trademark Linux® is used pursuant to a sublicense from LMI, diff --git a/templates/mirrors/mirrorlist_generate.html b/templates/mirrors/mirrorlist_generate.html index c68cad6c..2025eec2 100644 --- a/templates/mirrors/mirrorlist_generate.html +++ b/templates/mirrors/mirrorlist_generate.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% load package_extras %} +{% load wiki %} {% block title %}{{ BRANDING_DISTRONAME }} - Pacman Mirrorlist Generator{% endblock %} {% block content %} @@ -28,8 +29,8 @@
The following form can generate a custom up-to-date
- pacman mirrorlist based on geography and
+ pacman mirrorlist based on geography and
desired protocol(s). Simply replace the contents of
/etc/pacman.d/mirrorlist
with your generated list.
Additionally, the mirror status data can be incorporated into the generated
diff --git a/templates/public/art.html b/templates/public/art.html
index f013a040..89f1f81e 100644
--- a/templates/public/art.html
+++ b/templates/public/art.html
@@ -11,7 +11,7 @@
The following {{BRANDING_DISTRONAME}} logos are available for press and other use, subject to - the restrictions of our trademark policy.
Two-color standard version
diff --git a/templates/public/download.html b/templates/public/download.html
index fdfe8e57..72d21736 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -2,6 +2,7 @@
{% load cache %}
{% load url from future %}
{% load static from staticfiles %}
+{% load wiki %}
{% block title %}{{ BRANDING_DISTRONAME }} - Downloads{% endblock %}
{% block navbarclass %}anb-download{% endblock %}
@@ -20,7 +21,7 @@
can always be updated with `pacman -Syu`.
If you want to become an Official Arch Linux Mirror please follow the - instructions listed here.
+ instructions listed here. {% endblock %} diff --git a/templates/public/feeds.html b/templates/public/feeds.html index 764ebd90..f298de7f 100644 --- a/templates/public/feeds.html +++ b/templates/public/feeds.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base.html" %}{% load wiki %} {% block title %}{{ BRANDING_DISTRONAME }} - RSS Feeds{% endblock %} {% block content %} @@ -15,10 +15,10 @@Grab the news item feed to keep up-to-date with the latest news from the {{ BRANDING_DISTRONAME }} development staff.
-The Arch Wiki: Recent changes feed - is also available to track document changes from the Arch Wiki.
+The {{ BRANDING_WIKINAME }}: Recent changes feed + is also available to track document changes from the {{ BRANDING_WIKINAME }}.
The PKGBUILD files can be fetched via the ABS utility. To learn more - about ABS, see the ABS wiki page. + about ABS, see the ABS wiki page.
The SVN repositories have been cloned into git repositories and can be viewed via the cgit interface. @@ -31,7 +31,7 @@ cd community svn update <your-package-name>
- Visit the wiki + Visit the wiki for more tips on checking out and updating svn PKGBUILDs.
diff --git a/templates/releng/results.html b/templates/releng/results.html index 82073ffe..df98d1ac 100644 --- a/templates/releng/results.html +++ b/templates/releng/results.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% load url from future %} +{% load wiki %} {% block title %}{{ BRANDING_DISTRONAME }} - Release Engineering Testbuild Results{% endblock %} @@ -18,7 +19,7 @@ the overview.For more information, see the documentation + href="{% wiki_url 'DeveloperWiki:releng_testimages_feedback' %}">documentation on the wiki.
All ISOs referenced on this page are available from -- cgit v1.2.3-2-g168b