summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-05-09 05:51:57 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-05-09 05:51:57 +0000
commit3981355c5c770f80c1590a4d4ba152e78026e14d (patch)
treeb1c236a090e15dca5017f0c3271964d2f12fe79e
parentd52996311317592e72b1bc72cb125a5f64e5fee0 (diff)
downloaddjango-3981355c5c770f80c1590a4d4ba152e78026e14d.tar.gz
[1.1.X] Fixed #13051 -- Corrected the documentation of URL namespacing to match the tested implementation behavior. Thanks to apollo13 for the report, and Gabriel Hurley for the patch.
Backport of r13161 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13164 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--docs/topics/http/urls.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt
index fd45e79876..fc7e532a16 100644
--- a/docs/topics/http/urls.txt
+++ b/docs/topics/http/urls.txt
@@ -722,7 +722,7 @@ the fully qualified name into parts, and then tries the following lookup:
that has an instance namespace matching the application namespace (in
this example, an instance of the ``myapp`` called ``myapp``).
- 4. If there is no default application instance, Django will pick the first
+ 4. If there is no default application instance, Django will pick the last
deployed instance of the application, whatever its instance name may be.
5. If the provided namespace doesn't match an application namespace in
@@ -743,9 +743,9 @@ possible:
the instance ``bar``.
* If there is no current instance - say, if we were rendering a page
- somewhere else on the site - ``myapp:index`` will resolve to the first
+ somewhere else on the site - ``myapp:index`` will resolve to the last
registered instance of ``myapp``. Since there is no default instance,
- the first instance of ``myapp`` that is registered will be used. This could
+ the last instance of ``myapp`` that is registered will be used. This could
be ``foo`` or ``bar``, depending on the order they are introduced into the
urlpatterns of the project.