1
0
mirror of https://github.com/django/django.git synced 2024-12-29 12:36:08 +00:00
Commit Graph

785 Commits

Author SHA1 Message Date
Jannis Leidel
82b33b1d80 Fixed #8068 - Added Kuwaiti (kw) localflavor. Thanks to Ahmad Al-Ibrahim for providing the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12042 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-01 21:32:24 +00:00
Jannis Leidel
3825bb2350 Fixed #10736 - Added Uruguayan (uy) localflavor. Thanks to Gonzalo Saavedra for providing the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12041 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-01 21:31:47 +00:00
Gary Wilson Jr
adb74a8f2e Fixed several broken and redirecting URLs in the documentation (fixes #12219, refs #12427).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11994 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-26 06:37:26 +00:00
Gary Wilson Jr
c6fa4936b3 Fixed #9465 -- Simplified API Reference documentation titles for easier lookup and made first-level heading styles consistent. Thanks, adamnelson.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11990 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-26 03:44:21 +00:00
Gary Wilson Jr
6154d58cb5 Form wizard documentation tweaks:
* Simplified Sphinx references to FormWizard class.
  * Wrapped long lines.
  * Added references to template loader functions.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@11986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-25 21:07:11 +00:00
Jannis Leidel
d320deef25 Fixed #9289 - Added Swedish localflavor. Thanks to Andreas Pelme, Ludvig Ericson and Filip Noetzel for working on a patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11969 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 21:10:40 +00:00
Brian Rosner
bcd9482a20 Fixed #342 -- added readonly_fields to ModelAdmin. Thanks Alex Gaynor for bootstrapping the patch.
ModelAdmin has been given a readonly_fields that allow field and calculated
values to be displayed alongside editable fields. This works on model
add/change pages and inlines.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11965 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 18:29:00 +00:00
Russell Keith-Magee
44b9076bbe Fixed #6262 -- Added a cached template loader, and modified existing template loaders and tag to be cacheable. Thanks to Mike Malone for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11862 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-14 12:08:23 +00:00
Luke Plant
25020ddb05 Fixed #4604 - Configurable message passing system, supporting anonymous users
This deprecates User.message_set in favour of a configurable messaging
system, with backends provided for cookie storage, session storage and
backward compatibility.

Many thanks to Tobias McNulty for the bulk of the work here, with
contributions from Chris Beaven (SmileyChris) and lots of code review from
Russell Keith-Magee, and input from many others.  Also credit to the authors
of various messaging systems for Django whose ideas may have been pinched
:-)



git-svn-id: http://code.djangoproject.com/svn/django/trunk@11804 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-09 16:57:23 +00:00
Luke Plant
20c7e646ff Added notes to "Features deprecated in 1.2" about CSRF and SMTPConnection
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11788 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-03 14:48:47 +00:00
Russell Keith-Magee
cf169d9e12 Cleaned up the release notes index page, and added some stub 1.1.2 and 1.2 release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-23 13:44:24 +00:00
Russell Keith-Magee
77abadfa6a Corrected a markup error in the m2m inline docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11723 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-04 15:05:49 +00:00
Russell Keith-Magee
2c609b4019 Added version indicator to docs for m2m inline change introduced in r11712.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11722 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-04 15:01:41 +00:00
Russell Keith-Magee
dab3e97c1a Fixed #11795 -- Document (and slightly simplify) the use of inlines for m2m relations.
This is the first immediate benefit of m2m relations having an autogenerated model.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11712 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-03 15:02:16 +00:00
Luke Plant
53b2c3867b Fixed #12130 - documented need for csrf_protect on views that don't accept POST
Includes:
   
 * proper documentation for csrf_protect
 * notes in comments app.
 * specific upgrade notes for comments app

Thanks to carljm for report and debugging.




git-svn-id: http://code.djangoproject.com/svn/django/trunk@11711 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-03 14:40:37 +00:00
Brian Rosner
8812060d77 Fixed #12115 -- Corrected typo in admin documentation. Thanks encinas.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11686 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-30 08:48:48 +00:00
Luke Plant
5a0aab41ee Allow CsrfResponseMiddleware to be used if templates cannot be updated.
For the case where someone is using contrib views with custom templates that
they cannot update to use the template tag, it should be possible to use
CsrfResponseMiddleware.  This requires that 'csrf_response_exempt' is not
used for the admin views.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@11683 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-30 00:17:29 +00:00
Luke Plant
e6f0c10e77 Fixed typo in docs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11677 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-27 22:26:54 +00:00
Luke Plant
9dc9770736 Documented the presence of {% csrf_token %} in Django 1.1.2 in trunk docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11675 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-27 21:52:25 +00:00
Luke Plant
b32a187296 Fixed some typos
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11668 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-27 13:13:40 +00:00
Luke Plant
f00ad4168e Added explicit notes about the need to update any customised templates for contrib apps for CSRF changes
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11667 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-27 12:11:56 +00:00
Luke Plant
64b4ab18b4 Use decorator syntax for csrf_exempt example.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11663 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-27 00:43:16 +00:00
Luke Plant
7230a995ce Moved contrib.csrf.* to core code.
There is stub code for backwards compatiblity with Django 1.1 imports.

The documentation has been updated, but has been left in
docs/contrib/csrf.txt for now, in order to avoid dead links to
documentation on the website.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@11661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-27 00:36:34 +00:00
Luke Plant
8e70cef9b6 Fixed #9977 - CsrfMiddleware gets template tag added, session dependency removed, and turned on by default.
This is a large change to CSRF protection for Django.  It includes:

 * removing the dependency on the session framework.
 * deprecating CsrfResponseMiddleware, and replacing with a core template tag.
 * turning on CSRF protection by default by adding CsrfViewMiddleware to
   the default value of MIDDLEWARE_CLASSES.
 * protecting all contrib apps (whatever is in settings.py)
   using a decorator.

For existing users of the CSRF functionality, it should be a seamless update,
but please note that it includes DEPRECATION of features in Django 1.1,
and there are upgrade steps which are detailed in the docs.

Many thanks to 'Glenn' and 'bthomas', who did a lot of the thinking and work
on the patch, and to lots of other people including Simon Willison and
Russell Keith-Magee who refined the ideas.

Details of the rationale for these changes is found here:

http://code.djangoproject.com/wiki/CsrfProtection

As of this commit, the CSRF code is mainly in 'contrib'.  The code will be
moved to core in a separate commit, to make the changeset as readable as
possible.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@11660 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-26 23:23:07 +00:00
Luke Plant
a02a6fab66 Fixed #9163 - CsrfMiddleware needs to reset ETag header
Thanks to carljm for report and patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@11650 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-24 10:45:58 +00:00
Luke Plant
f3af2d9883 Fixed some ReST markup in admin installation docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11580 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-14 22:49:03 +00:00
Luke Plant
95d5e450ec Fixed counting error in admin installation overview docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11579 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-14 22:36:20 +00:00
Russell Keith-Magee
ec6b9d6e63 Fixed #9236 -- Added documentation on the dependencies of the admin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11543 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-12 23:56:45 +00:00
Russell Keith-Magee
94885bac7b Fixed #11808 -- Corrected typo in admin docs. Thanks to kratorius for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11534 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-12 22:44:51 +00:00
Russell Keith-Magee
fc7ef1c86c Fixed #11831 -- Corrected typo in comments docs. Thanks to gsf for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11533 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-12 22:43:20 +00:00
Karen Tracey
b82ad10f9d Fixed #11508: Adding missing word to form wizard doc. Thanks thepointer and timo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11444 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-08-13 16:59:59 +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
93d86479e3 Fixed #11480 -- Corrected markup error in admin docs. Thank to msgre for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11240 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-15 13:57:46 +00:00
Russell Keith-Magee
5727374d95 Fixed #11348 -- Trimmed the width of a screenshot image in the admin docs. Thanks to smcoll for the new image.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11238 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-15 13:55:50 +00:00
Russell Keith-Magee
e992e57d3e Fixed #11416 -- Restored use of the never_cache decorator on admin views. Thanks to Ramiro Morales and Michael Newmann for their work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11229 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-13 13:46:31 +00:00
Russell Keith-Magee
6bf55a1abf Fixed #11450 -- Corrected markup problem in contenttype docs. Thanks to seveas for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11218 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-11 15:37:08 +00:00
Russell Keith-Magee
9515c008bb Fixed #11454 -- Corrected mismatched parenthesis in admin docs. Thanks to seveas for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11217 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-11 15:36:31 +00:00
Russell Keith-Magee
b96e55e811 Fixed #11419 -- Corrected a minor typo in the admin docs. Thanks to jspeis for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11176 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-03 14:10:35 +00:00
Russell Keith-Magee
36954a04b7 Fixed #9669 -- Corrected an answer in the admin FAQ that is wrong in a post-newforms-admin world. Thanks to Alex for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11175 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-03 14:09:04 +00:00
Russell Keith-Magee
970be97530 Fixed #8861 -- Added note on the availability of ModelForm.instance. Thanks to Ramiro Morales for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11097 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-24 14:04:18 +00:00
Russell Keith-Magee
4acf7f43e7 Fixed #10415 -- Added documentation for features added in r7627 and r7630; extensibility points for the ModelAdmin and AdminSite. Thanks to Ramiro Morales for the draft text.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11095 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-24 14:02:22 +00:00
Russell Keith-Magee
97fb6cf2b3 Fixed #11141 -- Corrected a code example in the admin docs. Thanks to jodal for the report, and SmileyChris for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11049 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-18 13:35:06 +00:00
Russell Keith-Magee
457a1f9a03 Fixed #11272 -- Made some clarifications to the overview and tutorial. Thanks to jjinux for the review notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11044 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-18 13:32:12 +00:00
Karen Tracey
3465ac05a6 Fixed #11034: Corrected serialization example in admin actions doc. Thanks timo and kaikuehne.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10804 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-17 17:13:33 +00:00
Karen Tracey
50745cc31e Fixed #11066 -- Corrected 15 duplicate "the"s found in docs and code comments. Thanks kaikuehne.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-17 16:45:28 +00:00
James Bennett
bed1418034 Add a proper cross-reference to the mention of HttpRequest in the comment moderation docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10786 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-15 02:57:53 +00:00
Jacob Kaplan-Moss
d246401552 Fixed #11113: fixed a couple of issues that slipped through the cracks when comment moderation was added to django.contrib.comments.
The is a potentially backwards-incompatible change for users already relying on the internals of comment moderaration. To wit:

   * The moderation system now listens to the new `comment_will_be_posted`/`comment_was_posted` signals instead of `pre/post_save`. This means that import request-based information is available to moderation as it should be.
   * Some experimental code from `django.contrib.comments.moderation` has been removed. It was never intended to be merged into Django, and was completely untested and likely buggy.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10784 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-14 15:20:50 +00:00
Jacob Kaplan-Moss
d987b378ce Fixed #11039: documented that aggregation and generic relations don't mix. Thanks, psmith.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10781 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-14 02:38:27 +00:00
Jacob Kaplan-Moss
5bdee2556e Fixed #11022: documented that the admin bulk delete action calls QuerySet.delete(), not Model.delete(). Thanks, Idan Gazit.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10780 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-14 02:35:16 +00:00
Jacob Kaplan-Moss
690cb616ce Fixed #10886: corrected a mistaken example in the admin docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10776 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-14 02:17:40 +00:00
Jacob Kaplan-Moss
d08339686b Fixed #9675: added note about upgrading the URLconf to the comment upgrade guide.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10746 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-12 17:23:43 +00:00
Russell Keith-Magee
95bcb70b56 Fixed #10367 -- Corrected an example in the documentation for GenericRelation. Thanks to George Song for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-02 14:51:54 +00:00
Jacob Kaplan-Moss
d6829782d0 Now that formsets guarentee ordering (see [10623]) we can remove the arbitrary validation of this fact added as part of [10077].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10628 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-22 22:45:23 +00:00
Russell Keith-Magee
565c190611 Fixed #10559 -- Clarified documentation on customization of comments pages. Thanks to Thejaswi Puthraya for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10566 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-16 12:48:16 +00:00
Russell Keith-Magee
e6d2b14e35 Fixed #10726 -- Added documentation on AdminSite urls. Thanks to Alex Gaynor for the initial draft.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10565 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-16 12:47:34 +00:00
Russell Keith-Magee
83623d45c7 Fixed #10776 -- Added metadata targets for the contrib.admin docs, and used one of those targets to clarify the SlugField docs. Thanks to ernop for the suggestion, and timo for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10564 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-16 12:46:58 +00:00
Jacob Kaplan-Moss
f8adf99cdb Fixed #9268: pass the "next" param through in the comment preview/post view. Also updated the docs to make this a bit clearer.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10418 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-07 19:28:13 +00:00
Simon Willison
7f7606070b Fixed a documentation typo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10412 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-06 23:45:56 +00:00
Jacob Kaplan-Moss
07465b635d Fixed a small error in the docs that I missed from [10408].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10409 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-06 20:28:55 +00:00
Jacob Kaplan-Moss
bb15cee58a Made a bunch of improvements to admin actions. Be warned: this includes one minor but BACKWARDS-INCOMPATIBLE change.
These changes are:

    * BACKWARDS-INCOMPATIBLE CHANGE: action functions and action methods now share the same signature: `(modeladmin, request, queryset)`. Actions defined as methods stay the same, but if you've defined an action as a standalone function you'll now need to add that first `modeladmin` argument.
    * The delete selected action is now a standalone function registered site-wide; this makes disabling it easy.
    * Fixed #10596: there are now official, documented `AdminSite` APIs for dealing with actions, including a method to disable global actions. You can still re-enable globally-disabled actions on a case-by-case basis.
    * Fixed #10595: you can now disable actions for a particular `ModelAdmin` by setting `actions` to `None`.
    * Fixed #10734: actions are now sorted (by name).
    * Fixed #10618: the action is now taken from the form whose "submit" button you clicked, not arbitrarily the last form on the page.
    * All of the above is documented and tested.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10408 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-06 20:23:33 +00:00
Jacob Kaplan-Moss
c6c25adf6d Fixed a whole bunch of small docs typos, errors, and ommissions.
Fixes #8358, #8396, #8724, #9043, #9128, #9247, #9267, #9267, #9375, #9409, #9414, #9416, #9446, #9454, #9464, #9503, #9518, #9533, #9657, #9658, #9683, #9733, #9771, #9835, #9836, #9837, #9897, #9906, #9912, #9945, #9986, #9992, #10055, #10084, #10091, #10145, #10245, #10257, #10309, #10358, #10359, #10424, #10426, #10508, #10531, #10551, #10635, #10637, #10656, #10658, #10690, #10699, #19528.

Thanks to all the respective authors of those tickets.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10371 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-03 18:30:54 +00:00
Jacob Kaplan-Moss
a2dec37c41 Fixed #9908: allow individual app index templates in the admin. Thanks, arne.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10317 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-01 14:13:59 +00:00
Joseph Kocherhans
efd7141d70 Fixed #9452. InlineModelAdmin docs now mention the right default for 'form'.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10309 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-01 01:29:30 +00:00
Jacob Kaplan-Moss
516051bfd2 A whole lotta documentation fixes: Fixes #8704, #8826, #8980, #9243, #9343, #9529,
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10303 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-31 23:34:03 +00:00
James Bennett
131de1cf2b Fixed #10367: Added note to generic-relation docs explaining when it's necessary to pass in field names to create a reverse relation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10273 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-31 17:14:10 +00:00
Gary Wilson Jr
4a73b603d0 Fixed #10612 -- Removed duplicate word in docs, patch from adamfast.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10249 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-31 15:33:57 +00:00
Gary Wilson Jr
7372ea159a Fixed #10389, #10501, #10502, #10540, #10562, #10563, #10564, #10565, #10568, #10569, #10614, #10617, #10619 -- Fixed several typos as well as a couple minor issues in the docs, patches from timo, nih, bthomas, rduffield, UloPe, and sebleier@gmail.com.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-31 07:01:01 +00:00
Gary Wilson Jr
5c9d54344c Fixed #9946 -- Removed redundant mention of needing to define list_display.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-30 23:30:33 +00:00
Russell Keith-Magee
c4eb2883bc Fixed #10510 -- Added missing versionadded marker for formfield_for_foreignkey docs. Thanks to onno.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10148 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-24 11:41:37 +00:00
Jacob Kaplan-Moss
4246c832b6 Added 1.1 beta release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10130 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-23 23:25:03 +00:00
Luke Plant
20f7e51493 Reverted 10094 and 10095 (in favour of solution that will hopefully land for beta 2)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10128 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-23 23:02:46 +00:00
Jacob Kaplan-Moss
f22418a6be Oops, added missing file from [10122].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10123 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-23 21:22:31 +00:00
Jacob Kaplan-Moss
f0560dfdb2 Fixed #9282: added a generic comment moderation toolkit. See the documentation for details.
This began life as (part of) James Bennett's comment-utils app, and was adapted to be part of Django by Thejaswi Puthraya and Jannis Leidel. Thanks, all!

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10122 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-23 21:07:02 +00:00
Jacob Kaplan-Moss
44f3080226 Fixed #10505: added support for bulk admin actions, including a globally-available "delete selected" action. See the documentation for details.
This work started life as Brian Beck's "django-batchadmin." It was rewritten for inclusion in Django by Alex Gaynor, Jannis Leidel (jezdez), and Martin Mahner (bartTC). Thanks, guys!

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10121 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-23 20:22:56 +00:00
Karen Tracey
14b160957e Fixed #8962 -- Consistently support format and input_format in the various (individual, combined, split) date and time form fields and widgets.
Many thanks to Tai Lee for doing all the work here.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@10115 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-22 16:13:06 +00:00
Jacob Kaplan-Moss
231a7e0419 Fixed #9958: split the CommentForm into a set of smaller forms. This for better encapsulation, but also so that it's easier for subclasses to get at the pieces they might need. Thanks to Thejaswi Puthraya.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10110 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-21 13:45:31 +00:00
Luke Plant
2d28724730 Added CSRF middleware to default settings and updated docs.
Updated docs to reflect the change, and the fact that using the
two separate middleware is preferred to using the combined one.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@10094 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-19 23:14:20 +00:00
Jacob Kaplan-Moss
7bc0878922 Fixed #8939: added a list_editable option to ModelAdmin; fields declared list_editable may be edited, in bulk, on the changelist page. Thanks, Alex Gaynor.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10077 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-17 20:51:47 +00:00
Jacob Kaplan-Moss
4cf1327aa4 Cleaned up some documentation about admin URLs in Django 1.1. Thanks, Alex Gaynor.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9892 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-24 01:10:26 +00:00
Jacob Kaplan-Moss
63d85a684a Fixed #8630: finished the custom comment app API that was left out of 1.0. This means it's now possible to override any of the models, forms, or views used by the comment app; see the new custom comment app docs for details and an example. Thanks to Thejaswi Puthraya for the original patch, and to carljm for docs and tests.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9890 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-23 22:16:26 +00:00
Russell Keith-Magee
b2a4377651 Fixed #9066 -- Added Czech localflavor. Thanks to Elvard for the contribution.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 07:51:57 +00:00
Russell Keith-Magee
f1e8d24e0c Fixed #10030 -- Corrected a typo in a reference to the login_required decorator. Thanks to mk for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9860 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 06:08:13 +00:00
Russell Keith-Magee
b77bf5291a Fixed #10141 -- Added a missing import to the complex Feed example. Thanks to Temoto for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9858 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 06:07:21 +00:00
Adrian Holovaty
8ed6a62a3c Fixed #10195 -- Fixed a ReST error in docs/ref/contrib/syndication.txt. Thanks, toxik
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-21 08:41:04 +00:00
Luke Plant
9a2e338107 Made CSRF middleware skip post-processing for 'csrf_exempt' decorated views.
This commit also decomposes the decorator into two decorators which can be
used separately, adds some tests, updates docs and fixes some code comments.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@9815 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-07 17:47:02 +00:00
Jacob Kaplan-Moss
f212b24b64 Cleaned up and refactored ModelAdmin.formfield_for_dbfield:
* The new method uses an admin configuration option (`formfield_overrides`); this makes custom admin widgets especially easy.
  * Refactored what was left of `formfield_for_dbfield` into a handful of smaller methods so that it's easier to hook in and return custom fields where needed.
  * These `formfield_for_*` methods now pass around `request` so that you can easily modify fields based on request (as in #3987).

Fixes #8306, #3987, #9148.

Thanks to James Bennet for the original patch; Alex Gaynor and Brian Rosner also contributed.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-16 15:32:31 +00:00
Jacob Kaplan-Moss
1f84630c87 Fixed #6470: made the admin use a URL resolver.
This *is* backwards compatible, but `admin.site.root()` has been deprecated. The new style is `('^admin/', include(admin.site.urls))`; users will need to update their code to take advantage of the new customizable admin URLs.

Thanks to Alex Gaynor.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9739 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-14 20:22:25 +00:00
Jacob Kaplan-Moss
ffeb1d0465 Fixed #9346: fixed comment upgrade SQL in documentation. Thanks, mt.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9732 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-12 17:31:40 +00:00
Jacob Kaplan-Moss
3990d00f20 Fixed #9959: fixed comment documentation example showing how to get a preview.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9731 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-12 17:29:01 +00:00
Adrian Holovaty
e9b90d9899 Edited ref/contrib/csrf.txt changes from [9554]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9593 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-08 04:15:19 +00:00
Malcolm Tredinnick
89ada943ee Fixed #9705 -- Call the Netherlands by their real name in the localflavor
documentation.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9580 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-07 03:42:25 +00:00
Luke Plant
9ec9936413 Updated csrf docs with 'versionadded' info
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9555 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-03 00:44:12 +00:00
Luke Plant
9eedc7bd0b New CsrfMiddleware features: automatic exceptions for known AJAX and decorator for manual exceptions
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9554 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-03 00:34:18 +00:00
Malcolm Tredinnick
644ad9073f Fixed #9477 -- Removed and edited a bunch of references to "development
version". Some were replaced with versionadded or versionchanged directives.
Other, more minor ones, were removed altogether.

Based on a patch from James Bennett.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9454 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-15 05:51:25 +00:00
Malcolm Tredinnick
599852d04d Fixed #9507 -- Correct an example in the admin docs. Thanks, john_scott and
SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9432 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-14 07:49:51 +00:00
Karen Tracey
c672e44ea9 Fixed #9556 - typos in syndication docs. Thanks sedden.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9373 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-09 19:01:34 +00:00
Karen Tracey
c483583023 Fixed #9497 - Doc typos. Many thanks ramiro.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9330 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-02 20:43:20 +00:00
Karen Tracey
d4f4ab8535 Fixed #9487 -- Corrected several links into the Python docs that were broken by the recent Python docs refactor.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9312 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-01 19:02:09 +00:00
Malcolm Tredinnick
514fba5b92 Fixed #9291 -- Tweaked a piece of example code slightly to set a good example
for others (now uses an encoding that is guaranteed to work for XML consumers).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9133 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 06:18:41 +00:00
James Bennett
1b733aa10d Fixed #9149: Fixed reST error in syndication docs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9078 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-21 07:43:58 +00:00
Russell Keith-Magee
7faa23d69c Fixed #9121: Corrected markup in the form preview docs. Thanks to Jarek Zgoda for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-18 15:57:47 +00:00
Adrian Holovaty
c1bed37715 Fixed #9103 -- Added django.contrib.admin to the docs modindex (I think)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9051 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-17 04:52:25 +00:00
Russell Keith-Magee
47091ab5b5 Fixed #9032: Corrected some minor typos in the admin docs. Thanks to rduffield for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9028 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-14 12:59:39 +00:00
Russell Keith-Magee
ea0fe604d8 Fixed #9078: Added commas to the example URLconf lines so that they can be easily copied and pasted. Thanks to mo.longman@gmail.com for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9026 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-14 09:39:04 +00:00
Russell Keith-Magee
e600d00b44 Fixed #9067: Added a note that you can register a model with the admin without providing a ModelAdmin object. Thanks to Rob Hudson for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9024 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-14 08:58:16 +00:00
Adrian Holovaty
74f386dba2 Fixed #8979 -- Made a bunch of typo/formatting fixes to the docs. Thanks, ramiro
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-09 01:54:20 +00:00
Adrian Holovaty
908f0a66e3 Small wording improvements to sitemaps.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-07 22:56:03 +00:00
Adrian Holovaty
756fa95bd2 Fixed #8727 -- Fixed broken link to Italian SSN page in localflavor.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8976 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-06 23:44:42 +00:00
Adrian Holovaty
83dd70fddb Fixed #8909 -- Fixed typo in contenttypes docs. Thanks, arien
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8973 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-06 16:49:31 +00:00
James Bennett
a92d511a17 Fixed #8804: corrected URL example in sitemaps docs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8905 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-03 04:42:49 +00:00
Brian Rosner
c1de41f4d2 Fixed #7973 -- Added exclude to BaseModelAdmin to make everything consistent with the form/formset factories. Refs #8071 to make it easier to get at exclude. Thanks julien for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-02 17:26:24 +00:00
Jacob Kaplan-Moss
b1f5ed00cb Fixed #7943: added documentation on overriding admin templates. Thanks, mwdiers
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8858 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-02 16:47:45 +00:00
Jacob Kaplan-Moss
1156db790a Added a rough draft of the 1.0 porting guide, and an obviously incomplete placeholder for the 1.0 release notes. Thanks to daonb, patrickf, and ramiro for contributions to this porting guide. Refs #8438.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8856 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-02 16:27:47 +00:00
Jacob Kaplan-Moss
64a9469127 Fixed #8753: converted "new in ..." callouts to proper Sphinx "versionadded/versionchanged" directives. Thanks to Marc Fargas for all the heavy lifting here.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-02 03:40:42 +00:00
James Bennett
c7a10b677d Fixed #8786: Moved phone number field docs to localflavor
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8830 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-02 00:26:28 +00:00
Jacob Kaplan-Moss
3a18002bbd Fixed #8210 and #8664: moved USStateField and PhoneNumberField to django.contrib.localflavor.us. This is a backwards-incompatible change, albeit a minor one; just add an aditional import and go on your way.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8819 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-01 22:15:35 +00:00
James Bennett
6ba55eee30 Fixed #8679: use full signature of Model.save() in docs and remove no-longer-used 'raw' argument
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-31 08:55:08 +00:00
James Bennett
5e26fceb83 Fixed #8721: Clarification in docs for form previews
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8753 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-31 07:54:31 +00:00
James Bennett
0a11c13acf Fix inadvertent formatting introduced in [8732]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8739 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-30 06:02:14 +00:00
James Bennett
b02d2aba1c Fixed #8700: Corrected example in localflavor docs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8738 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-30 05:39:34 +00:00
James Bennett
3fc6b10a0e Fixed #8516: Corrected typos in UK localflavor documentation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8734 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-30 05:32:28 +00:00
James Bennett
3a7fc0c797 Fixed #8247: Added explanation to admin docs to point out that AdminSite can be subclassed and instantiated like any other Python class
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8732 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-30 05:29:19 +00:00
Brian Rosner
c113133dad Fixed #7893 -- Gave fieldsets dictionary options a better visual display to set aside from other options in the ModelAdmin due to some name clashing causing confusion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-29 17:02:06 +00:00
Jacob Kaplan-Moss
2e7a87c53c Fixed a typo in comments upgrade guide.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8667 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-28 16:27:19 +00:00
Russell Keith-Magee
545cd6d6f0 Fixed #8583: Modified the migration SQL described in the comments upgrade docs to account for a problem found with freecomments using Postgres. Thanks to rajeshd for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8653 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-28 11:43:54 +00:00
Russell Keith-Magee
ab28e72f31 Fixed #8590: Added clarification that you need to install the new comments system before trying to port data. Thanks to julien for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8652 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-28 11:39:27 +00:00
Jacob Kaplan-Moss
52c3c3a349 Fixed an error in comment upgrade SQL.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8595 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-26 19:59:54 +00:00
Jacob Kaplan-Moss
c5cc26ff99 Fixed some Sphinx markup in signals docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8591 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-26 19:23:59 +00:00
Jacob Kaplan-Moss
6f29ad31b5 Fixed #8326: added signals documentation.
Thanks to MercuryTide's signal whitepaper from 2006 (http://www.mercurytide.co.uk/whitepapers/django-signals/) for inspiration and ideas for organization, and to the folks who got the Signals wiki page together for some of the content.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8590 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-26 19:04:52 +00:00
Jacob Kaplan-Moss
c5c61b261e Fixed #8555: corrected get_comment_form tag documentation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8581 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-26 15:23:02 +00:00
Jacob Kaplan-Moss
6abe0460c8 Fixed a silly typo in comment settings doc.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8558 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-25 22:34:27 +00:00
Jacob Kaplan-Moss
cba91997a2 Refactored Django's comment system.
Much of this work was done by Thejaswi Puthraya as part of Google's Summer of Code project; much thanks to him for the work, and to them for the program.

This is a backwards-incompatible change; see the upgrading guide in docs/ref/contrib/comments/upgrade.txt for instructions if you were using the old comments system.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8557 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-25 22:14:22 +00:00
Russell Keith-Magee
ac858a2a61 Fixed #7996: Added a note that you need to register your site with Google in order for the ping_google command to work. Thanks to Jason Broyles (issya) for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8519 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-24 09:19:18 +00:00
Russell Keith-Magee
87170c72f9 Fixed #8475 -- Corrected typo in example code in syndication docs. Thanks to bernd for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8512 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-24 07:45:35 +00:00
Jacob Kaplan-Moss
97cb07c3a1 Massive reorganization of the docs. See the new docs online at http://docs.djangoproject.com/.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8506 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-23 22:25:40 +00:00