Ticket #6962: 6962_admindoc_url_fix.1.diff

django/contrib/admin/templates/admin/base.html

@@ -22 +22 @@
         {% block branding %}{% endblock %}
         </div>
         {% if user.is_authenticated and user.is_staff %}
-        <div id="user-tools">{% trans 'Welcome,' %} <strong>{% if user.first_name %}{{ user.first_name|escape }}{% else %}{{ user.username }}{% endif %}</strong>. {% block userlinks %}<a href="{{ root_path }}doc/">{% trans 'Documentation' %}</a> / <a href="{{ root_path }}password_change/">{% trans 'Change password' %}</a> / <a href="{{ root_path }}logout/">{% trans 'Log out' %}</a>{% endblock %}</div>
+        <div id="user-tools">{% trans 'Welcome,' %} <strong>{% if user.first_name %}{{ user.first_name|escape }}{% else %}{{ user.username }}{% endif %}</strong>. {% block userlinks %}<a href="{% url admin_doc_index %}">{% trans 'Documentation' %}</a> / <a href="{{ root_path }}password_change/">{% trans 'Change password' %}</a> / <a href="{{ root_path }}logout/">{% trans 'Log out' %}</a>{% endblock %}</div>
         {% endif %}
         {% block nav-global %}{% endblock %}
     </div>

django/contrib/admindocs/urls.py

@@ -2 +2 @@
 from django.contrib.admindocs import views
 
 urlpatterns = patterns('',
-    ('^$', views.doc_index),
+    ('^$', views.doc_index, {}, "admin_doc_index"),
     ('^bookmarklets/$', views.bookmarklets),
     ('^tags/$', views.template_tag_index),
     ('^filters/$', views.template_filter_index),