Author: kmtracey
Date: 2010-04-12 08:24:31 -0500 (Mon, 12 Apr 2010)
New Revision: 12952
Modified:
django/branches/releases/1.1.X/
django/branches/releases/1.1.X/docs/ref/contrib/flatpages.txt
django/branches/releases/1.1.X/docs/ref/templates/api.txt
Log:
[1.1.X] Fixed two small doc markup errors.
Partial merge of r12741 from trunk.
Property changes on: django/branches/releases/1.1.X
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-11500,11523,11527-11528,11531-11552,11554,11577,11579-11581,11588-11589,11591-11592,11596-11599,11601-11617,11619-11626,11628-11635,11637-11638,11643-11644,11648-11653,11656,11670,11678,11681,11684,11686,11688,11691,11693,11695,11697,11699,11701,11703,11705,11707,11714,11719,11732,11734,11740,11748,11751,11753,11756,11760,11800,11802,11808,11815,11817,11820,11822,11824,11826,11828,11831,11833,11835,11837,11839,11841,11844,11857,11864,11874,11876,11878,11885,11898,11901,11905,11909,11912,11914,11917,11938,11953,11961,11977,11979,11984,11986,11988,11990,11992,11994,11996,11998,12001,12004,12006,12011,12022,12024,12044-12045,12048,12054-12056,12059,12064,12066,12068,12070,12079,12086,12088,12104,12118,12132,12137-12138,12140-12141,12144,12150-12152,12220-12221,12229,12249,12253,12276,12282,12284,12293,12313,12317-12324,12333,12341,12343,12346,12353,12362,12379,12384,12398,12405,12408-12411,12419-12420,12423,12425-12426,12429,12434,12436,12439-12442,12447-12448,12457,12461-12464,12467,12471,12473,12475,12484,12489-12490,12492,12497-12498,12502,12505,12513,12515-12516,12518,12523,12525-12526,12528-12531,12533-12542,12548-12550,12553-12554,12556-12560,12562-12573,12575-12577,12579,12581-12585,12587,12589,12591-12596,12598-12610,12613-12617,12621-12623,12627-12632,12635-12642,12644-12655,12657-12674,12676-12683,12686-12689,12692,12694-12700,12702-12706,12710-12716,12719-12729,12731,12733-12740,12758,12760-12761,12763,12765,12767,12769,12772,12774-12777,12779,12781,12783,12789,12795-12796,12799-12801,12807,12809,12812-12813,12819,12821,12823,12828,12830,12832,12834,12842,12928,12930,12932,12934,12950
+
/django/trunk:1-11500,11523,11527-11528,11531-11552,11554,11577,11579-11581,11588-11589,11591-11592,11596-11599,11601-11617,11619-11626,11628-11635,11637-11638,11643-11644,11648-11653,11656,11670,11678,11681,11684,11686,11688,11691,11693,11695,11697,11699,11701,11703,11705,11707,11714,11719,11732,11734,11740,11748,11751,11753,11756,11760,11800,11802,11808,11815,11817,11820,11822,11824,11826,11828,11831,11833,11835,11837,11839,11841,11844,11857,11864,11874,11876,11878,11885,11898,11901,11905,11909,11912,11914,11917,11938,11953,11961,11977,11979,11984,11986,11988,11990,11992,11994,11996,11998,12001,12004,12006,12011,12022,12024,12044-12045,12048,12054-12056,12059,12064,12066,12068,12070,12079,12086,12088,12104,12118,12132,12137-12138,12140-12141,12144,12150-12152,12220-12221,12229,12249,12253,12276,12282,12284,12293,12313,12317-12324,12333,12341,12343,12346,12353,12362,12379,12384,12398,12405,12408-12411,12419-12420,12423,12425-12426,12429,12434,12436,12439-12442,12447-12448,12457,12461-12464,12467,12471,12473,12475,12484,12489-12490,12492,12497-12498,12502,12505,12513,12515-12516,12518,12523,12525-12526,12528-12531,12533-12542,12548-12550,12553-12554,12556-12560,12562-12573,12575-12577,12579,12581-12585,12587,12589,12591-12596,12598-12610,12613-12617,12621-12623,12627-12632,12635-12642,12644-12655,12657-12674,12676-12683,12686-12689,12692,12694-12700,12702-12706,12710-12716,12719-12729,12731,12733-12741,12758,12760-12761,12763,12765,12767,12769,12772,12774-12777,12779,12781,12783,12789,12795-12796,12799-12801,12807,12809,12812-12813,12819,12821,12823,12828,12830,12832,12834,12842,12928,12930,12932,12934,12950
Modified: django/branches/releases/1.1.X/docs/ref/contrib/flatpages.txt
===================================================================
--- django/branches/releases/1.1.X/docs/ref/contrib/flatpages.txt
2010-04-12 12:43:39 UTC (rev 12951)
+++ django/branches/releases/1.1.X/docs/ref/contrib/flatpages.txt
2010-04-12 13:24:31 UTC (rev 12952)
@@ -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/branches/releases/1.1.X/docs/ref/templates/api.txt
===================================================================
--- django/branches/releases/1.1.X/docs/ref/templates/api.txt 2010-04-12
12:43:39 UTC (rev 12951)
+++ django/branches/releases/1.1.X/docs/ref/templates/api.txt 2010-04-12
13:24:31 UTC (rev 12952)
@@ -319,6 +319,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
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
