[1.1.X] Fixed two small doc markup errors.
Partial merge of r12741 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
46b9dd3048
commit
6dc0499fe7
|
@ -84,7 +84,7 @@ other status code.
|
||||||
|
|
||||||
Because the ``FlatpageFallbackMiddleware`` is applied only after
|
Because the ``FlatpageFallbackMiddleware`` is applied only after
|
||||||
URL resolution has failed and produced a 404, the response it
|
URL resolution has failed and produced a 404, the response it
|
||||||
returns will not apply any :ref:`view middleware <view-middlware>`
|
returns will not apply any :ref:`view middleware <view-middleware>`
|
||||||
methods. Only requests which are successfully routed to a view via
|
methods. Only requests which are successfully routed to a view via
|
||||||
normal URL resolution apply view middleware.
|
normal URL resolution apply view middleware.
|
||||||
|
|
||||||
|
|
|
@ -319,6 +319,7 @@ name, the second will override the first. The default processors are explained
|
||||||
below.
|
below.
|
||||||
|
|
||||||
.. admonition:: When context processors are applied
|
.. admonition:: When context processors are applied
|
||||||
|
|
||||||
When you use ``RequestContext``, the variables you supply directly
|
When you use ``RequestContext``, the variables you supply directly
|
||||||
are added first, followed any variables supplied by context
|
are added first, followed any variables supplied by context
|
||||||
processors. This means that a context processor may overwrite a
|
processors. This means that a context processor may overwrite a
|
||||||
|
|
Loading…
Reference in New Issue