summaryrefslogtreecommitdiff
path: root/templates/public/about.html
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-04-21 19:29:00 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-04-21 19:29:00 -0400
commitca9e5e41f43a8430f4b282bfddf2dcf3ba2c3d7c (patch)
treed662eaaec049edd26bda8091b31c22edc340e18a /templates/public/about.html
parent16e941c68ddb2d37d7e94d0c60da7e9d3dba65a0 (diff)
parent91c451821ce7000cbc268cec8427d208a6cedd7e (diff)
Merge commit '91c451'
Conflicts: devel/views.py feeds.py local_settings.py.example packages/management/commands/signoff_report.py packages/views/flag.py public/views.py templates/404.html templates/base.html templates/devel/clock.html templates/devel/index.html templates/devel/packages.html templates/devel/profile.html templates/general_form.html templates/mirrors/mirror_details.html templates/mirrors/mirrorlist.txt templates/mirrors/mirrorlist_generate.html templates/mirrors/mirrorlist_status.txt templates/mirrors/mirrors.html templates/mirrors/status.html templates/news/add.html templates/news/delete.html templates/news/list.html templates/news/view.html templates/packages/details.html templates/packages/differences.html templates/packages/files.html templates/packages/flag.html templates/packages/flag_confirmed.html templates/packages/flagged.html templates/packages/flaghelp.html templates/packages/groups.html templates/packages/opensearch.xml templates/packages/packages_list.html templates/packages/search.html templates/packages/signoff_options.html templates/packages/signoffs.html templates/packages/stale_relations.html templates/public/about.html templates/public/art.html templates/public/blank.html templates/public/donate.html templates/public/download.html templates/public/feeds.html templates/public/index.html templates/public/keys.html templates/public/svn.html templates/public/userlist.html templates/registration/login.html templates/registration/logout.html templates/releng/add.html templates/releng/results.html templates/releng/thanks.html templates/todolists/list.html templates/todolists/public_list.html templates/todolists/todolist_confirm_delete.html templates/todolists/view.html templates/visualize/index.html todolists/views.py
Diffstat (limited to 'templates/public/about.html')
-rw-r--r--templates/public/about.html7
1 files changed, 4 insertions, 3 deletions
diff --git a/templates/public/about.html b/templates/public/about.html
index 402379d2..b31b05ed 100644
--- a/templates/public/about.html
+++ b/templates/public/about.html
@@ -1,10 +1,11 @@
{% extends "base.html" %}
-{% block title %}Parabola - About{% endblock %}
+{% load wiki %}
+{% block title %}{{ BRANDING_DISTRONAME }} - About{% endblock %}
{% block content %}
<div class="box">
<h2 class="title">Parabola Presentation</h2>
- <p>Almost a year ago we started a project to offer the Free Software
+ <p>In 2009 we started a project to offer the Free Software
community the chance of using an Arch Linux system completely
freed from proprietary software.</p>
@@ -53,7 +54,7 @@
<li>Host repositories. Mirrors are not abundant.</li>
- <li>Take a look at our <a href="https://wiki.parabolagnulinux.org/TODO" title="TODO">TODO list</a></li>
+ <li>Take a look at our <a href="{% wiki_url 'TODO' %}" title="TODO">TODO list</a></li>
</ul>
</div>