From 6dc0499fe7d0af5a6c886cb7362a50a769939b17 Mon Sep 17 00:00:00 2001 From: Karen Tracey Date: Mon, 12 Apr 2010 13:24:31 +0000 Subject: [PATCH] [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 --- docs/ref/contrib/flatpages.txt | 2 +- docs/ref/templates/api.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/ref/contrib/flatpages.txt b/docs/ref/contrib/flatpages.txt index bca1c7a9c1..5ed2688f9f 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 ` + returns will not apply any :ref:`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 c2b594b9f0..5b38bec0d6 100644 --- a/docs/ref/templates/api.txt +++ b/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