summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2010-03-10 00:58:05 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2010-03-10 00:58:05 +0000
commitff2d0ebdb8a57aa00d31c41b0556c456943f2b53 (patch)
treefb821b0624ceff5f6cb50d5711ab6b85b5c0d17e /docs/ref
parente316b8b981344c6f4663ddcec268e995db61202e (diff)
Fixed three small doc markup errors.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12741 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/contrib/flatpages.txt2
-rw-r--r--docs/ref/templates/api.txt1
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/ref/contrib/flatpages.txt b/docs/ref/contrib/flatpages.txt
index d360a376a3..8c7f2781d0 100644
--- a/docs/ref/contrib/flatpages.txt
+++ b/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.
diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt
index afa16938ff..12e5d46b88 100644
--- a/docs/ref/templates/api.txt
+++ b/docs/ref/templates/api.txt
@@ -336,6 +336,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