p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[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
This commit is contained in:
Russell Keith-Magee 2010-05-09 05:51:57 +00:00
parent d529963113
commit 3981355c5c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/topics/http/urls.txt
View File

@ -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 that has an instance namespace matching the application namespace (in
this example, an instance of the ``myapp`` called ``myapp``). 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. deployed instance of the application, whatever its instance name may be.
5. If the provided namespace doesn't match an application namespace in 5. If the provided namespace doesn't match an application namespace in
@ -743,9 +743,9 @@ possible:
the instance ``bar``. the instance ``bar``.
* If there is no current instance - say, if we were rendering a page * 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, 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 be ``foo`` or ``bar``, depending on the order they are introduced into the
urlpatterns of the project. urlpatterns of the project.