Commit 6dc0499f authored by Karen Tracey's avatar Karen Tracey
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
parent 46b9dd30

docs/ref/contrib/flatpages.txt

+1 −1
Original line number Diff line number Diff line
@@ -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.

docs/ref/templates/api.txt

+1 −0
Original line number Diff line number Diff line
@@ -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