Index: django/contrib/admin/templates/admin/base.html
===================================================================
--- django/contrib/admin/templates/admin/base.html (revision 8168)
+++ django/contrib/admin/templates/admin/base.html (working copy)
@@ -22,7 +22,7 @@
{% block branding %}{% endblock %}
{% if user.is_authenticated and user.is_staff %}
-
+
{% endif %}
{% block nav-global %}{% endblock %}
Index: django/contrib/admindocs/urls.py
===================================================================
--- django/contrib/admindocs/urls.py (revision 8168)
+++ django/contrib/admindocs/urls.py (working copy)
@@ -2,14 +2,14 @@
from django.contrib.admindocs import views
urlpatterns = patterns('',
- ('^$', views.doc_index),
- ('^bookmarklets/$', views.bookmarklets),
- ('^tags/$', views.template_tag_index),
- ('^filters/$', views.template_filter_index),
- ('^views/$', views.view_index),
- ('^views/(?P[^/]+)/$', views.view_detail),
- ('^models/$', views.model_index),
- ('^models/(?P[^\.]+)\.(?P[^/]+)/$', views.model_detail),
+ url('^$', views.doc_index, name='django-admindocs-docroot'),
+ url('^bookmarklets/$', views.bookmarklets, name='django-admindocs-bookmarklets'),
+ url('^tags/$', views.template_tag_index, name='django-admindocs-tags'),
+ url('^filters/$', views.template_filter_index, name='django-admindocs-filters'),
+ url('^views/$', views.view_index, name='django-admindocs-views-index'),
+ url('^views/(?P[^/]+)/$', views.view_detail, name='django-admindocs-views-detail'),
+ url('^models/$', views.model_index, name='django-admindocs-models-index'),
+ url('^models/(?P[^\.]+)\.(?P[^/]+)/$', views.model_detail, name='django-admindocs-models-detail'),
# ('^templates/$', views.template_index),
- ('^templates/(?P.*)/$', views.template_detail),
+ url('^templates/(?P.*)/$', views.template_detail, name='django-admindocs-templates'),
)