mirrors/django
mirrors/django
0
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-01 15:42:04 +01:00
Code Issues Releases Wiki Activity
19,076 Commits 28 Branches 423 Tags 717 MiB
11b7680d0e
Commit Graph

276 Commits

Author SHA1 Message Date
Adrian Holovaty
2ade1e916f Edited stuff from [17543] to [17629] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17630 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 17:16:52 +00:00
Jannis Leidel
d93a2ef887 Fixed #17568 -- Mentioned `reverse_lazy in the LOGIN_REDIRECT_URL` settings docs. Thanks, zsiciarz. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17626 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 16:56:04 +00:00
Timo Graham
d2988ce0f4 Fixed #17767 - Added signed cookie session backed to session engine settings docs; thanks Preston Holmes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-01 01:06:22 +00:00
Aymeric Augustin
6daad896fb Reverted r17577 because it's actually possible to use a time zone that isn't the system time zone without pytz, thanks to the TZ environment variable. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17578 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-22 21:42:50 +00:00
Aymeric Augustin
8842183448 Noted that TIME_ZONE must be the server time zone when time zone support is enabled and pytz isn't installed. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17577 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-22 21:13:36 +00:00
Timo Graham
7d7d2d354c Fixed #16758 - Added a warning regarding overriding default settings; thanks cyclops for the suggestion & Aymeric Augustin for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17566 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-20 19:08:22 +00:00
Aymeric Augustin
1d78897c5d Fixed #17166 -- Documented how FIXTURE_DIRS works in the inital data how-to, and edited related bits in the settings reference. 
Performed minor edits for consistency while I was there.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17558 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-19 09:02:52 +00:00
Aymeric Augustin
7a7ec73efe Fixed #16452 -- Clarified that the DATE/DATETIME/TIME_INPUT_FORMATS settings have no effect when USE_L10N is True. Thanks Travis Brooks. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17554 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-19 08:00:06 +00:00
Adrian Holovaty
7981efe04f Documentation (and some small source code) edits from [17432] - [17537] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17540 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-17 20:04:11 +00:00
Jannis Leidel
ec5e2f0ccc Fixed #17460 -- Extended the HIDDEN_SETTINGS constant in with a few more sensible names of settings to hide in the debug view. Many thanks to chomik, lpiatek and tomaszrybak. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17481 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-09 18:58:45 +00:00
Adrian Holovaty
d4f11eb776 Fixed incorrect 'setting::' prefix in settings.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17312 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 21:13:08 +00:00
Adrian Holovaty
61f0aff811 Fixed #14597 -- Added a SECURE_PROXY_SSL_HEADER setting for cases when you're behind a proxy that 'swallows' the fact that a request is HTTPS 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17209 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-16 22:06:06 +00:00
Jannis Leidel
6f66b55108 Fixed #17255 -- Removed "as" prefix from new timezone template filter names for the sake of clarity. Cheers to Aymeric Augustin for bearing with me. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17107 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-18 15:00:08 +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
Luke Plant
3b7a4c6adc Fixed #17117 - ADMIN_MEDIA_PREFIX should still be visible in docs 
Thanks to claudep for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17063 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-01 21:37:12 +00:00
Aymeric Augustin
67e6e0fcf3 Fixed #17087 -- Re-organized the i18n docs to reduce confusion between USE_I18N/USE_L10N and the concepts of internationalization/localisation. Re 
moved some duplicate content.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17026 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-22 17:17:57 +00:00
Carl Meyer
145a77edc9 Fixed #16360 -- Added WSGI entrypoint to startproject layout, and enabled internal servers (runserver and runfcgi) to use an externally-defined WSGI application. Thanks to Armin Ronacher, Jannis Leidel, Alex Gaynor, ptone, and Jacob Kaplan-Moss. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17022 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-22 04:30:10 +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
Aymeric Augustin
846fc7260a Fixed typo in r16935. Refs #17012. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16936 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-07 15:33:55 +00:00
Aymeric Augustin
510ea906f7 Fixed #17012 - Removed references to the 'hasNoProfanities' validator. Refs #8794. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16935 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-07 08:35:20 +00:00
Julien Phalip
fc06ec0daf Fixed #16876 -- Fixed a cross reference in the settings reference doc. Thanks to Gumnos for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16855 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-19 07:33:32 +00:00
Julien Phalip
357910c1c6 Rectified the settings reference documentation to indicate that USE_L10N (and not USE_I18N) controls the activation of locale-dictated formats. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-18 07:50:50 +00:00
Carl Meyer
00678334aa Fixed #16863 -- Corrected ReST markup to avoid errors building docs. 
Although directives such as "note" and "warning" will accept content
immediately following the directive, this is technically where arguments to the
directive should go (see http://sphinx.pocoo.org/rest.html#directives). Putting
the content there means that any lines beginning with an inline text role
(e.g. ":setting:`DEBUG`") will be mis-interpreted as an option block for the
directive. To avoid this error, there should always be a blank line between the
directive start and the directive content.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-16 18:06:42 +00:00
Carl Meyer
d1d6109229 Added release note and updated TEMPLATE_DEBUG documentation for r16833. Thanks jezdez for the reminder. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16841 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-16 17:07:19 +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
Russell Keith-Magee
893cea211a Added protection against spoofing of X_FORWARDED_HOST headers. A security announcement will be made shortly. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16758 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 00:46:38 +00:00
Alex Gaynor
d036b87126 Remove no-longer-valid references to the DATABASE_* settings, the legacy code for them was already removed. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16733 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-09 17:14:47 +00:00
Jannis Leidel
6819312c98 Fixed #15918 -- Refined documentation of the various localization settings, especially with regard to the thousand separator. Thanks, Aymeric Augustin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16727 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-08 13:25:17 +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
Julien Phalip
5c1b4ab75b Fixed #16729 -- Fixed a small typo in the settings reference doc. Thanks to simon.cruanes.2007@m4x.org for the report and to Aymeric Augustin for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-02 03:47:49 +00:00
Malcolm Tredinnick
f77666a4af Documented some Oracle-specific test settings. 
Patch from aaugustin that should help people with specific testing
requirements for Oracle set things up in their preferred way. The
settings have always existed, but now they are documented.

Fixes #16478.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16646 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-22 06:35:52 +00:00
Jannis Leidel
566b3295fa Fixed #16621 -- Fixed lots of typos in the docs. Thanks, Bernhard Essl. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16615 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-13 11:58:19 +00:00
Chris Beaven
956da729d1 Add a note to USE_L10N settings documentation that startproject sets USE_L10N = True 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16538 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-12 00:08:37 +00:00
Jannis Leidel
38a2444277 Fixed #16050 -- BACKWARDS-INCOMPATIBLE CHANGE: Moved static files of the admin to conventional file system location. 
This also removes the need for ADMIN_MEDIA_PREFIX and replaces it with the convention to find admin's static files at STATIC_URL + 'admin/'.

Thanks to Jacob for the review and general help.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-30 09:06:19 +00:00
Luke Plant
45e55b9143 Fixed #14614 - filtering of sensitive information in 500 error reports. 
This adds a flexible mechanism for filtering what request/traceback
information is shown in 500 error emails and logs. It also applies
screening to some views known to be sensitive e.g. views that handle
passwords.

Thanks to oaylanc for the report and many thanks to Julien Phalip for the
patch and the rest of the work on this.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16339 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-08 22:18:46 +00:00
Luke Plant
524c5fa07a Fixed #14261 - Added clickjacking protection (X-Frame-Options header) 
Many thanks to rniemeyer for the patch!

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-30 22:27:47 +00:00
Jannis Leidel
49f57a5d28 Fixed #15992 -- Added more references to settings. Thanks, aaugustin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-29 17:41:04 +00:00
Jannis Leidel
f60d428463 Fixed #12417 -- Added signing functionality, including signing cookies. Many thanks to Simon, Stephan, Paul and everyone else involved. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16253 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-21 14:41:14 +00:00
Luke Plant
8cbcf1d3a6 Fixed #14134 - ability to set cookie 'path' and 'secure' attributes of CSRF cookie 
Thanks to cfattarsi for the report and initial patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16200 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-09 23:00:22 +00:00
Luke Plant
bf7af2be15 Added clarifying note to docs for CSRF_COOKIE_DOMAIN 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16197 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-09 22:59:52 +00:00
Luke Plant
171df93170 Fixed #15954 - New IGNORABLE_404_URLS setting that allows more powerful filtering of 404s to ignore 
Thanks to aaugustin for implementing this.

(Technically this doesn't fix the original report, as we've decided against
having *any* default values, but the new feature makes it possible, and the
docs have an example addressing #15954).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16160 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-05 20:49:26 +00:00
Timo Graham
449e84a2f1 Fixed #15801 - Incorrect external link for dictConfig; thanks David Niergarth for the report; jonash for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16100 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-24 23:53:24 +00:00
Adrian Holovaty
f8495d2371 Fixed #15822 -- Removed references to the v1 postgresql backend (which has been removed). Thanks for the patch, aaugustin 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16034 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-17 20:45:06 +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
Ramiro Morales
f6e38f3800 Fixed #5494, #10765, #14924 -- Modified the order in which translations are read when composing the final translation to offer at runtime. 
This is slightly backward-incompatible (could result in changed final translations for literals appearing multiple times in different .po files but with different translations).

Translations are now read in the following order (from lower to higher priority):

For the 'django' gettext domain:

 * Django translations
 * INSTALLED_APPS apps translations (with the ones listed first having higher priority)
 * settings/project path translations (deprecated, see below)
 * LOCALE_PATHS translations (with the ones listed first having higher priority)

For the 'djangojs' gettext domain:

 * Python modules whose names are passed to the javascript_catalog view
 * LOCALE_PATHS translations (with the ones listed first having higher priority, previously they weren't included)

Also, automatic loading of translations from the 'locale' subdir of the settings/project path is now deprecated.

Thanks to vanschelven, vbmendes and an anonymous user for reporting issues, to vanschelven, Claude Paroz and an anonymous contributor for their initial work on fixes and to Jannis  Leidel and Claude for review and discussion.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15441 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-07 18:48:40 +00:00
Carl Meyer
76fb2bb0e2 Fixed some documentation and default-settings.py comments that were misleading about the purpose of STATIC_ROOT, and removed an unused import. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15384 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-01 14:28:07 +00:00
Jannis Leidel
8fe42053bc Reworded parts of the staticfiles documentation after receiving various user feedback. Thanks, all! 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15369 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-30 17:23:25 +00:00
Ramiro Morales
f81d4ba5b3 Fixed #14038 -- Added information to release notes and version changed|added markers to documentation additions for the new template loeaders API introduced in version 1.2. Thanks 3point2 for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15309 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-25 15:42:24 +00:00
Jannis Leidel
544ab30ed7 Fixed #6218 -- Made MEDIA_URL and STATIC_URL require a trailing slash to ensure there is a consistent way to combine paths in templates. Thanks to Michael Toomim, Chris Heisel and Chris Beaven. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15130 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-02 01:33:11 +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
Russell Keith-Magee
673e6fc7fb Fixed #11675 -- Added support for the PyLibMC cache library. In order to support this, and clean up some other 1.3 caching additions, this patch also includes some changes to the way caches are defined. This means you can now have multiple caches, in the same way you have multiple databases. A huge thanks to Jacob Burch for the work on the PyLibMC backend, and to Jannis for his work on the cache definition changes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15005 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-21 15:19:19 +00:00
Jannis Leidel
dad28e8557 Fixed #14103 -- Take USE_ETAGS setting into account when patching the response headers. Thanks, trbs and Eric Holscher. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14885 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:57:17 +00:00
Gabriel Hurley
0ab50aad36 Fixed #13605 -- Improved documentation of the django.core.files.storage module. Added documentation for DefaultStorage, get_storage_class, FileSystemStorage, and some missing public methods on Storage. New metadata targets included for everything. Thanks to kopernikus for the report and elbarto for contributing to the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14831 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-05 06:45:34 +00:00
Russell Keith-Magee
50e3b9d028 Added versionadded markup to the TEST_DEPENDENCIES setting. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14824 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-05 01:23:23 +00:00
Russell Keith-Magee
d53fd71acb Corrected incomplete and incorrect docs from r14822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-05 01:03:39 +00:00
Timo Graham
3cbaf3c2b6 Fixed #14781 - Setting "CACHE_PREFIX" should be "CACHE_KEY_PREFIX". Thanks to adamv for report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14713 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-26 13:38:39 +00:00
Russell Keith-Magee
78be884ea7 Fixed #3304 -- Added support for HTTPOnly cookies. Thanks to arvin for the suggestion, and rodolfo for the draft patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14707 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-26 13:30:50 +00:00
Gabriel Hurley
25f3eda3cc Fixed #14738 -- Improved crossref linking for cache settings, and fixed a few minor typos. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14676 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-22 06:15:02 +00:00
Russell Keith-Magee
99d247f4cb Fixed #13795 -- Added a site-wide cache prefix and cache versioning. Thanks to bruth for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14623 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-19 15:39:35 +00:00
Jannis Leidel
33d8fcde8a Fixed #14693, #14709 -- Backwards incompatible change to rectify the confusion around the STATICFILES_URL and STATICFILES_ROOT settings. 
* Two new global settings that will be used by -- **but are not limited to** -- the staticfiles app: STATIC_ROOT and STATIC_URL.

  * Moving the 'django.contrib.staticfiles.templatetags.staticfiles' template tag to the core ('django.templatetags.static') and renaming it to 'get_static_prefix'.

  * Moving the context processor 'django.contrib.staticfiles.context_processors.staticfiles' to the core ('django.core.context_processors.static') and renaming it to 'static'.

  * Paths in media definitions will use STATIC_URL as the prefix if the value is not None, and falls back to the previously used MEDIA_URL.

Thanks again to the community for constructive criticism and Carl and Russ for sanity-inducing discussions on IRC.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-17 15:36:26 +00:00
Chris Beaven
ea145923fc Better cross-referencing of the USE_THOUSAND_SEPARATOR setting in documentation. Thanks to Klaas van Schelven for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14578 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-16 21:33:48 +00:00
Luke Plant
d9ae7c6b37 Corrected default value for ADMIN_MEDIA_PREFIX in docs, and added info about how it integrates with staticfiles. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14551 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-13 03:55:06 +00:00
Jannis Leidel
70edd4e103 Reverted deprecation of media context processor (from r14293) to separate static files and media files a bit more. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-11 21:44:33 +00:00
Jannis Leidel
8e96584f63 Fixed #14524, #14582, #14617, #14665 and #14667 -- Tweaked staticfiles app. 
* Updated StaticFilesHandler and AdminMediaHandler
  to make use of the 404 handler if needed.

* Updated runserver management command to serve static files
  only in DEBUG mode (or if specified the --insecure option)
  and if the staticfiles app is in INSTALLED_APPS. Also added
  an option to disable serving completely (--nostatic).

* Added check in debug mode if STATICFILES_* settings are
  different to MEDIA_* settings.

* Removed a faulty PendingDeprecationWarning in AdminMediaHandler
  that is triggered every time runserver is used.

* Fixed an issue with the modification time checks when
  running collectstatic.

* Extended and refined documentation.

Thanks to everyone for input, especially to Carl Meyer, Ted Kaemming and
Adam Vandenberg for patches.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14533 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-11 21:43:49 +00:00
Jacob Kaplan-Moss
d30fe03e6b Fixed #14641 - a handful of grammer/typo fixes. 
Thanks, programmerq.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14497 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-08 20:37:52 +00:00
Gabriel Hurley
11b012038c Fixed #14600 -- Added a versionchanged directive to the TEMPLATE_CONTEXT_PROCESSORS setting reference, and added a currentmodule directive to the staticfiles docs so that the crossref targets would point to the right place even with full paths in the staticfiles docs. Thanks to mathijs for the report and suggested text. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14479 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-06 23:30:10 +00:00
Gabriel Hurley
bb062c376f Fixed #14584 -- Documented settings.PASSWORD_RESET_TIMEOUT_DAYS. Also fixed some cross-refs in the neighborhood. Thanks to hop for the report and Adam Mckerlie for the draft patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14437 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-02 11:53:01 +00:00
Gabriel Hurley
a200cc6d54 Fixed #14541 -- Corrected an outdated bit of wording in the LANGUAGES setting docs. Thanks to akelm for the report and suggested fix. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14333 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-23 22:14:57 +00:00
Ramiro Morales
f9def8b873 Fixed #14463 -- Fixed links to new location of date/time format specifiers docs. 
Thanks epicserve for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14325 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-23 14:52:01 +00:00
Jannis Leidel
cfc19f84de Fixed #12323 and #11582 -- Extended the ability to handle static files. Thanks to all for helping with the original app, the patch, documentation and general support. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14293 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-20 01:33:24 +00:00
Gabriel Hurley
ace6519fae Fixed #14058 -- Clarified information on OPTIONS setting (for adding additional parameters when connecting to a database) and linked to Database Backend docs. Thanks to chris@cwroofs for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14114 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 07:58:50 +00:00
Gabriel Hurley
888168003a Fixed #14228 -- Added additional information on what the APPEND_SLASH setting does. Thanks to ttencate for the report and draft text. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14110 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 06:36:38 +00:00
Russell Keith-Magee
240f68e4e5 Fixed #14388 -- Corrected some typos in the logging docs. Thanks to varikin, gremmie, Ramiro Morales and Gabriel Hurley for the reviews. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13982 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-05 00:11:41 +00:00
Russell Keith-Magee
24acca4139 Fixed #12012 -- Added support for logging. Thanks to Vinay Sajip for his draft patch, and to the many people who gave feedback during development of the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-04 15:12:39 +00:00
Russell Keith-Magee
331bf80904 Fixed #14154 -- Corrected grammar error in settings docs. Thanks to d00gs for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13633 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-23 13:50:28 +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
0331913a77 Fixed #13727 -- Corrected alphabetical sorting in settings docs. Thanks to adamv. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13527 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-07 02:43:14 +00:00
Karen Tracey
454622c6f9 Fixed #13676: Corrected some links into the Python docs. Thanks carljm and Tryphon. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13326 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-07 03:08:33 +00:00
Karen Tracey
887da3154a Fixed #13685: Correct the default value for EMAIL_BACKEND listed in the settings ref. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13316 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-02 17:57:10 +00:00
Jacob Kaplan-Moss
2311bcbd01 Fixed #13624: added SIGNATURE to the list of settings to hide on debug pages. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13315 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-28 17:25:43 +00:00
Russell Keith-Magee
fed660e425 Refs #12288 -- Clarified that application names must be unique. Thanks to Piotr Czachur for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13219 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-10 14:04:16 +00:00
Russell Keith-Magee
3057a59ec4 Fixed #11933 -- Corrected the naming of the cached_db session backend. Thanks to mb0@mb0.org for the report and Gabriel Hurley for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13169 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-09 06:44:12 +00:00
Russell Keith-Magee
663d17897e Fixed #13497 -- Corrected various typos and markup problems in docs. Thanks to Ramiro Morales for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13144 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-09 04:23:43 +00:00
Russell Keith-Magee
962defed0a Fixed #13200 -- Updated the DB session backend to make full use of routers, deprecating the need for the SESSION_DB_ALIAS setting. Thanks to rokclimb15 for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12844 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-25 10:29:06 +00:00
James Bennett
5c256ddeec Fixed #13072: Corrected a few markup and formatting errors in the documentation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12759 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-11 09:41:29 +00:00
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
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
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
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
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
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
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
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
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
Luke Plant
5957052acb Corrected bad example for DATABASES setting 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12010 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-28 13:13:04 +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
Jannis Leidel
9233d04265 Fixed #7980 - Improved i18n framework to support locale aware formatting (dates and numbers) and form processing. 
Thanks to Marc Garcia for working on this during his Google Summer of Code 2009!

Additionally fixes #1061, #2203, #3940, #5526, #6449, #6231, #6693, #6783, #9366 and #10891.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-22 17:58:49 +00:00
Russell Keith-Magee
ff60c5f9de Fixed #1142 -- Added multiple database support. 
This monster of a patch is the result of Alex Gaynor's 2009 Google Summer of Code project.
Congratulations to Alex for a job well done.

Big thanks also go to:
 * Justin Bronn for keeping GIS in line with the changes,
 * Karen Tracey and Jani Tiainen for their help testing Oracle support
 * Brett Hoerner, Jon Loyens, and Craig Kimmerer for their feedback.
 * Malcolm Treddinick for his guidance during the GSoC submission process.
 * Simon Willison for driving the original design process
 * Cal Henderson for complaining about ponies he wanted.

... and everyone else too numerous to mention that helped to bring this feature into fruition.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-22 15:18:51 +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
Russell Keith-Magee
0e49b397f9 Corrected the default value of the EMAIL_BACKEND in the settings docs. This time for real. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11717 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-04 05:51:13 +00:00
Russell Keith-Magee
aa0141912e Corrected the default value of the EMAIL_BACKEND in the settings docs. Thanks to Alex Gaynor for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-04 05:47:32 +00:00
Russell Keith-Magee
aba5389326 Fixed #10355 -- Added an API for pluggable e-mail backends. 
Thanks to Andi Albrecht for his work on this patch, and to everyone else that contributed during design and development.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11709 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-03 12:53:26 +00:00
Luke Plant
2ddf1364c4 Added 'version added' info to CSRF_* settings. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11665 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-27 01:10:20 +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
Russell Keith-Magee
7c18404a24 Fixed #11312 -- Fixed the default value given for DEFAULT_FILE_STORAGE in the docs. THanks to x00nix@gmail.com for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11046 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 13:33:18 +00:00
Adrian Holovaty
a251e0ab7e Fixed #11070 -- Removed JING_PATH setting, which was no longer used. Thanks for the patch, seanl 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10840 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-26 05:32:52 +00:00
Luke Plant
cdc8c61bc3 Made default MIDDLEWARE_CLASSES same as in project_template. 
And updated docs, and also corrected them about middleware by removing
'XViewMiddleware'



git-svn-id: http://code.djangoproject.com/svn/django/trunk@10129 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-23 23:20:40 +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
Luke Plant
4e7a4eda3d Updated all refs to default middleware in docs. 
(adding CSRF, removing XView which is no longer a default)



git-svn-id: http://code.djangoproject.com/svn/django/trunk@10095 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-19 23:28:16 +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
870a6ec20c Fixed #6979 -- Fixed the documentation cross-reference between the TIME_ZONE 
setting and manual settings configuration.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9175 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-06 11:18:30 +00:00
Russell Keith-Magee
48d41cf78e Fixed #8371: Added a note warning Windows users about the use of forward slashes when specifying the DATABASE_NAME setting. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9084 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-22 11:10:39 +00:00
Malcolm Tredinnick
11e29c887a Fixed some misordered markup for the ROOT_URLCONF setting in the docs. 
Fixed #9098.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9061 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-17 07:59:05 +00:00
Adrian Holovaty
a5e0c5b182 Fixed #8580 -- Hyperlinked some module names in settings.txt. Thanks, msaelices 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8983 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-07 23:08:01 +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
Jacob Kaplan-Moss
ff420b4364 Fixed #8454: added a FILE_UPLOAD_PERMISSIONS setting to control the permissoin of files uploaded by the built-in file storage system. Thanks, dcwatson. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-27 22:21:14 +00:00
Malcolm Tredinnick
9de848cec9 Fixed #8544 -- Some more documentation markup fixes from Thejawsi Puthraya. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8612 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-27 05:57:27 +00:00
Malcolm Tredinnick
5577b96ae4 Fixed #8526 -- Corrected the default value for the SESSION_FILE_PATH documentation. Thanks, Piotr Lewandowski. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8611 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-27 05:57:10 +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