From ff2d0ebdb8a57aa00d31c41b0556c456943f2b53 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Wed, 10 Mar 2010 00:58:05 +0000 Subject: [PATCH] Fixed three small doc markup errors. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12741 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/ref/contrib/flatpages.txt | 2 +- docs/ref/templates/api.txt | 1 + docs/releases/1.2.txt | 2 +- 3 files changed, 3 insertions(+), 2 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 ` + 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 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 diff --git a/docs/releases/1.2.txt b/docs/releases/1.2.txt index 24dc483f73..9851d01652 100644 --- a/docs/releases/1.2.txt +++ b/docs/releases/1.2.txt @@ -638,7 +638,7 @@ anymore, unless you're the nostalgic type. The operators supported are ``==``, ``!=``, ``<``, ``>``, ``<=``, ``>=``, ``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: