mirror of
https://github.com/django/django.git
synced 2025-01-28 19:19:20 +00:00
Malcolm Tredinnick
c2556874d4
Fixed #1980, #2155 -- made date, time and datetime html2python methods a bit
more consistent in their return values. All three now return None when the passed in string cannot be converted to the required object (this is assumed elsewhere). git-svn-id: http://code.djangoproject.com/svn/django/trunk@3277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Fixes #2202 -- Added ability to customize output of pluralize filter to handle irregular cases (walrus/walruses, cherry/cherries). Thanks to gid for the suggestion and the initial patch
MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions.
Django is a high-level Python Web framework that encourages rapid development and clean, pragmatic design. All documentation is in the "docs" directory and online at http://www.djangoproject.com/documentation/. If you're just getting started, here's how we recommend you read the docs: * First, read docs/install.txt for instructions on installing Django. * Next, work through the tutorials in order (docs/tutorial01.txt, docs/tutorial02.txt, etc.). * If you want to set up an actual deployment server, read docs/modpython.txt for instructions on running Django under mod_python. * The rest of the documentation is of the reference-manual variety. Read it -- and the FAQ -- as you run into problems. Docs are updated rigorously. If you find any problems in the docs, or think they should be clarified in any way, please take 30 seconds to fill out a ticket here: http://code.djangoproject.com/newticket To get more help: * Join the #django channel on irc.freenode.net. Lots of helpful people hang out there. Read the archives at http://loglibrary.com/179 . * Join the django-users mailing list, or read the archives, at http://groups-beta.google.com/group/django-users. To contribute to Django: * Check out http://www.djangoproject.com/community/ for information about getting involved.