1
0
mirror of https://github.com/django/django.git synced 2024-12-24 10:05:46 +00:00
Go to file
Jacob Kaplan-Moss fd28d04c39 Merge branch 'master' into upstream-trunk
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-16 21:03:09 +00:00
django Merge branch 'master' into upstream-trunk 2009-02-16 21:03:09 +00:00
docs Auth-related doc cleanups: 2009-02-16 05:10:31 +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 Removed outdated "adminindex" command -- the same behavior is now far easier and better done in a template, or perhaps a custom AdminSite.index function. Refs #5500. 2008-08-25 18:53:18 +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 Fixed #9214: EmailMessage now respects the From header instead of blindly using from_email. Thanks, Tai Lee. 2009-02-16 20:47:39 +00:00
AUTHORS Fixed #10196: Restored setting of image file width and height fields lost in r9766, and added tests for this function. Thanks to vicvicvic for the ticket and patch and for Alex for reminding me not to break non-PIL-boxes with the new tests. 2009-02-16 18:34:28 +00:00
INSTALL Fixed #8876 -- Fixed incorrect path to install.txt in INSTALL. Thanks, Tom Radcliffe 2008-09-06 00:07:14 +00:00
LICENSE Updated LICENSE file to acknowledge individual copyrights as well (after 2008-08-09 14:40:51 +00:00
MANIFEST.in Added the GEOS and GDAL interface licenses to the manifest template. 2008-11-17 18:08:42 +00:00
README Cleaned up a bunch of minor doc stuff: 2008-09-02 16:42:13 +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 Ensure generated package name does not contain spaces; this will make Django easy_installable from the Cheese Shop. 2008-11-15 05:39:06 +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://docs.djangoproject.com/en/dev/. If you're just getting started, here's
how we recommend you read the docs:

    * First, read docs/intro/install.txt for instructions on installing Django.

    * Next, work through the tutorials in order (docs/intro/tutorial01.txt,
      docs/intro/tutorial02.txt, etc.).

    * If you want to set up an actual deployment server, read
      docs/howto/deployment/modpython.txt for instructions on running Django
      under mod_python.

    * You'll probably want to read through the topical guides (in docs/topics)
      next; from there you can jump to the HOWTOs (in docs/howto) for specific
      problems, and check out the reference (docs/ref) for gory details.

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://oebfare.com/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.