diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2009-07-21 01:48:59 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2009-07-21 01:48:59 +0000 |
| commit | 42ff5b3c1206553d82babce0c535ea6d6c20faa0 (patch) | |
| tree | f865849a2761ae285f4401e9806d5daae78d1a5a /docs | |
| parent | 2fffe390a02ec107e6068ec2aba78248495c4477 (diff) | |
Cleanup of some minor markup problems in URL documentation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11275 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/topics/http/urls.txt | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt index b2e99dce7f..0b2257cefe 100644 --- a/docs/topics/http/urls.txt +++ b/docs/topics/http/urls.txt @@ -465,7 +465,7 @@ Defining URL Namespaces When you need to deploy multiple instances of a single application, it can be helpful to be able to differentiate between instances. This is especially -important when using _`named URL patterns <naming-url-patterns>`, since +important when using :ref:`named URL patterns <naming-url-patterns>`, since multiple instances of a single application will share named URLs. Namespaces provide a way to tell these named URLs apart. @@ -642,7 +642,7 @@ view:: This is completely valid, but it leads to problems when you try to do reverse URL matching (through the ``permalink()`` decorator or the :ttag:`url` template -tag. Continuing this example, if you wanted to retrieve the URL for the +tag). Continuing this example, if you wanted to retrieve the URL for the ``archive`` view, Django's reverse URL matcher would get confused, because *two* URLpatterns point at that view. @@ -706,12 +706,12 @@ the fully qualified name into parts, and then tries the following lookup: example, ``myapp``). This will yield a list of instances of that application. - 2. If there is a ``current`` application defined, Django finds and returns - the URL resolver for that instance. The ``current`` can be specified - as an attribute on the template context - applications that expect to - have multiple deployments should set the ``current_app`` attribute on - any ``Context`` or ``RequestContext`` that is used to render a - template. + 2. If there is a *current* application defined, Django finds and returns + the URL resolver for that instance. The *current* application can be + specified as an attribute on the template context - applications that + expect to have multiple deployments should set the ``current_app`` + attribute on any ``Context`` or ``RequestContext`` that is used to + render a template. The current application can also be specified manually as an argument to the :func:`reverse()` function. @@ -725,7 +725,7 @@ the fully qualified name into parts, and then tries the following lookup: deployed instance of the application, whatever its instance name may be. 5. If the provided namespace doesn't match an application namespace in - step 2, Django will attempt a direct lookup of the namespace as an + step 1, Django will attempt a direct lookup of the namespace as an instance namespace. If there are nested namespaces, these steps are repeated for each part of the |
