mirror of https://github.com/django/django.git
002dbd16b4
It was causing too many inconvenient and unintended problems when merging legitimate subclasses (e.g. with geo-django classes). There's still a hook there that we use when merging ValueQuerySets, but if you try to merge two disparate QuerySets and it breaks all that happens is you get to keep both pieces. We're no longer penalising the useful usages just for the people who aren't concentrating. Fixed #7113. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7742 bcc190cf-cafb-0310-a4f2-bffc1f526a37 |
||
---|---|---|
django | ||
docs | ||
examples | ||
extras | ||
scripts | ||
tests | ||
AUTHORS | ||
INSTALL | ||
LICENSE | ||
MANIFEST.in | ||
README | ||
setup.cfg | ||
setup.py |
README
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://simon.bofh.ms/logger/django/ . * Join the django-users mailing list, or read the archives, at http://groups.google.com/group/django-users. To contribute to Django: * Check out http://www.djangoproject.com/community/ for information about getting involved.