Commit Graph

340 Commits

Author SHA1 Message Date
Aymeric Augustin e69348b4e7 Avoided mixing dates and datetimes in the examples.
Refs #16023.
2012-09-08 11:00:04 -04:00
Dan Loewenherz 09e3d364b9 specify any orderable field can be specified in get_latest_by, closes #18875 2012-09-07 11:34:18 -04:00
Tim Graham e5983af7c1 Fixed #18904 - Typo in MySQL link; thanks Johie Anderson for the report. 2012-09-05 17:50:17 -04:00
Alex Gaynor 17d57275f9 Fixed #18883 -- added a missing self parameter in the docs 2012-08-30 19:19:11 -07:00
Claude Paroz ebc773ada3 Replaced many smart_bytes by force_bytes
In all those occurrences, we didn't care about preserving the
lazy status of the strings, but we really wanted to obtain a
real bytestring.
2012-08-29 11:20:32 +02:00
Ramiro Morales c73f2bd65c Fixed typo in model fields reference docs. 2012-08-26 00:24:32 -03:00
Tim Graham 13d47c3f33 Fixed #18637 - Updated some documentation for aspects of models that are ModelForm specific, not admin specific.
Thanks Ben Sturmfels for the patch.
2012-08-21 17:38:16 -04:00
Andrei Antoukh 99321e30ce Fixed #18306 -- Made deferred models issue update_fields on save
Deferred models now automatically update only the fields which are
loaded from the db (with .only() or .defer()). In addition, any field
set manually after the load is updated on save.
2012-08-12 22:39:27 +03:00
James Bennett 7731cc8689 Fix #18062: Document best practices for choices in model fields. 2012-08-08 12:49:28 -04:00
Aymeric Augustin c5ef65bcf3 [py3] Ported django.utils.encoding.
* Renamed smart_unicode to smart_text (but kept the old name under
  Python 2 for backwards compatibility).
* Renamed smart_str to smart_bytes.
* Re-introduced smart_str as an alias for smart_text under Python 3
  and smart_bytes under Python 2 (which is backwards compatible).
  Thus smart_str always returns a str objects.
* Used the new smart_str in a few places where both Python 2 and 3
  want a str.
2012-08-07 12:00:22 +02:00
Tim Graham b496be331c Fixed #15932 - Documented how to supress multiple reverse relations to the same model.
Thanks Claude Paroz for the patch.
2012-08-03 16:27:45 -04:00
Ramiro Morales 50837434db Clarified default name of M2M relationship DB table. 2012-07-24 22:44:28 -03:00
Anssi Kääriäinen 29132ebdef Fixed #17788 -- Added batch_size argument to qs.bulk_create()
The qs.bulk_create() method did not work with large batches together
with SQLite3. This commit adds a way to split the bulk into smaller
batches. The default batch size is unlimited except for SQLite3 where
the batch size is limited to 999 SQL parameters per batch.

Thanks to everybody who participated in the discussions at Trac.
2012-07-17 15:24:41 +03:00
Aymeric Augustin bbc590697a Removed Django 1.0-specific sections. 2012-07-07 16:44:55 +02:00
Tim Graham 7313468f85 Fixed #17436 - Added warning about overriding Model.__init__()
Thanks zsiciarz for the draft patch.
2012-07-01 18:04:16 -04:00
Raúl Cumplido 55ffcf8e7b Fixed #18145 -- Improved documentation of unique_together type fields 2012-06-30 17:16:40 -04:00
Anssi Kääriäinen b6c356b7bb Fixed #17485 -- Made defer work with select_related
This commit tackles a couple of issues. First, in certain cases there
were some mixups if field.attname or field.name should be deferred.
Field.attname is now always used.

Another issue tackled is a case where field is both deferred by
.only(), and selected by select_related. This case is now an error.

A lot of thanks to koniiiik (Michal Petrucha) for the patch, and
to Andrei Antoukh for review.
2012-06-26 18:08:42 +03:00
Aymeric Augustin c28e700c7e Removed references to changes made in 1.2.
Thanks Florian Apolloner for the patch.
2012-06-07 15:02:35 +02:00
Jacob Kaplan-Moss 7edf231d46 Replaced documentation snippets using "gender" with less sensitive examples. 2012-06-06 13:52:53 +02:00
Aymeric Augustin 29a80354ab Added alt attribute to img tags in docs.
This is a good practice for accessibility.
Thanks Jessica McKellar for the report.
2012-06-06 10:32:03 +02:00
Andrei Antoukh 365853da01 Fixed #4102 -- Allow update of specific fields in model.save()
Added the ability to update only part of the model's fields in
model.save() by introducing a new kwarg "update_fields". Thanks
to all the numerous reviewers and commenters in the ticket
2012-05-12 10:29:41 +03:00
Claude Paroz 596cb9c7e2 Replaced print statement by print function (forward compatibility syntax). 2012-04-30 20:45:03 +02:00
Claude Paroz 3904b74a3f Fixed #18013 -- Use the new 'as' syntax for exceptions.
Thanks Clueless for the initial patch.
Note that unittest has been purposely left out (external package only used by Python 2.6).
2012-04-29 20:57:15 +02:00
Anssi Kääriäinen 584e2c0337 Prevent Oracle from changing field.null to True
Fixed #17957 -- when using Oracle and character fields, the fields
were set null = True to ease the handling of empty strings. This
caused problems when using multiple databases from different vendors,
or when the character field happened to be also a primary key.

The handling was changed so that NOT NULL is not emitted on Oracle
even if field.null = False, and field.null is not touched otherwise.

Thanks to bhuztez for the report, ramiro for triaging & comments,
ikelly for the patch and alex for reviewing.
2012-04-29 19:25:46 +03:00
Alex Gaynor 3c5ff9d703 Fixed #5893 -- Added a flag to FilePathField to allow listing folders, in addition to regular files. Thank you to Brian Rosner, for encouraging me to first contribute to Django 4 years ago.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17925 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-22 14:44:08 +00:00
Julien Phalip 93d1fdb130 Fixed #17877 -- Ensured that extra WHERE clauses get correctly ANDed when they contain OR operations. Thanks to Marek Brzóska for the report, to eleather for the test case and to Adrien Lemaire for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17880 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-09 00:43:08 +00:00
Aymeric Augustin 9ed6e08ff9 Removed deprecated URLField.verify_exists.
The deprecation schedule was slightly accelerated because of possible security ramifications.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17847 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 13:55:03 +00:00
Claude Paroz 31e84e40f8 Fixed #17870 -- Documented that EmailField default max_length of 75 does not comply with RFCs 3696/5321. Thanks Rotund for the report and the patch and Russell Keith-Magee for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17826 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-29 18:39:21 +00:00
Claude Paroz f13328f776 Fixed #17926 -- Removed mention of XMLField in docs (missing deletion from r15982). Thanks aburgel for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17764 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-17 22:13:20 +00:00
Adrian Holovaty dd246a62c7 Edited some docs and docstrings until [17685]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17686 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-12 20:05:48 +00:00
Aymeric Augustin e1a31aadb0 Fixed an inappropriate repetition. Thanks DanGer for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17679 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-11 11:49:38 +00:00
Aymeric Augustin cfd0cd1bc9 Documented a limit of the SQLite backend, in relation with the bulk_create function. Refs #17788.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17653 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-04 17:34:22 +00:00
Luke Plant de9942a667 Fixed #17668 - prefetch_related does not work in in_bulk
Thanks to gurets for the report, and akaariai for the initial patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17600 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-28 19:34:04 +00:00
Aymeric Augustin 5b560ec0c0 Fixed a few typos in the aggregation functions reference.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17569 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-21 18:28:35 +00:00
Adrian Holovaty ead8a869ce Edited models/options.txt changes from [17314]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17420 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-03 17:45:28 +00:00
Aymeric Augustin f0d4676750 Fixed #10139 -- Clarified that slicing an evaluated QuerySet returns a list, not a QuerySet. Thanks ori for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17383 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-21 15:32:52 +00:00
Ramiro Morales 33f839b252 Moved misplaced documentation warning note about internal QuerySet query atribute.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17342 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-06 17:15:15 +00:00
Timo Graham 72793766a7 Fixed #640 - Documented that changing order_with_respect_to requires a schema change; thanks fcurella and poirier for the draft patches.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17316 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-31 15:30:22 +00:00
Timo Graham 060783d52d Fixed #702 - Documented that ManyToMany fields can't be in unique_together; thanks poirier for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17314 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-31 00:43:11 +00:00
Adrian Holovaty d3ef13044e Edited doc changes from [17244]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17302 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-30 18:01:34 +00:00
Ramiro Morales 287565779d Added support for modifying the effect of ``DISTINCT`` clauses so they
only consider some fields (PostgreSQL only).

For this, the ``distinct()`` QuerySet method now accepts an optional
list of model fields names and generates ``DISTINCT ON`` clauses on
these cases. Thanks Jeffrey Gelens and Anssi Kääriäinen for their work.

Fixes #6422.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-22 20:42:40 +00:00
Aymeric Augustin 295fd50752 Fixed a typo in the model fields reference.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17238 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-20 17:03:13 +00:00
Luke Plant e954a03871 Added warning about the performance of large IN clauses in prefetch_related docs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17147 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-24 17:18:56 +00:00
Julien Phalip aa5230c4be Fixed #17269 -- Corrected the model options doc to indicate that, since 1.4, all fields in `Meta.ordering` are honored by the admin. Thanks to sebastian for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17130 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-21 06:07:24 +00:00
Karen Tracey c8c71057aa Fix #15646: Document that a FileField's full path can't be relied upon until its model has been saved to the database. Thanks poirier.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-19 15:08:07 +00:00
Aymeric Augustin 9b1cb755a2 Added support for time zones. Thanks Luke Plant for the review. Fixed #2626.
For more information on this project, see this thread:
http://groups.google.com/group/django-developers/browse_thread/thread/cf0423bbb85b1bbf



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17106 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-18 13:01:06 +00:00
Karen Tracey efe4e2e517 Fix #16570: Restore ability to have decimal fields where max_digits equals decimal_places. Thanks dcwatson and kenth.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17089 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-12 19:53:56 +00:00
Ramiro Morales 576e681302 Fixed #17063 -- Fixed visibility of a few version-dependant notes in our documentation.
Thanks jifeng.yin AT gmail DOT com for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17057 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-30 12:59:59 +00:00
Aymeric Augustin 246580573d Fixed #12308 -- Added tablespace support to the PostgreSQL backend.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-14 21:49:43 +00:00
Luke Plant d1e5c55258 Fixed many more ReST indentation errors, somehow accidentally missed from [16955]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16983 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-14 00:12:01 +00:00
Julien Phalip 406f9d1fa0 Fixed #7609 -- Noted in the model fields reference documentation that `PositiveIntegerField` accepts the value 0 for backwards-compatibility reasons. Thanks to everyone involved in the resolution of this issue, including Paul Collins for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16972 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-13 12:23:58 +00:00
Gabriel Hurley a71bd3e0c9 Corrected a reST formatting problem in the queryset reference docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16958 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-11 18:23:08 +00:00
Luke Plant c61987d75a Removed use of non-standard indentation rules in docs, and the custom transform that supported them.
Doc writers should be aware that we are now back to normal ReST rules
regarding blockquotes.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16955 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-10 17:32:33 +00:00
Luke Plant af244e47cc Fixed a bunch of ReST errors that resulted in interpretation as block quotations
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16954 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-10 15:32:01 +00:00
Luke Plant ac6361a3a6 Fixed some ReST errors in docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16945 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-08 18:07:30 +00:00
Luke Plant 052a011ee6 Fixed #17003 - prefetch_related should support foreign keys/one-to-one
Support for `GenericForeignKey` is also included.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16939 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-07 16:05:53 +00:00
Luke Plant 662eea116f Fixed #16937 - added `QuerySet.prefetch_related` to prefetch many related objects.
Many thanks to akaariai for lots of review and feedback, bug finding,
additional unit tests and performance testing.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16930 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-05 23:14:52 +00:00
Jannis Leidel 2eadc418af Fixed doc references to `django.db.models.query.QuerySet` and converted some tabs that were introduced in r16699 to spaces.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16915 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-30 10:28:39 +00:00
Jannis Leidel 2a2381a682 Added versionadded directive for the `bulk_create` Queryset method introduced in r16739.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16885 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-22 15:04:34 +00:00
Ramiro Morales 26b8122087 Fixed #14675 -- Completed removal of `from django.conf.urls.default import *` usage.
This applies to both our own [test] code and documentation examples. Also:
 * Moved the functions and handlers from `django.conf.urls.defaults` up to
   `django.conf.urls` deprecating the former module.
 * Added documentation for `handler403`.
 * Tweaked the URLs topic document a bit.

Thanks to pupeno and cdestigter for their great work contributing patches.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-11 22:36:16 +00:00
James Bennett f6d11f9b05 Fixed #16109: Corrected an inconsistency in URLconf examples for matching a numeric month.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16811 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-11 05:44:21 +00:00
Russell Keith-Magee 8d6c251731 Fixed #16592 -- More test changes and documentation to account for MySQL's casual relationship with sanity. Thanks to Jim Dalton for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16787 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-10 20:06:10 +00:00
Carl Meyer 84e0055e8d Corrected documentation inconsistencies regarding deprecation of URLField.verify_exists.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16776 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-10 03:26:13 +00:00
Russell Keith-Magee 5f287f75f2 Altered the behavior of URLField to avoid a potential DOS vector, and to avoid potential leakage of local filesystem data. A security announcement will be made shortly.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-10 00:47:00 +00:00
Alex Gaynor 7deb25b8dd Fixed #7596. Added Model.objects.bulk_create, and make use of it in several places. This provides a performance benefit when inserting multiple objects. THanks to Russ for the review, and Simon Meers for the MySQl implementation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16739 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-09 19:22:28 +00:00
Ramiro Morales 932b1b8d6d Converted links to external topics so they use intersphinx extension markup.
This allows to make these links more resilent to changes in the target URLs.
Thanks Jannis for the report and Aymeric Augustin for the patch.

Fixes #16586.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-04 21:17:30 +00:00
Malcolm Tredinnick 77189afb7f Slightly rewrite @permalink and get_absolute_url() documentation.
Part 2 of the model instance documentation changes. Slightly tidied up
get_absolute_url() and @permalink documentation to collapse some of the
earlier versions into a preferred learning order. I'm still not
amazingly happy with this, but larger rewrites are needed to the URLconf
stuff across a few files before I can get it into the most natural
order, I suspect. That's a slightly longer-term project.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16702 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-28 02:05:32 +00:00
Malcolm Tredinnick a0eb58e90b Documentation edits for model instance docs.
First of two parts. Mostly adding cross references to other parts of the
documentation.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16701 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-28 02:05:20 +00:00
Malcolm Tredinnick 4c8f2dca21 Extensive copy-editing and cross-referencing in the queryset API docs.
Been meaning to do this for a long time. Mostly, this is a lot of
additions of cross references. Within a particular section about foo() I
didn't cross-link foo() calls to itself, but everything else was
cross-linked to its main documentation.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16699 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-27 02:56:18 +00:00
Julien Phalip 17ceb9b98a Fixed #16712 -- Fixed a small typo in the QuerySet API docs. Thanks to Rupe and Aymeric Augustin for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16698 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-26 23:37:07 +00:00
Malcolm Tredinnick a4a250a296 Corrected explanation of values() and extra() interaction in querysets.
Fixes #15546, refs #13455. The original documentation patch
inadvertently muddied the waters in one aspect and this commit tidies
that up.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16697 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-26 21:13:01 +00:00
Malcolm Tredinnick 4d21511961 Clarify the documentation around SQLite and case-sensitive string matching.
This was still causing some confusion, so I rewrote the section in the
database notes to encompass both substring matching and non-ASCII
case-insensitive equality checks, as well as putting in a stronger
callout on the "contains" filter.

Refs #16569.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16694 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-26 08:42:38 +00:00
Malcolm Tredinnick 70e59aeaf8 Be very clear about when it's appropriate to use defer() and only().
I've been seeing a bit of over-reliance on defer() and only() in code
around the place and it's generally better modelled with normalised data
or shadow (unmanaged) models. This commit makes this position clearer.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-26 06:19:30 +00:00
Timo Graham 953fed1e30 Fixed #16580 - Typo in docs/ref/models/querysets.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-06 18:49:58 +00:00
Jannis Leidel 441c4e08cd Fixed #16498 -- Fixed typo in GenericIPAddressField docs. Thanks, JshWright.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16559 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-07-29 09:39:49 +00:00
Luke Plant f5c9c2246e Improved warning about file uploads in docs, and added link from security overview page
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16521 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-07-06 23:44:54 +00:00
Karen Tracey 901ea8a68d s/get/filter in new example of how to use queryset update method: update won't work on a model instance.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16518 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-07-06 00:21:32 +00:00
Adrian Holovaty 471a841147 Added another bit to the update() queryset docs about avoiding race conditions
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16517 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-07-05 20:16:08 +00:00
Adrian Holovaty 8b34a01017 Improved update() docs in querysets.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16516 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-07-05 20:09:00 +00:00
Jannis Leidel ce3c281090 Fixed #811 -- Added support for IPv6 to forms and model fields. Many thanks to Erik Romijn.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16366 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-11 13:48:24 +00:00
Andrew Godwin 865d684a8a Fixed #8913 - Make "must be unique" error messages customisable. Thanks to Leah Culver.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16345 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-09 15:05:13 +00:00
Timo Graham caefdc8246 Fixed #16090, #16091, #16114 - Typos in docs; thanks teraom.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16300 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-31 09:42:19 +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
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
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
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
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
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
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 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
Gabriel Hurley 319de16ff0 Fixed #15233 -- reST/Sphinx markup corrections in numerous areas, mostly centering around bad crossref targets. Thanks to Aryeh Leib Taurog for the draft patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15549 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-16 01:56:53 +00:00
Carl Meyer 93a4d46184 Fixed #14672 - Added admin handling for on_delete=PROTECT. Thanks to jtiai for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15249 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-20 00:33:32 +00:00
Timo Graham 1b90cdcf23 Fixed #15045 - Typo auto_add_now -> auto_now_add; thanks dr_gone for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15171 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-11 00:29:38 +00:00
Timo Graham 07ef43082d Fixed #15002 - Fix title casing to conform to style guidelines. thanks adamv.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15135 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-03 13:29:17 +00:00
Timo Graham 9b18b46c0f Fixed #14842 - Indent the model Meta options. Thanks adamv.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15110 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 20:30:24 +00:00
Timo Graham ad4969e5e8 Fixed #14959 - Add a link to localflavor in the model field docs. Thanks PaulM for the suggestion, elbarto for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15096 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 13:47:28 +00:00
Ramiro Morales a43c2f50c2 Fixed #7726 -- Added validation of max_digits and decimal_places options to DecimalField model field. Thanks theevilgeek for the report and elbarto for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15094 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 01:18:11 +00:00
Gabriel Hurley 7f3210efa8 Fixed #14403 -- Provided some extra resources on the difference between FloatField and DecimalField in the model field reference. Thanks to typeshige for the report and trebor74hr and dmedvinsky for the draft patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15090 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 00:03:02 +00:00
Gabriel Hurley cd977b9221 Fixed #14905 -- Corrected some misleading linking and language in the FileField docs. Thanks to Keryn Knight for the report and draft patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15088 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 23:24:34 +00:00
Timo Graham 2ea93f9327 Fixed #14000 - remove versionadded/changed tags for Django 1.0 and 1.1
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-26 00:37:14 +00:00
Timo Graham 8a9be74776 Fixed #14927 - typo in model option docs. thanks tiliv.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15051 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-25 20:30:15 +00:00
Timo Graham 8d10e0c325 Fixed #6434 - Add clarifying note about auto_now and auto_now_add. thank adamv for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14923 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 14:04:39 +00:00
Simon Meers 22fc30be5a Fixed #8975 -- documented related order methods -- thanks to Leo for the report and dwillis for the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14848 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-06 23:08:44 +00:00
Gabriel Hurley b407de3bc5 Fixed #14840 -- Added crossrefs to related objects reference docs. Thanks to adamv for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-06 11:49:31 +00:00
Timo Graham 00f36e0ebf Fixed #9033 - Add bullets to QuerySet extra() arguments. thanks julien for the suggestion and dwillis for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14816 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 20:41:35 +00:00
Timo Graham b31a956d57 Fixed #14758 - Remove entire method signatures from QuerySet headings - thanks adamv for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14737 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-28 18:15:40 +00:00
Timo Graham 044d5a2432 Fixed #14756 - fix typo in "related objects reference" docs. Thanks deisner for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14703 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-26 12:40:09 +00:00
Carl Meyer 9b432cb67b Fixed #5768 -- Added support for ManyToManyFields and reverse relations in values() and values_list(). Thanks to mrmachine for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14655 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 02:28:25 +00:00
Alex Gaynor e69bc74351 Fixed #14696, corrected some messed up syntax in the docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14566 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 02:21:07 +00:00
Carl Meyer 616b30227d Fixed #7539, #13067 -- Added on_delete argument to ForeignKey to control cascade behavior. Also refactored deletion for efficiency and code clarity. Many thanks to Johannes Dollinger and Michael Glassford for extensive work on the patch, and to Alex Gaynor, Russell Keith-Magee, and Jacob Kaplan-Moss for review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14507 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-09 16:46:42 +00:00
Carl Meyer 3ba3294c6b Fixed #14599 -- Added documentation for QuerySet.delete() in the QuerySet API reference. Thanks to abeld for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14505 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-09 16:33:48 +00:00
Gabriel Hurley 7f2b36050e Fixed #10904 -- Corrected inappropriate usage of the term "absolute URL" throughout the docs. Replaced with the (RFC 2396-compliant) terms "absolute path reference" or "absolute path" as appropriate for the context. Thanks to sharan666 for the report, and Malcolm, Chris, and dwillis for their work in supplying a solution and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14482 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-07 01:42:55 +00:00
Adrian Holovaty 19a089ce76 Edited docs/ref/models/fields.txt change from [14049]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14367 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-27 21:47:22 +00:00
Gabriel Hurley e9d6662f5e Fixed #14493 -- Corrected use of the wrong attribute in the model validation example pseudo-code. Thanks to wogan for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14300 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-20 21:08:06 +00:00
Gabriel Hurley 6c902c436e Fixed #14307 -- Added a new crossref target to model field reference docs and fixed broken relative link in form field reference docs. Thanks to adamv for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14234 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-15 20:13:22 +00:00
Carl Meyer b61cafb146 Fixed misspelling in model fields docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14096 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 22:38:51 +00:00
Gabriel Hurley 6400026feb Fixed #14004 -- Adds documentation for QuerySet.update() method. Thanks to dwillis and timo for the majority of the wording.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14074 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 10:00:13 +00:00
Russell Keith-Magee a904e55859 Fixed #11509 -- Modified usage of "Web" to match our style guide in various documentation, comments and code. Thanks to timo and Simon Meers for the work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 08:12:50 +00:00
Simon Meers 2cadc6b10a Tiny formatting tweak.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14068 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 07:53:17 +00:00
Simon Meers fa3335fa9f Fixed #5537 -- document trailing '+' on related_name for supressing backward relation.
Thanks to dcramer for the report, and Russ for pointing out the workaround.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@14049 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 02:54:48 +00:00
Malcolm Tredinnick 9802a73e25 Better error message for calling get_next_by_* on unsaved models.
Patch from Marc Fargas. Fixed #7435.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13738 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-11 00:20:35 +00:00
Luke Plant 2422fbfc93 Fixed #13414 - QuerySet API ref wrong sql equivalent in __year lookup example
Thanks to idle for report and patch



git-svn-id: http://code.djangoproject.com/svn/django/trunk@13692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-07 20:43:19 +00:00
Luke Plant 58c8d92334 Fixed #14189 - permalink docs import mistake
Thanks to 7times9 for report and patch.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@13666 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-30 10:29:44 +00:00
Luke Plant c00f35ae0d Fixed #14185 - improved example SQL for 'select' example.
Thanks to Trindaz for the suggestion.

Also fixed some references to 'lede' which is no longer part of the
example Blog model.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@13652 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-28 11:23:54 +00:00
Russell Keith-Magee a323fd3c5e Fixed #14112 -- Various Markup fixes for the docs. Thanks to ramiro for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13628 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-23 08:07:35 +00:00
Jacob Kaplan-Moss 728effcfbd Fixed #14141: docs now use the :doc: construct for links between documents.
Thanks, Ramiro Morales.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-19 19:27:44 +00:00
Russell Keith-Magee 2dc2ed87e5 Fixed #11800 -- Updated Sphinx metadata in queryset docs. Thanks to timo for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13548 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 14:26:07 +00:00
Karen Tracey 2fce843832 Fixed import example code for NON_FIELD_ERRORS.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13434 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-07-17 09:29:44 +00:00
Karen Tracey fc33b8e953 Fixed #13778: Removed a stray colon in a code example. Thanks canassa.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13355 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-06-17 18:29:27 +00:00
Jacob Kaplan-Moss 47e3cc74d9 Slight fixes to related fields reference to avoid conflicting target names
with the queryset docs.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13272 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-17 16:32:37 +00:00
Russell Keith-Magee b160e1c172 Fixed #12997 -- Corrected the module markup for QuerySet methods. Thanks to timo for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13235 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-11 14:12:08 +00:00
Russell Keith-Magee b34edc76eb Fixed #12678 -- Corrected a few references to Queryset into QuerySet. Thanks to ChrisMorgan for the report, and timo for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13211 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 13:14:19 +00:00
Russell Keith-Magee 819f43f499 Fixed #12229 -- Added documentation of the FieldFile methods that are exposed by FileField and ImageField. Thanks to Gabriel Hurley for the draft patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13202 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 12:29:04 +00:00
Russell Keith-Magee 55d65d3351 Fixed #12997 -- Added markup for methods in the queryset docs. Thanks to Ramiro Morales for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13162 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 05:48:45 +00:00
Russell Keith-Magee 4a15dc4509 Fixed #13100 -- Clarified the model validation rules around full_clean(). Thanks to ptone for the draft text.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13160 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 05:47:35 +00:00
Russell Keith-Magee ccf5bb1883 Fixed #13282 -- Clarified documentation around week_day filtering in querysets. Thanks to wangchun, Ramiro Morales and timo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13155 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 04:50:00 +00:00
Russell Keith-Magee e7e46d1f4b Fixed #13455 -- Clarified the interaction of values() and extra(). Thanks to Rupe for the report and draft text.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13145 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 04:24:21 +00:00
Luke Plant 97b9c7582b Fixed #13099 - incorrect SQL for `exclude()` example
Thanks to istruble for the report.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12936 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-06 14:35:36 +00:00
Justin Bronn d58020fce8 Fixed `fieldlookup` docs cross-reference directive, and added it to the queryset reference. Refs #12930.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12808 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-20 05:04:31 +00:00
Malcolm Tredinnick 1eee40234b Fixed #11711 -- clarified that ValuesQuerySets are not lists per se.
It rarely hurts to think of the returned result from a values() or
values_list() call as a list, but it's really an iterable and sometimes
the difference matters.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12743 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-10 03:41:41 +00:00
Karen Tracey f2bc4dd0a9 Fixed #12024: Changed admin code to avoid raising an exception when a field listed
in raw_id_fields has limit_choices_to specified as a Q object. 

Tweaked a test to trigger the condition and verify the fix. 

Finally, documented that limit_choices_to specified as a Q object has no effect 
on the choices available for fields listed in raw_id_fields, and removed another 
incorrect note that claimed limit_choices_to had no effect on inlines in the admin.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 18:32:24 +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 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 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
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
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
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
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
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
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