Commit Graph

2931 Commits

Author SHA1 Message Date
James Bennett 4960095e0c Fixed #13036: Corrected a typo in the documentation for the TEMPLATE_LOADERS setting.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12684 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-06 11:10:25 +00:00
James Bennett 4e65d73e9e Fixed #12969: Use versionadded directive for the new --symlinks option to the makemessages command.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12675 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-03 09:07:36 +00:00
James Bennett 926bf195e0 Fixed #12601: Documented the slug field in the forms module.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12673 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-03 09:01:13 +00:00
James Bennett 795e3235ff Fixed #12217: Documented the fact that serving flatpages from the flatpage middleware does not apply view middleware methods.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-03 08:51:46 +00:00
James Bennett cdd95077a6 Fixed #11889: Documented the fact that context processors will overwrite pre-existing context variables of the same names.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12669 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-03 08:43:05 +00:00
James Bennett 1f56ed7319 Fixed #11883: Documented how to set a custom template name on a flatpage.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12667 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-03 08:34:31 +00:00
Karen Tracey ecb56cecbd Fixed #12946: Removed an invalid example of url tag usage from the docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12652 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-02 04:04:23 +00:00
Jacob Kaplan-Moss 973bf6f485 Fixed #5605: only lowercase the domain portion of an email address in `UserManager.create_user`.
Thanks, Leo.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12641 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 20:30:44 +00:00
Jacob Kaplan-Moss c8015052d9 Fixed #5786: relaxed the validation for usernames to allow more common characters '@', etc.
This is really just a stop-gap until we come up with a improved way of handling
disparate auth data, but it should help us stretch a bit more milage out of the
current system.

Thanks to alextreme, lbruno, and clayg.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12634 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 19:49:05 +00:00
Jannis Leidel c6b737c243 Fixed #12987 - Added a few versionadded directives to the admin docs. Thanks, Ramiro Morales.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12630 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 14:43:26 +00:00
Jannis Leidel 284e7e3cbd Refined changes made in r12546 to also respect the request.LANGUAGE_CODE in case the LocaleMiddleware is used to discover the language preference.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12624 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 10:19:01 +00:00
Luke Plant 9f592ecced Fixed #12964 - wrong path for CSRF decorators in upgrading notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12618 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-27 21:00:38 +00:00
Jannis Leidel c9151bcba1 Fixed #12968 - Added missing versionadded/-changed doc markers for r12466. Thanks, Karen and Ramiro.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12612 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 17:06:09 +00:00
Jannis Leidel 5787925cdb Fixed #12967 - Added missing versionadded/-changed doc markers for r11964. Thanks, Karen and Ramiro.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12611 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 17:05:52 +00:00
Russell Keith-Magee 46cc7021a8 Fixed #1480 -- Added the ability to use the system timezone. Thanks to Ramiro Morales for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12602 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 15:33:27 +00:00
Justin Bronn c736cbe816 Fixed #12958 -- Fixed typo I introduced in r12527. Thanks, mitchf.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12588 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 22:11:49 +00:00
Joseph Kocherhans 16fe73d918 Fixed #7190. Boolean fields now return bool values instead of 1 or 0. Thanks, Alex Gaynor.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12578 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 17:36:18 +00:00
Russell Keith-Magee d76fc2c2a0 Fixed #12102 -- Corrected an example in the docs that suggested that you use a relative path in your PYTHONPATH. Thanks to alexkon for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12570 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 14:50:37 +00:00
Russell Keith-Magee 6237768b51 Fixed #11933 -- Added versionchanged marker for the cache_db session backend. Thanks to gabrielhurley for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12569 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 14:49:38 +00:00
Russell Keith-Magee de1ff3e51d Fixed #11782 -- Added some Sphinx metadata to the file uploads documentation. Thanks to timo for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12562 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 13:57:46 +00:00
Russell Keith-Magee 6f9ba54bf5 Fixed #12519 -- Corrected documentation on .raw() queries. Thanks to boralyl for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12561 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 13:57:02 +00:00
Russell Keith-Magee d792737770 Fixed #12538 -- Added a note that pickles aren't stable during version updates. Thanks to snow0x2d0 for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12560 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 13:56:19 +00:00
Russell Keith-Magee 841210b308 Fixed #12880 -- Added some missing sphinx directives for module references. Thanks to psagers for the report, and timo for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12559 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 13:55:37 +00:00
Jacob Kaplan-Moss 5366aa96fe Fixed #10258: handle duplicate file names better.
Instead of just continually appending "_" to duplicate file names, Django's
default storage now appends `_1`, `_2`, `_3`, etc.

Thanks to ianschenck and Thilo.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12552 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 22:39:22 +00:00
Jannis Leidel c8fa110093 Fixed #6298 - Added sample settings file to run the Django test suite (SQLite). Thanks, Eric Holscher.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12547 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 20:45:50 +00:00
Jannis Leidel 2164e138e3 Fixed #5691 - Adds the active language to the cache key. Thanks, Antoni Aloy, Ramiro Morales and Yann Malet.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12546 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 20:45:28 +00:00
Justin Bronn 06a880f730 Fixed #12802 -- Specify the correct factory in the `InlineModelAdmin` docs. Thanks, rctay and unbracketed.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12528 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 15:09:52 +00:00
Justin Bronn bca753e283 Fixed #12485 -- Added links to polls templates in tutorial. Thanks, gungadin for ticket and Derek Willis for patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12527 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 15:00:33 +00:00
Russell Keith-Magee f9c8615e1f Fixed #12799 -- Added an extra newline to help with PDF generation of documentation. Thanks to Ivan Savov for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12518 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 13:22:52 +00:00
Russell Keith-Magee 5825fb63b4 Fixed #12800 -- Clarified the text describing the palettes available to django-admin.py, and when they will be used. Thanks to rasmus and Karen Tracey for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12517 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 13:22:05 +00:00
Russell Keith-Magee a555df4c06 Fixed #12837 -- Clarified the naming strategy for m2m intermediate tables. Thanks to Ramiro Morales for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12516 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 13:21:07 +00:00
Russell Keith-Magee c306b78150 Fixed #12859 -- Clarified the documentation on using multiple tables with .update() calls. Thanks to dwillis for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12515 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 13:20:27 +00:00
Russell Keith-Magee 745b89f6e1 Fixed #12916 -- Added a missing versionadded marker for the m2m_changed signal. Thanks to timo for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12514 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 13:19:49 +00:00
Russell Keith-Magee df5e1f7860 Fixed #12925 -- Corrected typo in v1.1 release notes. Thanks to aruseni for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12513 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 13:19:24 +00:00
Russell Keith-Magee 156cdcf92d Fixed #12912 -- Placed the psycopg1-backed ``postgresql`` database backend on the deprecation path.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12510 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 12:24:41 +00:00
Justin Bronn 7ca3e8fecf Updated patch applied in r12504. Refs #12806.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12508 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 06:04:06 +00:00
Justin Bronn c4699b0b8a Fixed #12806 -- Added an implementation of `RawQuerySet.__getitem__`. Thanks, Bruno Renié.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12504 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 05:22:12 +00:00
Jacob Kaplan-Moss 49d6a82261 Fixed #11687: the `add` filter is now less failsome when faced with things that can't be coerced to integers.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12497 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 23:34:33 +00:00
Russell Keith-Magee 2fc19d8d6f Fixed #12932 -- Added an extra argument to suite_result() in the test runner, and added **kwargs as protection against future changes. Thanks to Eric Holscher for the report and patch.
This is BACKWARDS INCOMPATIBLE for anyone that has written a custom DjangoTestRunner class since it was introduced in r12255.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 12:34:52 +00:00
Justin Bronn a9b2ac25d1 Fixed #9147 -- Added `FormPreview.process_preview` customization hook. Thanks, bthomas and thalin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12486 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 05:00:36 +00:00
Justin Bronn 9810178706 Fixed #12688 -- Removed typo in manager docs. Thanks, orokusaki for the report and timo for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12485 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 02:35:47 +00:00
Justin Bronn 84cffa2ece Fixed #12585 -- Corrected typo in tutorial03. Thanks, fcsmith.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12484 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 02:29:39 +00:00
Jannis Leidel 8e1a4bd677 Fixed #12910 - Only test extracting translation strings if xgettext can be found on PATH.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12475 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21 23:45:04 +00:00
Jannis Leidel 7f5d9ad661 Fixed #9764 - Updated EmailField and URLField to support IDN (Internationalized Domain Names). Thanks, UloPe.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12474 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21 23:44:35 +00:00
Jannis Leidel 0d4726f518 Fixed #11714 - Document a few of the i18n function that can be used outside views and templates. Thanks, Jarek Zgoda and Ramiro Morales.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12473 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21 23:44:05 +00:00
Jannis Leidel 8d8237fa41 Fixed #12275 - Small fix in Sphinx templates.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12467 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21 23:41:05 +00:00
Jannis Leidel 67d4289c2e Fixed #12066 - Moved auth context processor from core to the auth app. Thanks, Rob Hudson.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12466 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21 23:40:47 +00:00
Jannis Leidel 1559f64549 Fixed #12795 - Updated the middleware docs to include the messages app middleware. Thanks, Timo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12465 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21 23:40:03 +00:00
Jannis Leidel 579e8573c8 Fixed #12620 - Refer to better fieldname in defer docs. Thanks, dwillis.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21 23:39:08 +00:00
Jannis Leidel ca9f0879fe Fixed #12604 - Typo in 1.1 release docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12461 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21 23:38:50 +00:00
Jannis Leidel 373be1ec1f Fixed #12877 - Typo in settings docs. Thanks Timo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12459 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21 23:38:11 +00:00
Jannis Leidel 421f0195c1 Fixed #12887 - Fixed typo in release docs. Thanks blueyed.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12458 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21 23:37:54 +00:00
Jannis Leidel b2c43df84f Fixed #12895 - Fixed typo in auth docs. Thanks Timo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12457 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21 23:37:35 +00:00
Jannis Leidel 0d37cfdc05 Fixed #12897 - Typo in multi-db docs. Thanks fgutierrez.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12456 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21 23:37:19 +00:00
Jannis Leidel eb26c9686b Fixed #7050 - Allow the makemessages command to optionally ignore paths when examining source code and templates for translation strings.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12444 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:15:04 +00:00
Jannis Leidel fef575a7f9 Fixed #6380 - Follow symlinks when examining source code and templates for translation strings.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12443 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:14:27 +00:00
Jannis Leidel f93f056c32 Fixed #10260 - Refactored internationalization documentation. Thanks, Ramiro Morales.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12440 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:12:53 +00:00
Jacob Kaplan-Moss db0209e2b2 Fixed #12798: fixed a typo in the 1.2 release notes. Thanks, Andrew Badr.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12433 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-14 18:43:47 +00:00
Jacob Kaplan-Moss 3d84904794 Fixed #12840: mark natural key serialization in the docs as new in 1.2. Thanks, ramiro.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12432 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-14 18:39:42 +00:00
Luke Plant be57541af1 Fixed #12839 - noted change of import path for csrf_exempt decorator
Thanks rubic for the report.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12407 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-10 23:51:09 +00:00
Luke Plant 4682d693c4 Fixed #12829 - typos introduced in [12400]
Thanks Alex.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12401 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-09 20:05:52 +00:00
Luke Plant eaee55e547 Removed docs that assume developer might be using Python < 2.4
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12400 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-09 19:37:08 +00:00
Luke Plant 4bff194633 Fixed #12804 - regression with decorating admin views.
This is a BACKWARDS INCOMPATIBLE change, because it removes the flawed
'auto_adapt_to_methods' decorator, and replaces it with 'method_decorator'
which must be applied manually when necessary, as described in the 1.2
release notes.

For users of 1.1 and 1.0, this affects the decorators:

 * login_required
 * permission_required
 * user_passes_test

For those following trunk, this also affects:

 * csrf_protect
 * anything created with decorator_from_middleware 

If a decorator does not depend on the signature of the function it is
supposed to decorate (for example if it only does post-processing of the
result), it will not be affected.
 



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-09 15:02:39 +00:00
James Bennett d334713ea2 Clarify number of deprecations in the beta release.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12395 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-06 20:48:55 +00:00
James Bennett 8c43d2e32a Couple final tweaks to the release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12393 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-06 05:48:03 +00:00
James Bennett 8c50f9de6a Fix reST error in release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12392 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-06 05:32:46 +00:00
James Bennett d4c034d0e1 Add 1.2 beta release notes to release notes index.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12391 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-06 05:25:50 +00:00
James Bennett f30f1514f3 Reorganize the beta release notes a bit and trim down the section on feeds.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12390 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-06 05:19:15 +00:00
James Bennett 2638c90ce2 Clarify object-level permissions.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12389 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-06 03:57:02 +00:00
James Bennett 7f975df129 Initial draft of 1.2 beta release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12388 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-06 03:37:50 +00:00
James Bennett 091a631601 Fixed #12797: Corrected typo in the documentation for the changepassword management command.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12387 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-06 03:14:47 +00:00
Jannis Leidel a0bae6ebb8 Updated formset docs to contain the new management form field for max_num values.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12373 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-01 14:19:30 +00:00
Russell Keith-Magee 84599495a0 Fixed #6364 -- Added the ability to run individual doctests.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12364 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-01 13:00:00 +00:00
James Bennett e0dd8a930b Fixed #12745: The maxlength -> max_length change happened in 2007, we can probably stop mentioning it in the tutorial now.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12362 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-01 11:53:14 +00:00
Russell Keith-Magee 47acb1d659 Fixed #6273 -- Added a 'changepassword' management command. Thanks to Ludvig Ericson and Justin Lilly for their work on this patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12351 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-29 08:10:29 +00:00
Ian Kelly 1e64f57683 Fixed #4140: Documented the ORA-06552 error that can occur when a keyword is used as a field name in the Oracle notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12346 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-28 22:12:18 +00:00
Russell Keith-Magee c4c27d8a04 Fixed #6188, #6304, #6618, #6969, #8758, #8989, #10334, #11069, #11973 and #12403 -- Modified the syndication framework to use class-based views. Thanks to Ben Firshman for his work on this patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12338 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-28 13:46:18 +00:00
Russell Keith-Magee 7856a759d0 Fixed #12715 -- Clarified the docs on the usage of database routers, especially regarding the default routing scheme. Thanks to Chris Curvey for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12335 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-28 03:04:24 +00:00
Luke Plant 8daec78cfd Fixed #12557 - AnonymousUser should check auth backends for permissions
Thanks to hvdklauw for the idea and work on the patch.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12316 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-28 01:47:23 +00:00
Luke Plant 3f50119868 Added some release notes for the object permissions foundation (added in r11807)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12315 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-28 01:26:19 +00:00
Russell Keith-Magee 58cd220f51 Fixed #7270 -- Added the ability to follow reverse OneToOneFields in select_related(). Thanks to George Vilches, Ben Davis, and Alex Gaynor for their work on various stages of this patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12307 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-27 13:30:29 +00:00
Russell Keith-Magee 8e8d4b5888 Fixed #12671 -- Added set_many(), get_many(), and clear() methods to the cache backend interface. Thanks to Jeff Balogh for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12306 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-27 08:21:35 +00:00
Russell Keith-Magee c8873bbba7 Made the database master router tolerant of router definitions that omit individual routing methods.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12304 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-27 07:56:53 +00:00
Jannis Leidel c14937cf7a Fixed #12508 - Added ability to dynamically add inlines in the admin app.
Refs #13. Also introduces an ``empty_form`` attribute on formsets to make it easier to implement dynamic forms.

Many thanks to Zain Memon for the initial patch from his Summer of Code 2009 project, Stanislaus Madueke for his django-dynamic-formset app and all the other people helping out.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12297 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-26 15:02:53 +00:00
Jannis Leidel df82175c17 Fixed #12673 - Require a version of GNU gettext of 0.1.5 and above.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12296 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-26 15:01:58 +00:00
Russell Keith-Magee 89f81810ed Removed some stray content from the multi-db docs. Thanks to Yuri Baburov for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12291 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-25 12:29:56 +00:00
Russell Keith-Magee 14116bc53e Fixed #12672 -- Added the ability to configure which applications are available on which database.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-25 12:23:30 +00:00
Russell Keith-Magee 6755a039eb Fixed #12542 -- Added the TEST_MIRROR setting, allowing testing of read slave databases.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12289 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-25 12:05:38 +00:00
Luke Plant 739d5aec0f Synced 1.2 release notes with 1.1.2 release notes w.r.t. cookie encoding, for consistency.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12288 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-24 00:10:30 +00:00
Luke Plant 7f944a2b68 Documented backwards incompatibility in 1.1.X branch introduced in r12283
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12284 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-23 23:38:36 +00:00
Luke Plant 088f717077 Fixed #12470 - django.contrib.messages CookieStorage failing silently in safari when comma is used in message
This issue was fixed by changing the underlying cookie storage mechanism.

This will fix other bugs with cookies for Internet Explorer and Safari, but
could also cause backwards incompatibilities with existing javascript that
may parse cookie values that contain commas or semi-colons, and, very
rarely, with existing cookie values.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12282 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-23 23:13:00 +00:00
Russell Keith-Magee e71b10efb7 Added color configuration for HTTP 304, since it doesn't require as much attention as other 3XX codes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12281 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-23 17:26:56 +00:00
Russell Keith-Magee dbad025637 Fixed #12668 -- Corrected some typos in the multi-db docs. Thanks to mattimustang for the eagle eyes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12278 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-23 04:32:34 +00:00
Russell Keith-Magee 7ca9d9306c Fixed #10314 -- Added a message prefix argument to Django's test assertions. Thanks to Wes Winham for the original suggestion, and Chistian Oudard for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12273 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-22 15:02:02 +00:00
Russell Keith-Magee 1b3dc8ad9a Fixed #12540, #12541 -- Added database routers, allowing for configurable database use behavior in a multi-db setup, and improved error checking for cross-database joins.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12272 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-22 14:30:06 +00:00
Russell Keith-Magee e2d094b8fb Fixed #12640 -- Corrected a regression in test suite construction order introduced by #12255. Also updated the docs to reflect what the test code has always done. Thanks to Ramiro Morales for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12261 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-19 01:14:02 +00:00
Russell Keith-Magee 9aba6f807e Fixed #12638 -- Minor documentation cleanups around the new class-based test runners. Thanks to Ramiro Morales for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12260 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-18 23:53:08 +00:00
Russell Keith-Magee be26f1ace4 Updated the docs around test runners to encourage the use of **kwargs in the test runner constructor.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12259 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-18 23:49:20 +00:00
Luke Plant 58440c0b66 Fixed typo in docs - supports_objects_permissions should be supports_object_permissions
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12256 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-18 20:51:29 +00:00
Russell Keith-Magee 53b61d9c02 Fixed #12624 -- Modified test runners to be class based.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12255 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-18 15:11:01 +00:00
Karen Tracey 34e420184c Fixed bad indentation in contenttypes code example so that cut and paste from doc will work.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12253 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-18 13:00:22 +00:00
Jannis Leidel d033dfd894 Added a few more versionadded directives to the documentation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12248 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:29:50 +00:00
Jannis Leidel 2187fa3ea4 Added versionchanged directive to docs introduced in r12139.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12247 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:29:30 +00:00
Luke Plant 2e9518bb39 Created a 'DB optimization' topic, with cross-refs to relevant sections.
Also fixed #10291, which was related, and cleaned up some inconsistent doc labels.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12229 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-16 03:13:16 +00:00
Russell Keith-Magee 0ca28f3926 Fixed #12603 -- Corrected typo in m2m signals docs. Thanks to hvdklauw for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12224 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-13 23:54:07 +00:00
Russell Keith-Magee 6afd505b5b Fixed #5390 -- Added signals for m2m operations. Thanks to the many people (including, most recently, rvdrijst and frans) that have contributed to this patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12223 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-13 11:07:16 +00:00
Jannis Leidel f56f6e9405 Fixed #9326 - Use decorator syntax in get_absolute_url example. Thanks, timo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12222 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-12 23:37:07 +00:00
Jannis Leidel 9614b0190f Fixed #11794 - Typo in model manager documentation. Thanks, timo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12221 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-12 23:36:43 +00:00
Jannis Leidel e752d4984a Fixed #12496 - Added code examples to built-in filter documentation. Thanks, Arthur Koziel.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12220 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-12 23:36:19 +00:00
Jannis Leidel a205691979 Fixed #8933 - Allow more admin templates to be overridden.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12217 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-12 23:34:46 +00:00
Jannis Leidel 31f3a8c1ad Fixed #10640 - Adds a add_form_template option to ModelAdmin. Thanks jcsackett.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12216 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-12 23:34:03 +00:00
Joseph Kocherhans 418bfa2819 Fixed #12516. Added the new location of email_re to the release notes. This regex is undocumented, so we're not putting in an import for backwards compatibility.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12213 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-12 14:58:47 +00:00
Joseph Kocherhans 379ffbc1da Fixed #12525. Added a note to the validators doucmentation that models will not automatically run validators when saved, and a link to the ModelForm docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12212 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-12 14:58:34 +00:00
Joseph Kocherhans c4ad3dede1 Fixed #12586. Corrected a typo in the validation docs. Thanks, phyfus.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12209 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-12 14:04:04 +00:00
Luke Plant d83769f8dc Documented the backwards incompatibility caused by `in` being a new keyword in the `if` template tag.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12208 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-12 13:14:32 +00:00
Luke Plant c56beed240 Fixed #12575 - created a better interface for getting/setting the effective level of contrib.messages
Thanks Chris Beaven.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12207 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-12 02:41:57 +00:00
Joseph Kocherhans 2f9853b2dc Fixed #12512. Changed ModelForm to stop performing model validation on fields that are not part of the form. Thanks, Honza Kral and Ivan Sagalaev.
This reverts some admin and test changes from [12098] and also fixes #12507, #12520, #12552 and #12553.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12206 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-12 02:29:45 +00:00
Adrian Holovaty 8bf71f5c8d Fixed #11222 -- Clarified location of admin templates in tutorial02. Thanks, cantorman
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12202 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 21:56:15 +00:00
Adrian Holovaty dd167aa91e Fixed #11976 -- Ended our campaign to add the word 'valdation' to the English language
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12201 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 21:51:14 +00:00
Adrian Holovaty e1e4050347 Fixed #12297 -- Fixed typo in docs/topics/db/queries.txt. Thanks, bertil and timo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12197 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 21:28:37 +00:00
Karen Tracey b45fd3ffdf Fixed: 3274: Added date_list context variable to the archive_month generic view, consistent with archive_index and archive_year. Thanks Sean Brant.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12195 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 19:52:17 +00:00
Adrian Holovaty 9bb1fa7251 Fixed #9223 -- Added support for declarative widgets to ModelForm. I declare thanks to isagalaev.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12194 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 19:23:42 +00:00
Adrian Holovaty 06645cbda7 Fixed #12113 -- Clarified is_active documentation. Thanks, ejucovy and isagalaev
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12193 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 19:05:39 +00:00
Adrian Holovaty 5bcaa45d33 Fixed #11501 -- Removed 'How meta' from tutorial 2 to appease the grammar nazis
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12191 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 18:55:04 +00:00
Adrian Holovaty 260c5de2f9 Fixed #11693 -- Added escaping for the dot in sitemap.xml in the URLpattern in sitemaps.txt. Thanks, timo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12190 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 18:53:11 +00:00
Adrian Holovaty 34db1d6474 Fixed #11794 -- Removed an unnecessary literary flourish in docs/topics/db/managers.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12189 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 18:51:32 +00:00
Adrian Holovaty 74f88194c3 Fixed #12345 -- Fixed bug in db/models.txt.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12188 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 18:50:28 +00:00
Adrian Holovaty 287de02764 Fixed #11952 -- Documented HttpResponse.status_code attribute. Thanks, timo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12187 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 18:49:04 +00:00
Adrian Holovaty cc25361b17 Fixed #12271 -- Fixed typo in URLField docs. Thanks, adam@andyet.net
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12184 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 18:42:30 +00:00
Adrian Holovaty 7789e9c006 Fixed #12195 -- Clarified cache documentation to rename 'timeout_seconds' to 'timeout'. Thanks, galund and timo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12183 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 18:40:24 +00:00
Adrian Holovaty 5ce16c7e27 Fixed #12161 -- Added escaping of a backslash in two generic-views.txt examples. Thanks, infopams
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12182 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 18:38:00 +00:00
Adrian Holovaty 457df03c99 Fixed #12084 -- Documented the fact that QuerySet.update() returns the number of affected rows. Thanks, timo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12181 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 18:36:45 +00:00
Adrian Holovaty bef891399e Fixed #11904 -- Fixed error in conditional-view-processing.txt. Thanks, bronger and timo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12179 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 18:09:26 +00:00
Adrian Holovaty 26dc654818 Fixed #11884 -- Clarified documentation to explain how to activate the built-in admin reference. Thanks, DmitryRisenberg and timo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12178 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 18:07:46 +00:00
Adrian Holovaty 692f84c4f1 Fixed #11880 -- Changed admin URLconfs in docs to use raw strings, for consistency. Thanks, jb0t
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12176 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 18:01:22 +00:00
Adrian Holovaty 4606e0898e Fixed #12228 -- Updated flatpages examples. Thanks, johnthedebs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12175 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 17:58:41 +00:00
Adrian Holovaty 985dcdb4b2 Fixed #12350 -- Fixed typo in tutorial04. Thanks, mortense
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12173 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 17:55:46 +00:00
Adrian Holovaty 1f400c6df0 Fixed #12326 -- Fixed typo in tutorial04. Thanks, mortense
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 17:54:34 +00:00
Adrian Holovaty 978fb8639f Fixed #12092 -- Fixed grammar error in install.txt. Thanks, Abizern and timo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12169 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 17:47:53 +00:00
Adrian Holovaty 9e3dbc7573 Fixed #10989 -- Fixed typos in formset and widget-media docs. Thanks, falken@mixworx.net and ramiro
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12168 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 17:45:55 +00:00
Adrian Holovaty 516947fd61 Fixed #12047 -- Fixed typo in generic views documentation. Thanks, schickler
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12167 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 17:42:23 +00:00
Adrian Holovaty ddd6f28cac Fixed #10947 -- Fixed error in __in documentation. Thanks, julianb and timo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12163 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 17:25:44 +00:00
Adrian Holovaty 665ac8779b Fixed #10862 -- Clarified confusing documentation about ImageField height/width. Thanks, mw and timo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12162 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 17:23:59 +00:00
Adrian Holovaty 6502965d17 Fixed #10800 -- Made a small improvement to render_to_string() docs. Thanks, p.patruno@iperbole.bologna.it and timo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12161 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 17:22:30 +00:00
Adrian Holovaty b651bcb80b Fixed #12216 -- Fixed typo in flatpages docs. Thanks, timo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12158 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 16:45:31 +00:00
Jannis Leidel 058343c5e8 Minor formatting fixes for [12139]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12146 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-09 21:07:32 +00:00
Adrian Holovaty 933b9e8de7 Fixed #6991 -- Removed some redundant user.is_authenticated() calls in various places. Thanks, alexkoshelev, Liang Feng and Ivan Sagalaev
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12142 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-09 20:11:01 +00:00
Jannis Leidel bacfe3f3e8 Fixed #9638 - Added %(app_label)s to the related_name format string for abstract models.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-09 20:03:52 +00:00
Adrian Holovaty 00252d84d7 Negligible change to docs/topics/cache.txt so I can test something in the docs on the live site
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12135 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-09 19:28:06 +00:00
Adrian Holovaty 88265d4a73 Fixed #12497 -- Fixed Sphinx errors in docs. Thanks, ramiro
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12129 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-09 19:11:41 +00:00