git-svn-id: http://code.djangoproject.com/svn/django/trunk@14165 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14164 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Migrated m2o_recursive and m2o_recursive2 tests, merging them into a single package. Thanks to George Sakkis for the patches.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14163 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14162 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14161 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14160 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #13494 -- Correctly concat an email subject prefix with a translation string. Thanks, hcarvalhoalves and Andi Albrecht.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14157 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #14227 -- Added information about the "easy-pickings" keyword to the contributing docs. Thanks to Russ for the report and cmheisel for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14154 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #14444 -- Convert the pagination doctests to unittests.  We have always been at war with doctests.  Thanks to Gabriel Hurley for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14152 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed the same set of typos as were corrected in [14149], this time in the release notes. Thanks to Paul McMillan for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14151 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14150 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14149 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14147 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Converted save_delete_hooks tests from doctests to unittests.  We have always been at war with doctests.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14145 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Thanks to Rob Hudson for the patch and also to andialbrecht who filed a
similar patch that I didn't use.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14143 bcc190cf-cafb-0310-a4f2-bffc1f526a37

This patch also addresses sitemap code found in contrib/gis, which [13980]
did not.

Thanks to gabrielhurley for the initial patch.

Refs #10235, #14386

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14141 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14140 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #12991 -- Added unittest2 support. Thanks to PaulM for the draft patch, and to Luke, Karen, Justin, Alex, Łukasz Rekucki, and Chuck Harmston for their help testing and reviewing the final patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14139 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #14436 -- Escalated 1.2 PendingDeprecationWarnings to DeprecationWarnings, and removed 1.1 deprecated code.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14138 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #14279 -- Corrected a typo in the sitemaps tests (didn't affect the passage of the test).  Thanks to jamesodo for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14136 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #14392 -- Changed ModelForm.fields and ModelForm.exclude examples to use tuples instead of lists since they were used inconsistently throughout the page (it wasn't hurting anything, but consistency is nice). Thanks to lspcity for the report and gruszczy for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14134 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14133 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14131 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14129 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14128 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14127 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14125 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #14193: prepopulated_fields javascript now concatenates in correct order. Thanks to bmihelac for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14122 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #14391 - Updated django-admin.1 man page to include newer commands. Thanks to laurentluce for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14120 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14118 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Refs #11256 -- Extended the annotation field name conflict check to cover m2ms and reverse related descriptors as well. This is needed to actually cover the case raised by #14373.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14116 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #14058 -- Clarified information on OPTIONS setting (for adding additional parameters when connecting to a database) and linked to Database Backend docs. Thanks to chris@cwroofs for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14114 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #10027 -- Makes links to form and field validation (and form reference docs in general) more readily available from form topic overview. Thanks to john_fries for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14112 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #14228 -- Added additional information on what the APPEND_SLASH setting does. Thanks to ttencate for the report and draft text.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14110 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #13927 -- Advises that the Ubuntu package manager drops the .py extension from django-admin.py. Thanks to islands for the report and d0ugal for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14108 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14107 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Fixed #12226 -- Deprecated test client Response.template attribute in favor of templates attribute, which is always a list. Thanks Russell for patch review.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14106 bcc190cf-cafb-0310-a4f2-bffc1f526a37

the i18n context processor is active. Thanks to Rob Hudson for the report and
fix suggestion.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14104 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14101 bcc190cf-cafb-0310-a4f2-bffc1f526a37

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14100 bcc190cf-cafb-0310-a4f2-bffc1f526a37