Commit Graph

3780 Commits

Author SHA1 Message Date
Luke Plant e127e17b49 Fixed our Sphinx extension to work with latest Sphinx
This is pretty hacky, but there doesn't seem to be a nice way to fix it,
since we can't call the base method - we are deliberately overriding it in
order to not call the base method, which adds an unwanted 'border=1' to the
HTML.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16223 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-14 02:58:58 +00:00
Simon Meers 5ecb88c146 Fixed #16014 -- numerous documentation typos -- thanks psmith.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16220 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-13 04:33:42 +00:00
Simon Meers df6e031408 Fixed #16005 -- Error in blocktrans docs -- thanks bezidejni
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16218 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-13 00:48:30 +00:00
Chris Beaven 4d26f6512c Fixes #15595 -- emphasize the benefits of django.test.TestCase. Thanks for the patch Shawn Milochik
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16214 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-11 21:29:14 +00:00
Adrian Holovaty 6e9067623b Fixed small typo from [16054] in docs/topics/http/urls.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16212 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-10 20:16:39 +00:00
Chris Beaven 014cc896bc Fixes #15963 -- Misleading FileField.save documentation. Thanks for the report and patch, ejucovy.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16207 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-10 00:26:32 +00:00
Chris Beaven 39517438e0 Fixes #15588 -- 1.3 release documentation for FileField no longer deleting files unclear. Thanks for the patch, Philip Neustrom.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16205 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-10 00:19:02 +00:00
Luke Plant 396bc58889 Updated AJAX example code in CSRF docs to be consistent regarding what are safe HTTP methods
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16202 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 23:46:02 +00:00
Luke Plant cb060f0f34 Fixed #15258 - Ajax CSRF protection doesn't apply to PUT or DELETE requests
Thanks to brodie for the report, and further input from tow21

This is a potentially backwards incompatible change - if you were doing
PUT/DELETE requests and relying on the lack of protection, you will need to
update your code, as noted in the releaste notes.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16201 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 23:45:54 +00:00
Luke Plant 8cbcf1d3a6 Fixed #14134 - ability to set cookie 'path' and 'secure' attributes of CSRF cookie
Thanks to cfattarsi for the report and initial patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16200 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 23:00:22 +00:00
Luke Plant a75120927e Added 'settings' section to CSRF docs, eliminating the unneeded 'Subdomains' section
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16199 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 23:00:10 +00:00
Luke Plant d3641d889b Clarified wording about use of 2 decorators in CSRF docs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16198 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 23:00:02 +00:00
Luke Plant bf7af2be15 Added clarifying note to docs for CSRF_COOKIE_DOMAIN
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16197 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 22:59:52 +00:00
Simon Meers 8122ce7c76 Fixed #15989 -- typo in static-files howto. Thanks luizvital.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16195 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 22:30:31 +00:00
Luke Plant b6c5f8060d Fixed #15354 - provide method to ensure CSRF token is always available for AJAX requests
Thanks to sayane for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16192 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 21:35:24 +00:00
Luke Plant e9342e9b32 Fixed #15469 - CSRF token is inserted on GET requests
Thanks to goran for report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16191 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 19:06:57 +00:00
Luke Plant 7c648ea4aa Mentioned simplification of AJAX example code in CSRF docs.
Refs #15469. Thanks to aaugustin for the suggestion

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16190 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 19:06:49 +00:00
Luke Plant 5df93d529d Documented the edge case of needing a view that is partly CSRF protected
Refs #15518.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16189 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 18:27:52 +00:00
Luke Plant b5da093fa9 In CSRF docs, moved 'Exceptions' section to 'Edge cases', and cleaned up some associated markup
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16188 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 18:27:45 +00:00
Luke Plant eadcbcb131 Fixed #15518 - documented requires_csrf_token
Thanks to vzima for a report that raised the issue.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16187 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 18:27:36 +00:00
Luke Plant 1d350a6c51 Changed an example in CSRF docs to use new 'render' shortcut
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16186 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 18:27:28 +00:00
Luke Plant ae1866ddef Fixed #15869 - example AJAX code in CSRF docs fails sometimes for IE7 or absolute same origin URLs
Thanks to nick for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16183 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 15:40:01 +00:00
Jannis Leidel c5f58f54fd Fixed #15941 -- Fixed DateField docs to no longer state that the admin calendar's week always starts on Sunday (refs FIRST_DAY_OF_WEEK setting). Thanks aaugustin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16174 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-07 16:58:58 +00:00
Jannis Leidel e282e1b327 Added missing reference to custom template tag docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16173 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-07 16:58:52 +00:00
Jannis Leidel 0322f2b653 Fixed #15263 -- Added support for format localization to the now template tag. Thanks to danielr and dmclain.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-07 16:58:45 +00:00
Jannis Leidel 8f3e1c1c63 Fixed #6392 -- Made django.contrib.humanize template tags locale aware. Thanks, Dave McLain.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16168 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-06 13:29:58 +00:00
Jannis Leidel 0dc6420b3e Added TestCase.settings context manager to easily override settings in test methods.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16165 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-06 13:29:24 +00:00
Luke Plant d11acfd209 Fixed typo in deprecation docs.
Thanks to aaugustin for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16161 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-05 20:49:35 +00:00
Luke Plant 171df93170 Fixed #15954 - New IGNORABLE_404_URLS setting that allows more powerful filtering of 404s to ignore
Thanks to aaugustin for implementing this.

(Technically this doesn't fix the original report, as we've decided against
having *any* default values, but the new feature makes it possible, and the
docs have an example addressing #15954).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16160 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-05 20:49:26 +00:00
Timo Graham 127f1e4190 Fixed #15827 - Documented that OneToOneField in Profile should be named 'user'; thanks lawgon.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16155 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-04 23:44:26 +00:00
Jannis Leidel 95dc7c7486 Fixed #15960 -- Extended list filer API added in r16144 slightly to pass the current model admin to the SimpleListFilter.lookups method to support finer grained control over what is filtered over. Many thanks to Carl Meyer and Julien Phalip for the suggestion and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16152 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-04 22:52:04 +00:00
Jannis Leidel 05b4f2ebc2 Corrected the behavior of the SimpleFilter.lookups method to also be able to return None. Also modified example in documentation to be a bite more realistic. Refs #5833. Thanks for the hint, Martin Mahner.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16150 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-03 13:52:39 +00:00
Jannis Leidel 950e05c3ff Fixed #14262 -- Added new assignment_tag as a simple way to assign the result of a template tag to a context variable. Thanks, Julien Phalip.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16149 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-03 11:52:42 +00:00
Jannis Leidel f4860448dd Fixed #13729 -- Renamed UK localflavor to GB to correctly follow ISO 3166. Thanks, Claude Paroz.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16147 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-03 11:52:20 +00:00
Jannis Leidel 18d2f4a816 Fixed #5833 -- Modified the admin list filters to be easier to customize. Many thanks to Honza Král, Tom X. Tobin, gerdemb, eandre, sciyoshi, bendavis78 and Julien Phalip for working on this.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16144 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-03 10:44:23 +00:00
Timo Graham a85cd1688b Fixed #15942 - removed duplicate module id in docs; thanks magopian.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16142 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-03 10:22:49 +00:00
Alex Gaynor c21d3afaef Fixed #15952 -- fixed an error in the template builtins docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16141 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-03 03:15:28 +00:00
Timo Graham 5487ec8039 Fixed #15887 - Added clarification for required_*() decorators; thanks RoySmith for the sugggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-01 20:08:55 +00:00
Jannis Leidel 13b4f98b80 Fixed #6581 -- Moved documentation of django.contrib.auth.views.redirect_to_login to an own "Helper functions" section.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16130 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-30 13:37:03 +00:00
Timo Graham 2830872d60 Fixed #15876 - Document that test.client.RequestFactory doesn't support sessions or request-altering middleware; thanks slinkp for the suggestion, ShawnMilo for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16128 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-30 12:59:24 +00:00
Ramiro Morales 1d7c2dedcd Fixed small typos in custom template tags docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16126 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-30 02:19:24 +00:00
Jannis Leidel 12a9107a7d Fixed minor doc typo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16125 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-29 15:11:24 +00:00
Jannis Leidel 0fa8bd3d92 Fixed #15920 -- Removed COMMENTS_BANNED_USERS_GROUP setting in favor of the established comments app customization. Thanks, Daniel Lindsley.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16124 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-29 15:11:17 +00:00
Jannis Leidel 79afd55278 Fixed #5925 -- Added new lazily evaluated version of django.core.urlresolvers.reverse. Thanks, SmileyChris, Preston Timmons and Julien Phalip.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16121 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-29 11:49:59 +00:00
Jannis Leidel 07854d1c44 Fixed #15713 -- Added a form field for validating Polish National ID Card numbers. Thanks, xtrqt.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16116 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-28 13:20:33 +00:00
Jannis Leidel 086ab44336 Fixed #15637 -- Added a require_safe decorator for views to accept GET or HEAD. Thanks, aaugustin and Julien.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16115 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-28 13:04:16 +00:00
Simon Meers 013ce8aca2 Fixed #15865 -- correct class name for BaseGenericInlineFormset. Thanks leonelfreire for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-28 01:46:46 +00:00
Simon Meers fe7695533d Fix heading formatting in localflavor docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16112 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-28 00:28:42 +00:00
Simon Meers e5cf560783 Fixed #15885 -- Update auth view docs re: TemplateResponse. Thanks prestontimmons.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16111 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-28 00:26:31 +00:00
Simon Meers 6d98cda03c Fixed #15830 -- Add documentation regarding localflavor i18n. Thanks framos.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16109 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-28 00:20:10 +00:00
Alex Gaynor 930371e91b Fixed #15889 -- when trying to access to access a serializer that doesn't exist, raise a new SerializerDoesNotExist exception. Thanks to Mathieu Agopian for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16104 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-26 16:49:32 +00:00
Timo Graham 449e84a2f1 Fixed #15801 - Incorrect external link for dictConfig; thanks David Niergarth for the report; jonash for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16100 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-24 23:53:24 +00:00
Timo Graham f9fa9327c6 Fixed #15853 - typo in m2m_changed signal documentation; thanks elbarto.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16098 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-24 23:47:18 +00:00
Timo Graham b2481a2cfb Fixed #15875 - typo in F() example; thanks jblaine.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16096 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-23 21:48:23 +00:00
Chris Beaven 5bbba4b9ad Fixes #15862 -- Error in post_syncdb documentation example. Thanks for the report and patch andialbrecht.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16091 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-22 21:23:26 +00:00
Chris Beaven 534c427b20 Fixed #13584 -- Optionally allow empty files with django.forms.FileField. Thanks for the patch erickr and closedbracket.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16090 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-22 21:18:27 +00:00
Jannis Leidel c8092b840b Fixed #15008 -- Replaced all calls in the admin to render_to_response with TemplateResponses for easier customization. Thanks to Chris Adams for the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16087 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-22 18:17:16 +00:00
Ramiro Morales 13cfdb0d8b Fixed a couple of small documentation typos.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16086 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-22 14:08:31 +00:00
Jacob Kaplan-Moss 5b0e4e49d4 Fixed #14091 - be more correct about logging queries in connection.queries.
Thanks to Aymeric Augustin for figuring out how to make this work across
multiple databases.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16081 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-22 12:14:54 +00:00
Jannis Leidel 7478aeb0a7 Fixed #15705 -- Added Croatian (hr) localflavor. Thanks, Zlatko Mašek and Julien Phalip.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16077 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-22 12:03:42 +00:00
Jannis Leidel e1f7bc0a41 Fixed #15013 -- Added Russian (ru) localflavor package. Thanks, blackraven and Julien Phalip.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16076 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-22 12:03:30 +00:00
Jannis Leidel ea248f0107 Fixed #12771 -- Added naturaltime filter to humanize contrib app. Thanks, phinpho, djansoft and xtrqt.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16071 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-22 12:02:47 +00:00
Jannis Leidel 8b588747ed Fixed #12379 -- Added Chinese (cn) localflavor package. Thanks, Xia Kai, Daniel Duan, DaNmarner and Łukasz Rekucki.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16070 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-22 12:02:38 +00:00
Jannis Leidel 6c17190bf8 Fixed #11639, #13618 -- Added get_prepopulated_fields method to ModelAdmin and InlineModelAdmin to be able to handle prepopulated fields on a case-by-case basis. Thanks, leanmeandonothingmachine.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-22 12:02:25 +00:00
Jannis Leidel 59d1f82634 Fixed #11251 -- Extended Australian localflavor to ship a few model fields additionally. Thanks, Simon Meers and Julien Phalip.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16066 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-22 12:01:59 +00:00
Luke Plant 327081f875 Added note about HTML5 to release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16061 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-21 00:00:32 +00:00
Jacob Kaplan-Moss c92e0e4765 Added notes about `select_for_update` to the 1.4 release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16059 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-20 21:00:24 +00:00
Jacob Kaplan-Moss 8f0f73c7b8 Fixed #2705: added a `select_for_update()` clause to querysets.
A number of people worked on this patch over the years -- Hawkeye, Colin Grady,
KBS, sakyamuni, anih, jdemoor, and Issak Kelly. Thanks to them all, and
apologies if I missed anyone.

Special thanks to Dan Fairs for picking it up again at the end and seeing this
through to commit.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16058 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-20 20:42:07 +00:00
Gabriel Hurley 99c1794427 Fixed #15794 -- Corrected an error in the docs which indicated applying decorators to any of the view-like methods would work when it will only work reliably with dispatch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-20 20:03:42 +00:00
Gabriel Hurley 1b1060c916 Fixed #15593 -- Added a note that the output of `reverse` is urlquoted. Thanks to guettli for the report and draft patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16054 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-20 19:50:27 +00:00
Luke Plant 26cda43012 Switched to HTML5 doctype in all Django supplied templates.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16050 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-20 17:40:53 +00:00
Adrian Holovaty 519534bf03 Fixed #15846 -- Fixed unfinished sentence in django-admin.txt. Thanks, follower
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16049 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-20 16:28:02 +00:00
Jannis Leidel 196ac8f8b3 Fixed #6213 -- Updated the flatpages app to only append a slash if the flatpage actually exist.
The FlatpageFallbackMiddleware (and the view) now only add a trailing slash and redirect if the resulting URL refers to an existing flatpage. Previously requesting /notaflatpageoravalidurl would redirect to /notaflatpageoravalidurl/, which would then raise a 404. Requesting /notaflatpageoravalidurl now will immediately raise a 404. Also, Redirects returned by flatpages are now permanent (301 status code) to match the behaviour of the CommonMiddleware.

Thanks to Steve Losh for the initial work on the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16048 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-20 14:41:47 +00:00
Luke Plant 96520e87bd Corrected factual error regarding logging in the CSRF docs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16047 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-20 11:39:10 +00:00
Luke Plant 1286d78311 Fixed #15791 - method to signal that callable objects should not be called in templates
Thanks to ejucovy for the suggestion and patch!

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16045 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-19 22:06:19 +00:00
Gabriel Hurley 6f84e520e5 Fixed #15843 -- removed an extraneous quotation mark in the template tag docs. Thanks to Titan, Jer-ming Lin for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16042 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-18 23:15:28 +00:00
Adrian Holovaty d3e5380b41 Fixed #15800 -- Fixed error in class-based-views docs. Thanks, Natim
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16037 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-17 20:55:26 +00:00
Adrian Holovaty 78b2e254ca Fixed #15816 -- Changed docs/ref/utils.txt to refer to django.utils.datastructures instead of just SortedDict. The other stuff is still undocumented, which is probably a good thing
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16036 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-17 20:51:19 +00:00
Adrian Holovaty 5409168ba2 Fixed #15821 -- Removed incorrect link from docs/releases/1.3.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16035 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-17 20:46:48 +00:00
Adrian Holovaty f8495d2371 Fixed #15822 -- Removed references to the v1 postgresql backend (which has been removed). Thanks for the patch, aaugustin
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16034 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-17 20:45:06 +00:00
Jacob Kaplan-Moss d78e08f4a0 Updated the contributing document to accurately reflect our security process.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16032 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-17 14:13:19 +00:00
Luke Plant fda7ac3490 Fixed #15780 - Broken link in old release notes regarding CSRF upgrade
Thanks to Aryeh Leib Taurog for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16023 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-09 18:47:59 +00:00
Luke Plant 8d4b414760 Fixed #15757 - removed remaining instances of get_and_delete_messages
Thanks to void for the report, and julien for the bulk of the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16022 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-07 22:01:23 +00:00
Chris Beaven 91e59aeca0 Fixes #10786 -- Document that NullBooleanField should be used rather than BooleanField with null=True. Thanks sbj3 for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16020 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-06 10:33:32 +00:00
Chris Beaven ab9e596ca6 Fixes #10754 - minor clarification to the post/pre_delete signal documentation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16019 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-06 10:12:21 +00:00
Chris Beaven 4fa9646716 Fixes #11596 -- Make paginator.Page iterable
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16018 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-06 09:40:26 +00:00
Simon Meers e301899392 Fixed #15746. Clarified updated list_filter documentation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16010 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-03 23:08:48 +00:00
Adrian Holovaty 09b4a41aa7 Fixed a comma splice in docs/faq/install.txt from [16004]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 21:49:39 +00:00
Ramiro Morales cca232c234 Updated the Python version requirements FAQ entry in the installation section.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16004 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 19:03:11 +00:00
Russell Keith-Magee 576606a6f2 Advanced deprecations in core.cache.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15977 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:37:15 +00:00
Russell Keith-Magee 5d5149cd18 Advanced deprecation of user-based messages and the LegacyFallbackStorage in contrib.messages.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:36:04 +00:00
Adrian Holovaty 9a279edc1c Fixed some ReST errors from e-mail -> email change in docs, and changed some docs that shouldn't have been changed (because translation strings haven't been converted yet)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15968 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-01 16:18:23 +00:00
Adrian Holovaty 94af19c43f Changed e-mail to email throughout documentation and codebase. The one exception is translation strings, which I didn't want to disrupt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-01 16:10:22 +00:00
Luke Plant 16f6acdb89 Deprecated csrf_response_exempt and csrf_view_exempt decorators
With the removal of CsrfResponseMiddleware, csrf_response_exempt serves no
purposes, and csrf_exempt and csrf_view_exempt perform the same function.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15956 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-30 17:35:41 +00:00
Luke Plant 1f5d684f14 Added release notes about the removal of Django 1.2 compatibility fallbacks for signed data
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15955 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-30 17:35:32 +00:00
Luke Plant 8823021625 Removed deprecated CsrfResponseMiddleware, and corresponding tests and docs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15949 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-30 17:34:26 +00:00
Luke Plant 4550f95f29 Added stub release notes for 1.4
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15947 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-30 17:34:01 +00:00
Jannis Leidel 37ed6f2681 Re-added a few compatibility modules that were removed in r15927 to lower the impact on 3rd party apps.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15944 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-30 08:34:05 +00:00
Timo Graham 99b2728b74 Fixed #15710 - removed "that that" typos.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15942 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-29 10:24:42 +00:00
Timo Graham d665c0b3b9 Fixed #15664 - Removed extra parens in commit_on_success example.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15923 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-27 23:00:36 +00:00
Adrian Holovaty 5d854608fe Fixed #15687 -- Fixed small typo in multidb docs. Thanks, jonash
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15919 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-26 03:54:53 +00:00
Jannis Leidel 6a5548cf83 Corrected another part of the staticfiles docs which was missed in r15913. Refs #15681.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15914 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-24 17:58:13 +00:00
Jannis Leidel 8ddf5ba66f Fixed #15681 -- Fixed a documentation error regarding the default value of the STATIC_URL setting. Thanks, Chris Drackett.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15913 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-24 17:52:32 +00:00
Simon Meers f3f1983f30 Moved versionadded below heading for "Localized names of languages".
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15910 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-24 10:02:58 +00:00
Simon Meers 1339ef4af8 Bumped django_next_version so that "New in Django 1.3" links appear correctly.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15909 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-24 09:40:50 +00:00
Simon Meers e7d678237f Fixed a few typos in the 1.3 release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15907 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-23 08:48:18 +00:00
James Bennett 7c08f4c635 Bump everything for 1.3.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15902 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-23 05:06:31 +00:00
James Bennett 1743db94f5 One final final tweak to 1.3 release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15901 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-23 05:04:19 +00:00
James Bennett 5c00199581 Finalize 1.3 release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15900 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-23 05:03:22 +00:00
Russell Keith-Magee 2f3bf2830d Made the English in r15897 much betterer.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15898 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-22 23:20:52 +00:00
Russell Keith-Magee 62865b4cde Fixed #15527 -- Added a explanatory note about the SQL debug log. Thanks to boxm for the report, and jpaulett for the draft patch
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-22 23:18:09 +00:00
Simon Meers 8e7030d263 Fixed typo in forms API documentation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15896 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-22 23:16:22 +00:00
Gabriel Hurley 66594beae7 Fixed #15657 -- added the required `form` parameter to the method signatures of `form_valid` and `form_invalid` in the `FormMixin` docs. Thanks to jnns for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15895 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-22 22:01:27 +00:00
Gabriel Hurley a4ef094b0f Corrected a number of mislinked crossrefs and added a few new crossref targets found in/via the 1.3 release.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-22 20:12:17 +00:00
Russell Keith-Magee 16f4a2bec2 Minor markup and organization fixes to docs to correct Sphinx errors.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15893 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-22 14:35:14 +00:00
James Bennett a5d373a463 Update release notes and other docs for impending 1.3.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15892 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-22 06:57:12 +00:00
Idan Gazit 6d8853b7c8 Added Idan to committers.txt. Wahoo!
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15890 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-22 01:16:28 +00:00
Ramiro Morales a2c19f7984 Tweaked title level in custom file storage systems documentation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15888 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-21 15:39:26 +00:00
Ramiro Morales 413ceb57b2 Changed 'raise' statements to new style syntax in documentation. Thanks DaNmarner. Refs #15635.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15874 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 20:49:31 +00:00
Justin Bronn c70bdad8b4 Fixed #14133 -- Updated Windows installation instructions for GeoDjango, now recommend the OSGeo4W installer for spatial libraries.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15872 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 20:06:19 +00:00
Russell Keith-Magee 1af33427cb Fixed #15623 -- Corrected province codes for Canadian localflavor. Thanks to shelldweller for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15864 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 00:59:30 +00:00
Justin Bronn 127331041e Use Sphinx `:download:` directives for spatial database template creation scripts instead of linking to geodjango.org.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 16:21:16 +00:00
Adrian Holovaty 304a50d8ca Fixed #15603 -- Changed the traceback error e-mails not to use HTML by default. It's now configurable with an 'include_html' parameter to AdminEmailHandler. Thanks, kmtracey
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 04:13:57 +00:00
Adrian Holovaty 2ee7cfcf1c Corrected email --> e-mail in topics/logging.txt. Refs #15603
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15849 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 04:02:40 +00:00
Adrian Holovaty ccc972e750 Fixed #15618 -- CookieStorage storage in messages framework now honors SESSION_COOKIE_DOMAIN. Thanks for the report and patch, lamby
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15848 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 03:50:51 +00:00
Jannis Leidel ad4118be44 Fixed #15598 -- Updated static URL helper to be no-op on non-local prefixes. Thanks, traff.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15839 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:13:21 +00:00
Adrian Holovaty b1f67e7317 Fixed #15614 -- Fixed potentially confusing URLconf examples in docs/ref/generic-views.txt by adding explicit import statement and using function passing instead of strings in the URLpattern
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15822 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 17:07:16 +00:00
Russell Keith-Magee 23288d1955 Fixed #15594 -- Corrected typo in the docs on HTTPOnly cookies. Thanks to philwills for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 08:19:57 +00:00
Russell Keith-Magee 6d991d10d6 Minor grammar fix to release notes added in r15765.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15816 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 08:19:17 +00:00
Carl Meyer f43b3f58fb Added backwards-incompatibility note for r15805.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 22:49:14 +00:00
Jacob Kaplan-Moss fd2f18008c Fixed #14733: no longer "validate" .raw() queries.
Turns out that a lot more than just SELECT can return data, and this list is
very hard to define up front in a cross-database manner. So let's just assume
that anyone using raw() is at least halfway competant and can deal with
the error messages if they don't use a data-returning query.

Thanks to Christophe Pettus for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15803 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 19:49:53 +00:00
Ramiro Morales 12b5152233 Tweaked a bit the release notes document.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 13:53:45 +00:00
Adrian Holovaty 12a2a23100 Reworded part of 'Running only some of the tests' in docs/internals/contributing.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15799 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 05:34:28 +00:00
Gabriel Hurley 3349b95db6 Fixed #15592 -- corrected an missing backtick in the syndication docs. Thanks to bradley.ayers for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15793 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-10 17:21:16 +00:00
Gabriel Hurley 409435440a Fixed #15558 -- Improved QuerySet reference docs and cleaned up numerous reST/sphinx problems.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15776 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-08 19:51:19 +00:00
Russell Keith-Magee c260c533e1 Fixed #15570 -- Corrected a flaw in the design of the silent flag on {% cycle %}. Thanks to Brian Neal for the report, and to Andrew and Jannis for the design consult.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-08 13:43:53 +00:00
Chris Beaven 32adde7fc9 Fix the documentation of BoundField.value() to reference the correct method name
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15772 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-07 22:55:16 +00:00
Carl Meyer 4c41159494 Tweaked r15769 to remove reference to "project."
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15770 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-07 17:00:57 +00:00
Carl Meyer 0d88312855 Clearer mile-high description of migrating to staticfiles in 1.3 release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-07 16:38:04 +00:00
Russell Keith-Magee 75cd087c79 Fixed #14965 -- Added release notes about changes to builtin template tags
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15765 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-06 07:14:32 +00:00
Gabriel Hurley 8940969a7a Fixed #11864 -- Improved the "see also" section of the many-to-one model topic guide to more clearly connect people to the backwards-related objects docs and to the correct point in the model tests for sample code (since the doctests went away). Thanks to dwillis for the work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15758 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-04 22:29:16 +00:00
Gabriel Hurley 32255c20a5 Fixed #15557 -- removed an extra backtick from the `topics/http/shortcuts`. Thanks to johnthedebs for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15757 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-04 21:13:42 +00:00
Gabriel Hurley 4e76f0f793 Fixed #15504 -- Cleaned up contrib.syndication and contrib.utils.feedgenerator docs. Corrected numerous reST problems, removed duplicate method declarations, corrected method signatures, etc. Thanks to slinkp for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15739 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 22:20:54 +00:00
Adrian Holovaty 136930085b Made small improvement to docs/topics/db/queries.txt -- added import statement to 'Complex lookups with Q objects' for easier scanning
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15737 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 21:04:32 +00:00
Gabriel Hurley 9428c23869 Fixed #15528 -- Added versionchanged directive to load template tag docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 19:35:27 +00:00
Gabriel Hurley 20b940614e Added crossref targets for a couple of Django exceptions and cleaned up related reST markup.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15733 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 19:31:10 +00:00
Gabriel Hurley e8fa1abd78 Fixed #15541 -- Updated FAQ to point at djangosites.org instead of defunct wiki page. Thanks to aaugustin for the report and draft patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15729 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 18:26:15 +00:00
Russell Keith-Magee afd040d4d3 Updated test assertions that have been deprecated by the move to unittest2. In summary, this means:
assert_ -> assertTrue
 assertEquals -> assertEqual
 failUnless -> assertTrue

For full details, see http://www.voidspace.org.uk/python/articles/unittest2.shtml#deprecations

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 15:04:39 +00:00
Russell Keith-Magee d1290b5b43 Fixed #3094 -- Accelerated deprecation of XMLField, since it hasn't served any useful purpose since oldforms. Thanks to PaulM for driving the issue and providing the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15723 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 13:28:20 +00:00
Russell Keith-Magee 03717325dd Corrected some typos from r14673.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15712 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 00:24:41 +00:00