Also updated svnmerge metadata to reflect other changesets that have already been applied to the branch. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
[1.0.X] Fixed #10601 -- Fixed edit inline display in admin for right-to-left locales. r10524 from trunk.
[1.0.X] Fixed #10779 -- Corrected description of an example in the files docs. Thanks to timo for the patch.
MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions.
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.
[1.0.X] Fixed #10002: inline file uploads now correctly display prior data. Thanks, dgouldin. Backport of r10588 from trunk.
[1.0.X] Fixed #9122: generic inline formsets now respect exclude and max_num. Thanks, Alex Robbins. Backport of [10586] from trunk.
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.
Languages
Python
96.2%
JavaScript
2%
HTML
1.4%
CSS
0.4%