From fb5bef707f75d90f51c3377314718648f9792f6a Mon Sep 17 00:00:00 2001
From: Martin Mahner <martin@mahner.org>
Date: Fri, 29 Nov 2013 18:46:11 +0100
Subject: [PATCH] Moved about page to 'paste' to fix 3rd party integration.

---
 dpaste/templates/dpaste/base.html | 2 +-
 dpaste/urls/__init__.py           | 1 -
 dpaste/urls/dpaste.py             | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dpaste/templates/dpaste/base.html b/dpaste/templates/dpaste/base.html
index 8f494fc..39250db 100644
--- a/dpaste/templates/dpaste/base.html
+++ b/dpaste/templates/dpaste/base.html
@@ -16,7 +16,7 @@
 <div class="container-fluid">
     <header>
         <ul class="nav nav-pills pull-right">
-            <li class="{% block dpaste_nav_about %}{% endblock %}"><a href="{% url "about" %}">{% trans "About" %}</a></li>
+            <li class="{% block dpaste_nav_about %}{% endblock %}"><a href="{% url "dpaste_about" %}">{% trans "About" %}</a></li>
             <li class="{% block dpaste_nav_history %}{% endblock %}"><a href="{% url "snippet_history" %}">{% trans "History" %}</a></li>
             <li class="{% block dpaste_nav_new %}{% endblock %}"><a href="{% url "snippet_new" %}">{% trans "New snippet" %} &rarr;</a></li>
         </ul>
diff --git a/dpaste/urls/__init__.py b/dpaste/urls/__init__.py
index 1f0b4ae..0a324a4 100644
--- a/dpaste/urls/__init__.py
+++ b/dpaste/urls/__init__.py
@@ -2,7 +2,6 @@ from django.conf.urls import url, patterns, include
 
 urlpatterns = patterns(
     '',
-    url(r'^about/$', 'dpaste.views.about', name='about'),
     url(r'^', include('dpaste.urls.dpaste_api')),
     url(r'^', include('dpaste.urls.dpaste')),
 )
diff --git a/dpaste/urls/dpaste.py b/dpaste/urls/dpaste.py
index df222c9..32182b8 100644
--- a/dpaste/urls/dpaste.py
+++ b/dpaste/urls/dpaste.py
@@ -1,6 +1,8 @@
 from django.conf.urls import url, patterns
 
 urlpatterns = patterns('dpaste.views',
+    url(r'^about/$', 'about', name='dpaste_about'),
+
     url(r'^$', 'snippet_new', name='snippet_new'),
     url(r'^diff/$', 'snippet_diff', name='snippet_diff'),
     url(r'^history/$', 'snippet_history', name='snippet_history'),