1
0
mirror of https://github.com/django/django.git synced 2024-12-24 10:05:46 +00:00
Go to file
Malcolm Tredinnick 9c52d56f6f Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.

Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 02:50:16 +00:00
django Merged the queryset-refactor branch into trunk. 2008-04-27 02:50:16 +00:00
docs Merged the queryset-refactor branch into trunk. 2008-04-27 02:50:16 +00:00
examples MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions. 2006-05-02 01:31:56 +00:00
extras Fixed #6661: fixed a bug with bash completion and python -i. Thanks, Soeren Sonnenburg. 2008-02-25 19:38:09 +00:00
scripts Added a man page for django-admin.py. Also install it correctly as part of the 2007-06-10 06:33:31 +00:00
tests Merged the queryset-refactor branch into trunk. 2008-04-27 02:50:16 +00:00
AUTHORS Fixed #7086 -- Updated the Romanian translation. Thanks, Mihai Damian. 2008-04-26 12:46:57 +00:00
INSTALL Added section to INSTALL about an alternative install method that avoids using an Internet connection 2006-07-28 02:07:43 +00:00
LICENSE
MANIFEST.in Fixed #4077 -- Added Databrowse templates to MANIFEST.in. Thanks, Dirk Datzert 2007-04-18 18:18:56 +00:00
README Testing once again -- sorry!. 2007-11-28 21:55:59 +00:00
setup.cfg Fixed #3338, #3536, #3796 -- Fixed a bunch of setup and build problems in a 2007-04-03 12:28:19 +00:00
setup.py Changed setup.py to work no matter where it is called from. We were previously 2008-02-21 20:50:07 +00:00

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.