mirror of
				https://github.com/django/django.git
				synced 2025-10-31 09:41:08 +00:00 
			
		
		
		
	
			
				
					
						
					
					fb8a7702a022e5d85398838ab1a0a797519ac9cc
				
			
			
		
	git-svn-id: http://code.djangoproject.com/svn/django/trunk@9355 bcc190cf-cafb-0310-a4f2-bffc1f526a37
				
					
					Fixed #9518 -- Corrected example JSON snippet in fixture documentation. Thanks to claude@2xlibre.net for the report.
				
			
			
				
					
					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.
				
			
				
					
					Fixed #9218 -- Simplified the fix from #9039 and added tests to ensure this case doesn't break again (and that the simplification didn't break anything).
				
			
			
				
					
					Fixed #9418 -- When saving a model form, defer saving of file-type fields until after other fields, so that callable upload_to methods can use data from the other fields.  Thanks to Bernd Schlapsi for the report and initial 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://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.