Commit 3981355c authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.1.X] Fixed #13051 -- Corrected the documentation of URL namespacing to... 

[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
parent d5299631

docs/topics/http/urls.txt

+3 −3
Original line number Diff line number Diff line
@@ -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.