diff options
| author | Karen Tracey <kmtracey@gmail.com> | 2010-04-12 13:24:31 +0000 |
|---|---|---|
| committer | Karen Tracey <kmtracey@gmail.com> | 2010-04-12 13:24:31 +0000 |
| commit | 6dc0499fe7d0af5a6c886cb7362a50a769939b17 (patch) | |
| tree | d376a96ecc680aee39407dd3ccc333f01da6d98e /docs/ref | |
| parent | 46b9dd3048b6b3c60f7ed49580d1470f5974e96b (diff) | |
[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
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/contrib/flatpages.txt | 2 | ||||
| -rw-r--r-- | docs/ref/templates/api.txt | 1 |
2 files changed, 2 insertions, 1 deletions
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 <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 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 |