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
This commit is contained in:
parent
2fffe390a0
commit
42ff5b3c12
|
@ -465,7 +465,7 @@ Defining URL Namespaces
|
||||||
|
|
||||||
When you need to deploy multiple instances of a single application, it can be
|
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
|
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
|
multiple instances of a single application will share named URLs. Namespaces
|
||||||
provide a way to tell these named URLs apart.
|
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
|
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
|
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*
|
``archive`` view, Django's reverse URL matcher would get confused, because *two*
|
||||||
URLpatterns point at that view.
|
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
|
example, ``myapp``). This will yield a list of instances of that
|
||||||
application.
|
application.
|
||||||
|
|
||||||
2. If there is a ``current`` application defined, Django finds and returns
|
2. If there is a *current* application defined, Django finds and returns
|
||||||
the URL resolver for that instance. The ``current`` can be specified
|
the URL resolver for that instance. The *current* application can be
|
||||||
as an attribute on the template context - applications that expect to
|
specified as an attribute on the template context - applications that
|
||||||
have multiple deployments should set the ``current_app`` attribute on
|
expect to have multiple deployments should set the ``current_app``
|
||||||
any ``Context`` or ``RequestContext`` that is used to render a
|
attribute on any ``Context`` or ``RequestContext`` that is used to
|
||||||
template.
|
render a template.
|
||||||
|
|
||||||
The current application can also be specified manually as an argument
|
The current application can also be specified manually as an argument
|
||||||
to the :func:`reverse()` function.
|
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.
|
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
|
||||||
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.
|
instance namespace.
|
||||||
|
|
||||||
If there are nested namespaces, these steps are repeated for each part of the
|
If there are nested namespaces, these steps are repeated for each part of the
|
||||||
|
|
Loading…
Reference in New Issue