Fixed three small doc markup errors.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12741 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
e316b8b981
commit
ff2d0ebdb8
|
@ -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.
|
||||||
|
|
||||||
|
|
|
@ -336,6 +336,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
|
||||||
|
|
|
@ -638,7 +638,7 @@ anymore, unless you're the nostalgic type.
|
||||||
|
|
||||||
The operators supported are ``==``, ``!=``, ``<``, ``>``, ``<=``, ``>=``,
|
The operators supported are ``==``, ``!=``, ``<``, ``>``, ``<=``, ``>=``,
|
||||||
``in`` and ``not in``, all of which work like the Python operators, in addition
|
``in`` and ``not in``, all of which work like the Python operators, in addition
|
||||||
to ``and``, ``or`` and ``not``, which were already supported.
|
to ``and``, ``or`` and ``not``, which were already supported.
|
||||||
|
|
||||||
Also, filters may now be used in the ``if`` expression. For example:
|
Also, filters may now be used in the ``if`` expression. For example:
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue