Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[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
  • Loading branch information...
commit 6dc0499fe7d0af5a6c886cb7362a50a769939b17 1 parent 46b9dd3
@kmtracey kmtracey authored
Showing with 2 additions and 1 deletion.
  1. +1 −1  docs/ref/contrib/flatpages.txt
  2. +1 −0  docs/ref/templates/api.txt
View
2  docs/ref/contrib/flatpages.txt
@@ -84,7 +84,7 @@ other status code.
Because the ``FlatpageFallbackMiddleware`` is applied only after
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
normal URL resolution apply view middleware.
View
1  docs/ref/templates/api.txt
@@ -319,6 +319,7 @@ name, the second will override the first. The default processors are explained
below.
.. admonition:: When context processors are applied
+
When you use ``RequestContext``, the variables you supply directly
are added first, followed any variables supplied by context
processors. This means that a context processor may overwrite a
Please sign in to comment.
Something went wrong with that request. Please try again.