mirror of
https://github.com/django/django.git
synced 2025-10-24 06:06:09 +00:00
fa1cc23df339729af8c66bc42ee0ce717630f77e
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7645 bcc190cf-cafb-0310-a4f2-bffc1f526a37
MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions.
Fixed #7256 -- Corrected queryset code to return the correct set of columns when the query has an empty values() clause as well as extra selects from an extra() clause. Thanks to Nicolas Lara for the report and patch.
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.