summaryrefslogtreecommitdiff
path: root/docs/intro/tutorial01.txt
diff options
context:
space:
mode:
authorMarten Kenbeek <marten.knbk@gmail.com>2015-05-28 17:25:52 +0200
committerTim Graham <timograham@gmail.com>2015-06-08 15:12:20 -0400
commit1e82094f1b6690018228e688303295f83e1c3d9a (patch)
treea0e209da939ebe3b64e8e38cf47a191785825da0 /docs/intro/tutorial01.txt
parent39937de7e60052d3ffa9f07fdbb9262aced35d61 (diff)
Fixed #21927 -- Made application and instance namespaces more distinct.
Made URL application namespaces be set in the included URLconf and instance namespaces in the call to include(). Deprecated other ways to set application and instance namespaces.
Diffstat (limited to 'docs/intro/tutorial01.txt')
-rw-r--r--docs/intro/tutorial01.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt
index 4eb8ecca4d..6db12d118b 100644
--- a/docs/intro/tutorial01.txt
+++ b/docs/intro/tutorial01.txt
@@ -293,15 +293,15 @@ with:
urlpatterns = [
url(r'^polls/', include('polls.urls')),
- url(r'^admin/', include(admin.site.urls)),
+ url(r'^admin/', admin.site.urls),
]
.. admonition:: Doesn't match what you see?
- If you're seeing ``admin.autodiscover()`` before the definition of
- ``urlpatterns``, you're probably using a version of Django that doesn't
- match this tutorial version. You'll want to either switch to the older
- tutorial or the newer Django version.
+ If you're seeing ``include(admin.site.urls)`` instead of just
+ ``admin.site.urls``, you're probably using a version of Django that
+ doesn't match this tutorial version. You'll want to either switch to the
+ older tutorial or the newer Django version.
You have now wired an ``index`` view into the URLconf. Lets verify it's
working, run the following command: