271 Commits

Author SHA1 Message Date
Russell Keith-Magee
d034374ea8 [1.1.X] Fixed #8357 -- Clarified what constitutes activity when calculating session expiry. Thanks to timo for the patch.
Backport of r13113 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13114 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-06 01:36:42 +00:00
Russell Keith-Magee
1d7c4a96ab [1.1.X] Fixed #13420 -- Clarified grammar in the email docs. Thanks to Dominic Rodger for the report.
Backport of r13104 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13111 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-06 01:26:13 +00:00
Karen Tracey
820bcd0aa3 [1.1.X] Fixed #12688 -- Removed typo in manager docs. Thanks, orokusaki for the report and timo for the patch.
r12485 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13079 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-03 17:14:57 +00:00
Luke Plant
c65dd48903 [1.1.X] Fixed #13035 - Incorrect documentation regarding admin and default managers
Thanks to rasca for report and gabrielhurley for patch.

Backport of r12930 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-06 11:59:37 +00:00
Luke Plant
c3bc6481af [1.1.X] Fixed #13268 - 'ForeignKeyField' in topics/db/queries.txt
Thanks piquadrat for report and patch.

Backport of r12928 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12929 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-06 11:05:18 +00:00
Justin Bronn
cd3370c3a7 [1.1.X] Fixed #13263 -- Corrected field name typo in queries documentation examples. Thanks, RicherPots for bug report and gabrielhurley for the patch.
Backport of r12926 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 16:00:31 +00:00
Justin Bronn
b2627529e9 [1.1.X] Fixed #13271 -- Corrected a typo in the signals documentation. Thanks, chtito.
Backport of r12924 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12925 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 15:47:05 +00:00
Gary Wilson Jr
5fab617f50 [1.1.X] Fixed #13189 -- Fixed typo in code example, thanks to gabrielhurley for patch.
Backport of r12862 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12863 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-27 00:14:44 +00:00
James Bennett
8a8366d2fa [1.1.X] Fixed #13048: Corrected typo in email documentation. Backport of [12694] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12695 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-07 00:52:11 +00:00
Jacob Kaplan-Moss
34a3b7b6fd [1.1.X] Fixed #5605: only lowercase the domain portion of an email address in UserManager.create_user.
Thanks, Leo.

Backport of [12641] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12642 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 20:32:55 +00:00
Russell Keith-Magee
c1edfcd9ae [1.1.X] Fixed #11933 -- Added versionchanged marker for the cache_db session backend. Thanks to gabrielhurley for the report and patch.
Backport of r12569 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 14:52:21 +00:00
Russell Keith-Magee
fbe455e1ac [1.1.X] Fixed #11782 -- Added some Sphinx metadata to the file uploads documentation. Thanks to timo for the patch.
Backport of r12562 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12566 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 14:07:25 +00:00
Russell Keith-Magee
d33fd127f8 [1.1.X] Fixed #12880 -- Added some missing sphinx directives for module references. Thanks to psagers for the report, and timo for the patch.
Backport of r12559 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12564 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 14:05:58 +00:00
Russell Keith-Magee
cda48e9f0b [1.1.X] Fixed #12799 -- Added an extra newline to help with PDF generation of documentation. Thanks to Ivan Savov for the report.
Backport of r12518 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12522 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 13:30:49 +00:00
Russell Keith-Magee
7c1671b480 [1.1.X] Fixed #12859 -- Clarified the documentation on using multiple tables with .update() calls. Thanks to dwillis for the report.
Backport of r12515 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12520 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 13:29:52 +00:00
Jannis Leidel
9ee2d5c646 [1.1.X] Fixed #11714 - Document a few of the i18n function that can be used outside views and templates. Thanks, Jarek Zgoda and Ramiro Morales.
Backport or r12473.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12483 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 00:44:27 +00:00
Jannis Leidel
49c116f14c [1.1.X] Fixed #12895 - Fixed typo in auth docs. Thanks Timo.
Backported from r12457.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 00:42:33 +00:00
Jannis Leidel
a23edb643b [1.1.X] Fixed #10260 - Refactored internationalization documentation. Thanks, Ramiro Morales.
Partial backport of r12440.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12449 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:50:47 +00:00
Jannis Leidel
d060d84bbc [1.1.X] Fixed #11794 - Typo in model manager documentation. Thanks, timo.
Conflicts:

	docs/topics/db/managers.txt

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:12:02 +00:00
Luke Plant
ad6368809c [1.1.X] Created a 'DB optimization' topic, with cross-refs to relevant sections.
Also fixed #10291, which was related, and cleaned up some inconsistent doc labels.

Backport of r12229 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12230 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-16 03:26:02 +00:00
Russell Keith-Magee
4bbbf6cc12 [1.1.X] Updated the docs to suggest using `*args, **kwargs` when implementing model save methods. Thanks to Jeff Croft for the report.
Partial backport of r12118 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12119 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-08 00:21:45 +00:00
Luke Plant
d4f9bff7ef [1.1.X] Fixed #12503 - form examples don't validate according to w3c
Thanks to skyl for the report.

Backport of r12086 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12087 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-04 22:22:16 +00:00
Jannis Leidel
1a3fd10a34 [1.1.X] Fixed #12383 - Typo fix for authentication documentation.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12061 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-01 21:44:30 +00:00
Gary Wilson Jr
3201e7b0b1 [1.1.X] i18n documentation fixes:
* Fixed typo (fixes #12449, thanks googol).
 * Wrapped long lines.
 * Removed unused link target directive.

Backport of r12001 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12002 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-26 18:03:02 +00:00
Gary Wilson Jr
d8ea6831f9 [1.1.X] Fixed several broken and redirecting URLs in the documentation (fixes #12219, refs #12427).
Backport of r11994 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11995 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-26 06:44:02 +00:00
Jannis Leidel
cf49f62be3 [1.1.X] Fixed #8145 - Documented the codenames of the default auth permissions
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11948 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 14:37:24 +00:00
Russell Keith-Magee
55b6f3cf21 Corrected an inconsistency in the documentation regarding the way to specify the locmem and dummy cache backend. Thanks to Jens Diemer for the report.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-19 11:20:06 +00:00
Brian Rosner
4cba436269 [1.1.X] Fixed #5034 -- honor request.urlconf in reverse and resolve.
This enables {% url %} to honor request.urlconf set from process_request
middleware methods.

Thanks SmileyChris for the initial patch work.

Backport of [11740] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11741 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-16 01:59:54 +00:00
Russell Keith-Magee
7f2f6bc863 [1.1.X] Fixed #12204 -- Corrected the use of :djadmin: links in the testing docs, plus updated a lot of old-style markup in the django-admin docs. Thanks to Art_S for the report.
Backport of r11734 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-12 13:59:35 +00:00
Karen Tracey
d2b6f6c948 [1.1.X] Fixed #11961: Corrected a few typos in docs/testing.txt. Thanks to timo for the patch.
Merge of r11599 from trunk.
Also updated svnmerge-integrated to reflect other changesets already backported,
and added a couple more that should not be merged to svnmerge-blocked.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-26 15:31:47 +00:00
James Bennett
f8c97127bb [1.1.X] Fixed #11931: Removed mention of nonexistent get_sql() method for arguments to limit_choices_to. Since the correct reference involves undocumented ORM internals, this simply removes the reference entirely in favor of publicly-documented use of Q objects. Backport of [11591] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-23 23:41:35 +00:00
Russell Keith-Magee
d30dd3e9c9 [1.1.X] Fixed #11755 -- Added documentation for an edge case of FormSet usage. Thanks to ffualo for the suggestion.
Merge of r11549 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:33:35 +00:00
Russell Keith-Magee
2075da3525 [1.1.X] Fixed #11740 -- Added extra detail on the behavior of ModelForms. Thanks to severian for the suggestion.
Merge of r11548 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11570 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:33:18 +00:00
Russell Keith-Magee
05c087300c [1.1.X] Fixed #9414 -- Clarified the documentation on the permission decorators. Thanks to timo for the patch.
Merge of r11547 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11569 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:33:09 +00:00
Russell Keith-Magee
ceee67fba8 [1.1.X] Fixed #11873 -- Corrected typo in generic views docs. Thanks to Brett Cannon for the report.
Merge of r11546 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11568 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:33:02 +00:00
Russell Keith-Magee
e9d1a7e98a [1.1.X] Fixed #11073 -- Added documentation for SESSION_COOKIE_PATH. Thanks to liling for the report, and gsong for the patch.
Merge of r11545 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11567 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:32:53 +00:00
Russell Keith-Magee
b5ee4ad4ba [1.1.X] Fixed #10864 -- Clarified the role played by redirect_to_field in the login_required auth decorator. Thanks to trigeek38 for the suggestion, and SmileyChris for the draft.
Merge of r11544 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11566 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:32:42 +00:00
Russell Keith-Magee
10e3c9f1e0 [1.1.X] Fixed #11589 -- Corrected an argument in the shortcuts documentation. Thanks to tsaylor for the report.
Merge of r11531 and r11532 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11553 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 04:54:48 +00:00
Luke Plant
8da58e51ff Fixed #11554: Several errors in Generic Views Documentation.
Thanks Ramiro. 
Refs #11477 - that ticket should have been marked a duplicate of #11554



git-svn-id: http://code.djangoproject.com/svn/django/trunk@11499 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-11 13:46:56 +00:00
Luke Plant
404a82e156 Fixed #7376: auth docs don't say they depend on contenttypes.
Thanks arien


git-svn-id: http://code.djangoproject.com/svn/django/trunk@11487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-10 15:41:00 +00:00
Luke Plant
de5e768557 Fixed #11477: Generic views docs point out bug with wrong queryset
Thanks SmileyChris



git-svn-id: http://code.djangoproject.com/svn/django/trunk@11484 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-10 15:21:16 +00:00
Russell Keith-Magee
42ff5b3c12 Cleanup of some minor markup problems in URL documentation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11275 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-21 01:48:59 +00:00
Russell Keith-Magee
0c9d0bf7d6 Fixed #11492 -- Corrected some typos, and added some extra markup for the URLs documentation. Thanks to Ramiro Morales for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11258 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-17 00:55:21 +00:00
Russell Keith-Magee
3469f4b819 Fixed #11491 -- Corrected minor typo in new namespace URL docs. Thanks to Carl Meyer for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11253 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-16 23:45:36 +00:00
Russell Keith-Magee
8d48eaa064 Fixed #10061 -- Added namespacing for named URLs - most importantly, for the admin site, where the absence of this facility was causing problems. Thanks to the many people who contributed to and helped review this patch.
This change is backwards incompatible for anyone that is using the named URLs
introduced in [9739]. Any usage of the old admin_XXX names need to be modified
to use the new namespaced format; in many cases this will be as simple as a
search & replace for "admin_" -> "admin:". See the docs for more details on
the new URL names, and the namespace resolution strategy.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11250 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-16 16:16:13 +00:00
Russell Keith-Magee
49f0a4bb5b Fixed #10908 -- Clarified the procedure for creating test users in the testing docs. Thanks to gruszczy and timo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11248 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-16 16:06:53 +00:00
Russell Keith-Magee
3c6036a5b4 Fixed #11364 -- Modified the jsi18n example to use the {% url %} tag rather than a placeholder. Thanks to jcassee for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-15 13:54:45 +00:00
Russell Keith-Magee
b1e645b6cd Fixed #10287 -- Added better examples in the docs of formset validation. Thanks to Andrew Badr for the text.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11234 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-15 13:52:39 +00:00
Russell Keith-Magee
ebce1b9a2b Fixed #11439 -- Added docs on including URL patterns as an iterable. Thanks to Ramiro Morales for the draft text.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11221 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-11 15:38:47 +00:00
Russell Keith-Magee
87285078f0 Fixed #9607 -- Added documentation for the `extra` argument in test client methods. Thanks to jroes for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11173 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-03 07:40:45 +00:00