diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-11-28 19:55:53 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-11-28 19:55:53 -0500 |
commit | b2b6c78e3179cef66cd4e9dcea7f9003f409ce8b (patch) | |
tree | 2355b55efce971b6c7044b1f04b4a3730d2da50f /templates/public/index.html | |
parent | 0877f0389f187cf2cbf026c73b27071857d3e6f7 (diff) | |
parent | fab8d437929fce202b11707e1cacbc079f61edbc (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 566308b8..b263a308 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -114,9 +114,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> </ul> <h4>Community</h4> |