mirror of
				https://github.com/django/django.git
				synced 2025-10-31 01:25:32 +00:00 
			
		
		
		
	
			
				
					
						
					
					c90b15e1d64d9561243f976ea42c763e0640d9fa
				
			
			
		
	git-svn-id: http://code.djangoproject.com/svn/django/trunk@11880 bcc190cf-cafb-0310-a4f2-bffc1f526a37
				
					
					Fixed #12385: Made built-in field type descriptions in admindocs translatable again.  Many thanks to Ramiro for the problem report and patch.
				
			
			
				
					
					MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions.
				
			
			
				
					
					Fixed #9977 - CsrfMiddleware gets template tag added, session dependency removed, and turned on by default.
				
			
			
				
					
					Fixed #10263 -- Added a queryset argument to BaseInlineFormSet, normalizing with BaseModelFormSet, and allowing for custom ordering/subsets in inlines. Thanks to Paulo Scardine for the 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://botland.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.