diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-11-28 19:57:27 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-11-28 19:57:27 -0500 |
| commit | dbb508b7222081b523ce3e0bd2b69f5fea6c7050 (patch) | |
| tree | f5f3a97b9465504ed9e7633a0c385669b7463d3c /templates/public/index.html | |
| parent | fd788c5fcf9009540ad14a869dcebdfd30fb9d6f (diff) | |
| parent | b2b6c78e3179cef66cd4e9dcea7f9003f409ce8b (diff) | |
Merge tag 'release_2013-11-25' into archweb-generic
Django 1.6 upgrade and other changes
Conflicts:
templates/news/list.html
templates/public/index.html
Diffstat (limited to 'templates/public/index.html')
| -rw-r--r-- | templates/public/index.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/public/index.html b/templates/public/index.html index db14ee19..3a5d98d6 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -116,9 +116,9 @@ <li><a href="{% wiki_url %}" title="Community documentation">Wiki</a></li> <li><a href="{% wiki_url 'Installation Guide' %}" - title="Official installation guide">Official Installation Guide</a></li> + title="Installation guide">Installation Guide</a></li> <li><a href="{% wiki_url "Beginners'_Guide" %}" - title="A good place to start for beginners">Unofficial Beginners' Guide</a></li> + title="A good place to start for beginners">Beginners' Guide</a></li> <li><a href="{% wiki_url 'Migration' %}" title="Free your Arch installation">Migration from Arch Linux</a></li> </ul> |