Author: mtredinnick
Date: 2010-03-09 18:58:05 -0600 (Tue, 09 Mar 2010)
New Revision: 12741
Modified:
django/trunk/docs/ref/contrib/flatpages.txt
django/trunk/docs/ref/templates/api.txt
django/trunk/docs/releases/1.2.txt
Log:
Fixed three small doc markup errors.
Modified: django/trunk/docs/ref/contrib/flatpages.txt
===================================================================
--- django/trunk/docs/ref/contrib/flatpages.txt 2010-03-09 22:59:02 UTC (rev
12740)
+++ django/trunk/docs/ref/contrib/flatpages.txt 2010-03-10 00:58:05 UTC (rev
12741)
@@ -84,7 +84,7 @@
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.
Modified: django/trunk/docs/ref/templates/api.txt
===================================================================
--- django/trunk/docs/ref/templates/api.txt 2010-03-09 22:59:02 UTC (rev
12740)
+++ django/trunk/docs/ref/templates/api.txt 2010-03-10 00:58:05 UTC (rev
12741)
@@ -336,6 +336,7 @@
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
Modified: django/trunk/docs/releases/1.2.txt
===================================================================
--- django/trunk/docs/releases/1.2.txt 2010-03-09 22:59:02 UTC (rev 12740)
+++ django/trunk/docs/releases/1.2.txt 2010-03-10 00:58:05 UTC (rev 12741)
@@ -638,7 +638,7 @@
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:
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
