test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,408 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

1238 Commits

Author SHA1 Message Date
Malcolm Tredinnick ce0084fbfc Fixed #4202 -- Corrected namespacing of exception in one of the examples. 
Thanks, luftyluft@gmail.com.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5161 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-08 02:48:38 +00:00
Malcolm Tredinnick 00d2fb7e70 Fixed #4226 -- Added DATABASE_NAME to the list of settings required to be 
mentioned in the settings file for the tests to run. Thanks, Paul Smith.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5160 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-08 02:33:10 +00:00
Malcolm Tredinnick a374bf9d50 Removed "new in development version" warning, since this feature was in the 
0.96 release.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5159 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-08 02:27:30 +00:00
Malcolm Tredinnick c2a13da823 Fixed #4242 -- Changed docs to use full name for the Brazilian Portugese language. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5158 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-08 02:25:02 +00:00
Russell Keith-Magee f073797f4c Added assertFormError, assertTemplateUsed and assertTemplateNotUsed for use during unit testing. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5156 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-07 12:34:18 +00:00
Adrian Holovaty 64adc41377 Edited docs/email.txt changes from [5141] and other recent changesets 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5155 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-06 04:23:12 +00:00
Adrian Holovaty 3d52993b46 Finally began proofreading docs/testing.txt. Did the intro for now; more to come 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-06 03:59:37 +00:00
Russell Keith-Magee 36b164d838 Backwards incompatible change: Changed the way test.Client.login operates. Old implemenation was fragile, and tightly bound to forms. New implementation interfaces directly with the login system, is compatible with any authentication backend, and doesn't depend upon specific template inputs being available. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5152 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-05 15:16:15 +00:00
Russell Keith-Magee a0ef3ba2f7 Added a default test Client to TestCase, and added some assertions for some common testing patterns. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5150 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-05 03:03:33 +00:00
Malcolm Tredinnick e986e8aba4 Added "new in development version" markers to new email stuff. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5147 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-03 17:52:38 +00:00
Malcolm Tredinnick 5ff1d96a52 Fixed #3307 -- Added BCC support to the EmailMessage class. En-passant, fixed a 
number of RST formatting errors in the email docs.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5146 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-03 14:38:45 +00:00
Malcolm Tredinnick 7a84ad93e6 Fixed #2897 -- Added support for TLS connections to email handling. This means 
servers like Google's SMTP server can now be used for admin emails.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5144 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-03 13:35:02 +00:00
Malcolm Tredinnick 95d7cb27d0 Fixed #3366 -- Part 1 of the email code refactoring and feature extension. This 
part refactors email sending into a more object-oriented interface in order to
make adding new features possible without making the API unusable. Thanks to
Gary Wilson for doing the design thinking and initial coding on this.

Includes documentation addition, but it probably needs a rewrite/edit, since
I'm not very happy with it at the moment.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5141 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-03 11:35:11 +00:00
Adrian Holovaty 1f88c7fc67 Fixed #4201 -- Fixed pre-MR style code example in docs/sessions.txt. Thanks, Collin Grady 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5140 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-02 22:10:12 +00:00
Adrian Holovaty d82860ec07 Fixed #4068 -- Fixed incorrect docstring in docs/syndication_feeds.txt. Thanks, Jeff Hilyard and Vinay Sajip 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-02 20:31:15 +00:00
Adrian Holovaty 4b41fb4ba9 Fixed #4034 -- Updated docs/documentation.txt to reflect the removal of build_documentation.py 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-02 20:27:37 +00:00
Adrian Holovaty 0b265e6a2b Fixed #4139 -- Fixed typo in docs/templates_python.txt. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5137 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-02 20:24:36 +00:00
Malcolm Tredinnick 94cb93edca Fixed #4188 -- Removed the explicit list of default LANGUAGES setting values, 
because it will keep getting out of date. Replaced it with a pointer to the
source of the that list.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5129 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-01 02:13:34 +00:00
Malcolm Tredinnick 372f43a574 Fixed #4181 -- Corrected anchor names in links to settings document. Thanks, 
Karen Tracey.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5121 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-28 14:32:16 +00:00
Malcolm Tredinnick fe0f238841 Fixed #4175 -- Fixed a couple of ReST markup errors. Thanks, Matt McClanahan. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5120 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-28 14:23:41 +00:00
Adrian Holovaty 812c261006 Made small formatting tweaks to docs/settings.txt and docs/email.txt changes from [5111] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5115 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-28 04:08:31 +00:00
Malcolm Tredinnick ec577d88ea Fixed up some omissions and one mysteriously documented, yet non-existent field 
in the validator documentation. Patch from alang@bright-green.com. Refs #2266.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-27 15:06:45 +00:00
Malcolm Tredinnick 1c2fdf1ebd Fixed #4163 -- Added some "quick notes" documentation about the configuration 
variables required to send email. Thanks, Karen Tracey.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5111 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-27 14:25:05 +00:00
Adrian Holovaty 38d8e84248 Edited docs/install.txt changes from [5085] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5096 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-26 14:58:18 +00:00
Adrian Holovaty bf89e4b151 Added note about Django development version to docs/authentication.txt change from [5073] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5094 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-26 14:52:40 +00:00
Adrian Holovaty 2944320eba Added 'New in Django development version' note to docs/settings.txt changes from [5072], and fixed alphabetizing 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5093 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-26 14:51:50 +00:00
Malcolm Tredinnick 21d9387cea Fixed #4158 -- Fixed a small formatting typo. Thanks, SmileyChris. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5085 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-26 10:29:55 +00:00
Malcolm Tredinnick 2a7d9ef23f Fixed #3316 -- Added support for crypt hashing of passwords, mostly to support 
easy porting from existing Unix-based legacy apps. Thanks, axiak@mit.edu.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5073 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-25 09:34:29 +00:00
Malcolm Tredinnick 5dfe74f221 Fixed #3185 -- Made values for login, logout and post-login redirect URLs 
configurable. This is a combined patch from Vasily Sulatskov, Marc Fargas and
Collin Grady.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5072 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-25 08:49:57 +00:00
Malcolm Tredinnick 939f678e65 Fixed #3857 -- Used a table to describe the required arg for FileField. This 
makes it consistent with other argument descriptions. Thanks, whiteinge.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5066 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-25 06:38:23 +00:00
Adrian Holovaty 39aa40d108 Fixed #4133 -- Fixed broken links in docs. Thanks, Gary Wilson 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5064 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-24 05:58:03 +00:00
Simon Willison 53eddd4a0f Added HTTP_HOST example header 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5063 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-23 21:24:41 +00:00
Malcolm Tredinnick c2b1986525 Fixed #4101 -- Clarified a potentially confusing URL pattern in one example. 
Thanks, Collin Grady.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5050 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-21 04:21:45 +00:00
Malcolm Tredinnick 8ffb8001b4 Fixed #4097 -- Updated distribution information for Fedora and Gentoo, based on 
research by Gary Wilson.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5049 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-21 04:18:15 +00:00
Malcolm Tredinnick 24118edf21 Added a note that MySQLdb versions prior to 1.2.1p2 will only work with 
mysql_old backend. Refs #3786.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5044 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-20 13:33:09 +00:00
Malcolm Tredinnick b786cc1017 Changed all URL references for django_admin/ to the canonical name of 
django-admin/. This will avoid problems with missing HTTP redirects in future
historical documents. Refs #3992.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5040 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-20 09:22:01 +00:00
Malcolm Tredinnick 6f78709985 Changed all references to tutorial1/ to be tutorial01/ (and similarly for 
tutorials 2, 3 and 4). This matches the canonical name we use under
djangoproject.com/documentation/ as well as the source filename. Should avoid
problems with archived documentation and missing HTTP redirects. Refs #4013.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5039 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-20 09:15:30 +00:00
Adrian Holovaty 3b55c34704 Fixed ReST error in docs/databrowse.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5012 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-16 22:00:29 +00:00
Adrian Holovaty 30fb62d71a Added django.contrib.databrowse 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5011 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-16 21:56:10 +00:00
Russell Keith-Magee 83c4c53120 Fixed #4038 -- Added reference to django.contrib.webdesign in the template docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5010 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-16 11:26:07 +00:00
Russell Keith-Magee d46a826840 Refs #3786 -- Added reference to database-specific documentation in install.txt. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5009 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-16 11:11:16 +00:00
Adrian Holovaty 73269ec8bc Fixed #4029 -- Fixed some broken links and made some links relative in docs/model-api.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5005 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-13 01:19:44 +00:00
Adrian Holovaty e9e728c212 Fixed #3786 -- Fixed sqlinitialdata references in some docs. Thanks, Ramiro Morales 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5004 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-13 01:01:57 +00:00
Russell Keith-Magee ebfa5b0406 Fixed #3830 -- Added installation note on removing old versions of Django (especially eggs) before installing a new version. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4999 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-12 13:59:09 +00:00
Russell Keith-Magee 49ae68925c Fixed #3956 -- Minor typo in template docs. Thanks, Nick Fishman. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4998 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-12 11:12:45 +00:00
Adrian Holovaty a02e13c7da Edited docs/syndication_feeds.txt changes from [4982] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4988 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-09 15:48:08 +00:00
Russell Keith-Magee bbeb62c9af Backwards-incompatible change -- Removed LazyDate helper class. To preserve existing functionality, query arguments can now be callable. Callable query arguments are evaluated with the query is evaluated. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-09 13:28:09 +00:00
Malcolm Tredinnick 3720154027 Clarified that there is no feed-level description element in Atom feeds and the 
subtitle element (and model attribute) may be a substitute in many cases.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4982 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-09 12:35:05 +00:00
Malcolm Tredinnick e4671d158c Fixed #3916 -- Small tweak to information in tutorial 2. Based on a patch from 
Simon Greenhill.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-09 12:16:46 +00:00
Malcolm Tredinnick 1c7a264a96 Fixed #3909 -- Added a couple of small clarifications to django-admin.py 
documentation. Thanks, adurdin@gmail.com.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4978 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-09 12:11:19 +00:00
Adrian Holovaty 421be9fb2a Edited docs/url_dispatch.txt changes from [4901] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4966 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-09 02:07:04 +00:00
Adrian Holovaty a698afe392 Fixed #3893 -- Changed docs/legacy_databases.txt examples to use manage.py instead of django-admin.py. Thanks, Kashif Razzaqui 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4965 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-09 01:47:15 +00:00
Adrian Holovaty 099022c6aa Added note to docs/django-admin.txt about the examples using django-admin.txt but the examples being just as relevant for manage.py. Refs #3893 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-09 01:44:26 +00:00
Adrian Holovaty 7693000788 Fixed #3933 -- Updated docs/documentation.txt to reflect the lack of comments on documentation. Thanks, Paul B. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4960 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-09 01:13:49 +00:00
Adrian Holovaty 0498eb30cb Fixed #3935 -- Fixed typo in docs/modpython.txt. Thanks, alexis@smirnov.ca 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4958 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-09 01:06:09 +00:00
Adrian Holovaty 7fd887b2d7 Fixed #3939 -- Fixed typo in docs/modpython.txt. Thanks, jack.mangels@mexpro.com 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4957 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-09 01:05:21 +00:00
Adrian Holovaty 1c12cb0f76 Fixed #3968 -- Fixed typo in docs/request_response.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4956 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-09 01:04:19 +00:00
Russell Keith-Magee dabd96646c Fixed #3790 -- Fixed a problem with sequence resetting during fixture loads when using Postgres. Thanks to Jon Ballard and scott@staplefish.com for the report, and to Zach Thompson for suggesting a solution. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4937 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-06 02:25:58 +00:00
Adrian Holovaty 87471549b3 Fixed #3913 -- Fixed legacy/confusing 'mysite.settings.main' in docs/faq.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4915 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-03 21:57:15 +00:00
Malcolm Tredinnick b6f085aa43 Typo fix. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4903 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-01 07:36:06 +00:00
Malcolm Tredinnick d882656ea3 Added the ability to name URL patterns. Helps with disambiguity reverse matches. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4901 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-01 07:25:20 +00:00
Adrian Holovaty a071609a70 More ReST antics with docs/fastcgi.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4900 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-01 06:44:17 +00:00
Adrian Holovaty 9a6261a837 Fixed ReST error in docs/fastcgi.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4899 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-01 06:42:35 +00:00
Adrian Holovaty 9b6a518e17 Edited faq.txt and fastcgi.txt changes from [4897] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4898 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-01 06:40:01 +00:00
Malcolm Tredinnick 72dfcab0d4 Fixed #3047 -- Updated fastcgi documentation to mention SCGI and AJP support. 
Thanks Barry Pederson and Simon Greenhill.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-01 06:00:45 +00:00
Malcolm Tredinnick 78b86d7eeb Fixed #3889 -- Fixed incorrect anchor in link. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4895 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-01 05:32:44 +00:00
Adrian Holovaty da1d001ce1 Edited docs/model-api.txt permalink changes from [4879] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4891 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-01 05:22:14 +00:00
Adrian Holovaty 99fbb7b62b Documented HttpResponseBadRequest. Refs #3847 and [4867] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4890 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-01 05:18:47 +00:00
Russell Keith-Magee f271e0896b Fixed #2841 -- Clarified documentation on procedure for field validation. Thanks, dave@avaragado.org. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4886 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-01 01:25:01 +00:00
Russell Keith-Magee 9191fa1f64 Fixed #3532 -- Made spaceless template tag remove all spaces, rather than preserving a single space. Thanks for the suggestion, ampaze@gmx.net. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4885 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-01 01:09:21 +00:00
Malcolm Tredinnick d7cf8eb406 Fixed #3540 -- Updated permalink documentation to fix an error and document how 
to pass keyword arguments.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-31 11:35:06 +00:00
Malcolm Tredinnick 1ccdcbf765 Fixed #3801 -- Added note about double-escaping Windows paths when configuring 
mod_python.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4877 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-31 09:40:27 +00:00
Malcolm Tredinnick 179b5b8422 Fixed #3840 -- Attempted to clarify how to specify the settings file 
configuration for mod_python.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4864 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-30 06:16:41 +00:00
Adrian Holovaty 97e65d1c9d Fixed ReST error in docs/webdesign.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4858 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-30 01:50:46 +00:00
Adrian Holovaty d22e39c10d Fixed #3799 -- Added django.contrib.webdesign and moved 'lorem' template tag into there 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-30 01:50:06 +00:00
Russell Keith-Magee c1a73d80da Fixed #3253 -- Included test errors in the return code. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-29 11:59:31 +00:00
Russell Keith-Magee 5f68a26ff4 Fixes #3799 -- Oops - ran last checkin from the wrong directory. Checked in the rest of the lorem templatetag implementation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4848 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-29 11:43:24 +00:00
Russell Keith-Magee 4dab533f7e Fixed #3858 -- Updated pieces of tutorial 1 to reflect recent changes. Thanks to Kashif Razzaqui for the report, and Simon for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4846 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-29 11:05:44 +00:00
Russell Keith-Magee 4a6c7e75c2 Fixed #3855 -- Fixed typo in testing docs. Thanks for the report adamduren@gmail.com, and thanks to Simon for working up the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4845 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-29 10:55:48 +00:00
Adrian Holovaty e2937ef6a0 Fixed #3814 -- Fixed HTML typo in docs/templates.txt regroup section. Thanks, djangorat@shitsoftware.com 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-27 22:30:59 +00:00
Adrian Holovaty 9a2a9a9fe8 Fixed #3781 -- Improved docs/add_ons.txt to clarify use of contrib apps. Thanks, Simon G. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4833 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-27 22:18:52 +00:00
Adrian Holovaty 932928a1e2 Edited docs/templates.txt changes from [4830] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4832 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-27 19:02:32 +00:00
Jacob Kaplan-Moss 45f9217cbd Cleaned up the docs from [4830] a bit. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4831 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-27 17:30:57 +00:00
Jacob Kaplan-Moss d6fd9fb22b Fixed #3826: added a {% with %}. Thanks, SmileyChris. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4830 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-27 17:25:56 +00:00
Adrian Holovaty a5bb14ed2e Fixed #3648 -- Added support for cmemcached Python library. Thanks, floguy@gmail.com 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4827 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-25 23:29:31 +00:00
Adrian Holovaty 9c10a2f118 Fixed #3793 -- Fixed grammar in docs/release_notes_0.96.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4826 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-25 23:22:37 +00:00
Adrian Holovaty 293d6cf284 Fixed #3816 -- Fixed typo in docs/sessions.txt. Thanks, jon austin 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4825 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-25 23:22:04 +00:00
Adrian Holovaty 5d079ee214 Added start of 'Creating custom fields' section to docs/newforms.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4819 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-25 21:06:12 +00:00
Adrian Holovaty bd8c2fead8 Fixed typo in docs/django-admin.txt. Refs #3786 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-25 18:09:43 +00:00
Jacob Kaplan-Moss ae7568b9c6 Removed note about setuptools from install.txt -- it's not correct any more. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-23 21:18:08 +00:00
Jacob Kaplan-Moss 334499d6f3 Fixed explicit reference to 0.95 in install.txt. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4811 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-23 21:16:32 +00:00
James Bennett 1c13d05043 Remove notes about things added/removed in development version, since the development version is about to become 0.96 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4804 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-23 20:45:30 +00:00
James Bennett 7155d7100c One more typo in the notes 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4803 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-23 20:43:44 +00:00
James Bennett a3d427138d Hopefully finalized release notes 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4802 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-23 20:43:10 +00:00
James Bennett 05e248e5cd Correcting formatting styles in release notes 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-23 20:42:32 +00:00
James Bennett 0cf10f0c28 Fix broken link in MySQLdb notes 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4800 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-23 20:41:19 +00:00
James Bennett c858dfa217 Minor reordering of sections in 0.96 release notes 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4799 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-23 20:39:59 +00:00
James Bennett af1aa1baea Note non-availability of DATABASE_OPTIONS in mysql_old backend 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-23 14:01:14 +00:00
James Bennett da8e722a63 Some work on the 0.96 release notes 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4781 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-23 06:25:54 +00:00
Russell Keith-Magee 6a7a155860 Clarified documentation on submission of multiple selections using test client. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4779 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-23 02:07:56 +00:00
Jacob Kaplan-Moss 2efd343a7c Added draft release notes for 0.96 (which should be coming closer...) 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4778 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-22 22:16:53 +00:00
Russell Keith-Magee e63ff1d8ce Fixed #3772 -- Minor fix to serialization docs. Thanks, SmileyChris. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4775 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-22 12:54:23 +00:00
Adrian Holovaty 635fedcfa8 Added links to Textile, Markdown and ReST Wikipedia pages in docs/add_ons.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-22 03:52:17 +00:00
Malcolm Tredinnick dcc8442390 Added a mysql_old backend that matches the mysql backend prior to [4724]. This 
is only for backwards compatibility purposes.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4767 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-21 03:27:03 +00:00
Adrian Holovaty f765aa4e44 Cleaned up docs/databases.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4749 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-16 15:42:58 +00:00
Adrian Holovaty cecd520671 Tightened docs/i18n.txt change from [4707] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4748 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-16 15:23:28 +00:00
Adrian Holovaty b14ff2f94d Tightened change to docs/model-api.txt from [4692] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4746 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-16 15:17:20 +00:00
Adrian Holovaty 0a0151b831 Tightened change to docs/contributing.txt from [4689] so that the action comes first, to be consistent with other bullet points 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4745 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-16 15:13:31 +00:00
Adrian Holovaty 64fae18505 Fixed typo in docs/distributions.txt. Thanks, Rick v H 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4743 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-16 15:05:14 +00:00
Adrian Holovaty 5d60faf33d Fixed small typo in docs/django-admin.txt. Thanks, Cort 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4742 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-16 15:02:21 +00:00
Malcolm Tredinnick f9c4ce5123 Fixed #2635 -- Added improved MySQL backend support from Andy Dustman. Also 
added database.txt documentation; currently only describing Django-related
features of MySQL versions.

As of this commit, there are four known test failures due to (a) no transaction
support with MyISAM storage engine and (b) MySQLdb automatically creating
decimal types for Django's "float" field.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4724 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-14 12:08:19 +00:00
Malcolm Tredinnick 5295f54b3c Fixed #1049 -- Documented the need to implement flatten_data() in some cases for custom 
ChangeManipulator replacements. Thanks, Michael Radziej.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4711 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-12 12:40:03 +00:00
Malcolm Tredinnick db03c7fa1d Added a note about serving admin media to the alternative server setup 
instructions. Refs #474.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4710 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-12 12:23:53 +00:00
Malcolm Tredinnick adbd80ae7f Fixed #3084 -- Fixed typo pointed out by Simon Greenhill. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4709 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-12 10:52:21 +00:00
Malcolm Tredinnick 2a488f3cd4 Fixed #3084 -- Documented that Django's core must be translated into a 
particular locale for application translations in that locale to work.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4707 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-12 09:02:18 +00:00
Malcolm Tredinnick ab64b38317 Fixed #2869 -- Do not append ADMIN_MEDIA_PREFIX to absolute-path URLs used for 
included javascript. Based on patches from SmileyChris and oyvind@saltvik.no.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-09 09:32:39 +00:00
Malcolm Tredinnick b6eee02007 Fixed #3685 -- Added note about keeping contributors' names in AUTHORS. Thanks, 
James Bennett.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-09 05:47:39 +00:00
Adrian Holovaty fb1ff06d32 Tightened up docs/contributing.txt changes from [4682] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4685 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-08 20:43:09 +00:00
Malcolm Tredinnick cdc79b71cb Fixed #3658 -- Included description of ticket resolution states in the 
contributors' documentation. Thanks, Simon Greenhill.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4682 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-08 08:56:34 +00:00
Malcolm Tredinnick 449ea76bf3 Fixed #3333 -- Made db-api.txt links relative, in line with the other docs. 
Thanks, Ramiro Morales.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4681 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-08 08:50:33 +00:00
Malcolm Tredinnick 98b2e0a035 Fixed #3646 -- Corrected documentation for ABSOLUTE_URL_OVERRIDES. Patch from 
James Bennett.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4672 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-07 12:23:01 +00:00
Malcolm Tredinnick d181aa0e94 Fixed typo. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4664 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-02 08:59:21 +00:00
Malcolm Tredinnick ac09ff9f96 Fixed #3628 -- Fixed a broken link spotted by Manoj Govindan. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4663 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-02 08:36:54 +00:00
Russell Keith-Magee 790b585819 Added option to pretty-print dumped fixture output 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-02 02:28:44 +00:00
Russell Keith-Magee f2582eb972 Fixes #2333 -- Added test fixtures framework. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-01 13:11:08 +00:00
Jacob Kaplan-Moss 633f0856d2 Fixed #3610: typo in django-admin.txt. Thanks, Yasushi Masuda. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4651 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-28 22:11:45 +00:00
Jacob Kaplan-Moss 7b0e321c55 Removed a stray colon in authentication.txt. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4650 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-28 22:01:52 +00:00
Adrian Holovaty a81a6e9abe Added note to docs/db-api.txt about 'depth' being new in Django development version 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-28 19:42:29 +00:00
Jacob Kaplan-Moss 37c66a0999 Fixed #3602: a few small doc fixes. Thanks, Jeremy Dunck 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4648 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-28 19:28:30 +00:00
Jacob Kaplan-Moss 28ad156f10 Fixed #3488: Added "b" option to date format filter. Thanks, Gary Wilson. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4647 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-28 16:18:55 +00:00
Jacob Kaplan-Moss 4477f50f0b Added a "depth" argument to select_related() to control how many "levels" of relations select_related() is willing to follow (refs #3275). 
Also added unit tests for select_related().

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4645 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-28 15:24:05 +00:00
Jacob Kaplan-Moss 9c2c03a974 Fixed #3598: Added a note about the precedence of URL matches versus extra kwargs in URL patterns. Thanks, Ubernostrum. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4638 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-27 20:11:26 +00:00
Jacob Kaplan-Moss b97636944d Fixed #2565: added a note about the laziness of querysets in tutorial 4. Thanks, Ubernostrum. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4637 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-27 04:27:47 +00:00
Jacob Kaplan-Moss a419079347 Fixed #2264: the docs now mention that delete() cascades. Thanks, Ubernostrum 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4636 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-27 03:48:49 +00:00
Jacob Kaplan-Moss ee9deca371 Fixed #3039: corrected example code in authentication.txt. Thanks, Ubernostrum. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4633 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-27 00:16:40 +00:00
Jacob Kaplan-Moss a8ed2b4d58 Fixed #3325: Added docs/distributions.txt, a guide to packaged versions of Django in Debian/Fedora/etc. Thanks to Marc Fargas and Ubernostrum for the patches. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4629 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-26 23:23:01 +00:00
Jacob Kaplan-Moss b581d73222 Fixed #834: Added documentation of the built-in authentication views. Thanks, Ubernostrum. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4627 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-26 22:19:03 +00:00
Adrian Holovaty b21fd1e451 Small cleanup of docs/model-api.txt change from [4625] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4626 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-26 21:52:22 +00:00
Jacob Kaplan-Moss 96604fdf8f Fixed #3455: added documentation of Model.get_FIELD_display(). Thanks, Ubernostrum. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4625 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-26 21:40:15 +00:00
Jacob Kaplan-Moss 9f1bf4659b Fixed #3364: Updated install.txt to recommend psycopg2. Thanks, Marc Fargas. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4624 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-26 21:39:09 +00:00
Jacob Kaplan-Moss 3e9c41d03b Fixed #3319: Added docs to django-admin.txt about reset and runfcgi. Thanks, Ubernostrum. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4623 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-26 21:36:14 +00:00
Adrian Holovaty 7b2c6984cd Improved error e-mail docs in docs/settings.txt from [4619] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4622 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-26 21:33:04 +00:00
Jacob Kaplan-Moss 36a514f818 Fixed #3279: Added a note about using MySQLdb 1.2.1 or later. Thanks, Marc Fargas. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4621 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-26 21:25:21 +00:00
Jacob Kaplan-Moss 702273d77b Fixed #3195: added a note in settings.txt about DEBUG and HIDDEN_SETTINGS. Thanks, cmgreen@uab.edu 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4620 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-26 21:22:21 +00:00
Jacob Kaplan-Moss e7fb31624a Fixed #3135: added some more explanation about how the various error email settings work together. Thanks, Simon G. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4619 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-26 21:18:31 +00:00
Jacob Kaplan-Moss b9522d0a52 Fixed #2592: Added a warning to tutorial 1 about not naming your project "site" or "django" or anything else similarly boneheaded. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4618 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-26 20:51:21 +00:00
Russell Keith-Magee f313e07b6e Fixed #3253 -- Exposed the number of failed tests as a return code in manage.py and runtests.py. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-26 12:52:01 +00:00
Jacob Kaplan-Moss abf79841fe Fixed #3397: You can now order by non-DB fields in the admin by telling Django which field to actually order by. Thanks, marcink@elksoft.pl 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4596 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-26 05:37:24 +00:00
Jacob Kaplan-Moss 3d164ab04f D'oh, fixed broken ReST in last commit. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4595 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-26 05:16:52 +00:00
Jacob Kaplan-Moss d7d73c9fac Fixed #3354: added a message to tutorial 1 about where to go for help. Thanks to Marc Fargas for the original patch, but I ended up going with a somewhat softer wording just to be double-plus-ultra-sure not to turn anyone off. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4594 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-26 05:15:52 +00:00