summaryrefslogtreecommitdiff
path: root/docs/topics
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-05-09 05:48:06 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-05-09 05:48:06 +0000
commit5802ea3bbc24a74190ca97058c7894df260ff5b1 (patch)
treef69ba08bc86d402ca7a03ad71814dc757ec9a1e1 /docs/topics
parent4a15dc450996b62596d74f8d98388c9e2f4a10c7 (diff)
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.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13161 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/topics')
-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 0a5d04cdae..5a2980f9d2 100644
--- a/docs/topics/http/urls.txt
+++ b/docs/topics/http/urls.txt
@@ -728,7 +728,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
@@ -749,9 +749,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.