Michael DiBernardo 
							
						 
					 
					
						
						
							
						
						bb8a087949 
					 
					
						
						
							
							[1.6.x]  Fixed   #21137  -- Documented best practice for URLconfs with repeated pattern prefixes.  
						
						... 
						
						
						
						Backport of 222460a994 
						
						
					 
					
						2013-09-21 18:18:16 -04:00 
						 
				 
			
				
					
						
							
							
								Aymeric Augustin 
							
						 
					 
					
						
						
							
						
						0ad178c43d 
					 
					
						
						
							
							[1.6.x] Clarified why one must not catch database errors inside atomic.  
						
						... 
						
						
						
						Backport of 4db2752 
						
						
					 
					
						2013-09-20 21:57:39 +02:00 
						 
				 
			
				
					
						
							
							
								Markus Amalthea Magnuson 
							
						 
					 
					
						
						
							
						
						9888bb28ee 
					 
					
						
						
							
							[1.6.x] Added missing "in" in sentence.  
						
						... 
						
						
						
						Backport of 2c5c422d34 
						
						
					 
					
						2013-09-19 13:29:48 -04:00 
						 
				 
			
				
					
						
							
							
								Ramiro Morales 
							
						 
					 
					
						
						
							
						
						c0625a74ce 
					 
					
						
						
							
							[1.6.x] Reworded a paragraph in the logging docs.  
						
						... 
						
						
						
						9d12f68a53 
					
						2013-09-16 17:52:13 -03:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						b05639dcac 
					 
					
						
						
							
							[1.6.x]  Fixed   #20887  -- Added a warning to GzipMiddleware in light of BREACH.  
						
						... 
						
						
						
						Thanks EvilDMP for the report and Russell Keith-Magee
for the draft text.
Backport of da843e7dba 
						
						
					 
					
						2013-09-11 08:18:48 -04:00 
						 
				 
			
				
					
						
							
							
								Kevin Christopher Henry 
							
						 
					 
					
						
						
							
						
						4f0ea1aca4 
					 
					
						
						
							
							[1.6.x] Documentation -- Improved description of cache arguments  
						
						... 
						
						
						
						- Fixed some grammar and formatting mistakes
- Added the type and default for CULL_FREQUENCY
- Made the note on culling the entire cache more precise. (It's actually
  slower on the filesystem backend.)
Backport of 5eca021d48 
						
						
					 
					
						2013-09-11 07:43:24 -04:00 
						 
				 
			
				
					
						
							
							
								Aymeric Augustin 
							
						 
					 
					
						
						
							
						
						f9f792eb04 
					 
					
						
						
							
							[1.6.x] Took advantage of django.utils.six.moves.urllib.*.  
						
						... 
						
						
						
						Backport of 6a6428a36 
						
						
					 
					
						2013-09-10 21:29:31 +02:00 
						 
				 
			
				
					
						
							
							
								e0ne 
							
						 
					 
					
						
						
							
						
						276e053803 
					 
					
						
						
							
							[1.6.x]  Fixed   #16895  -- Warned about cost of QuerySet ordering  
						
						... 
						
						
						
						Thanks outofculture at gmail.com for the suggestion.
Backport of cbf08c6b0c 
						
						
					 
					
						2013-09-09 09:49:15 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						c03848b540 
					 
					
						
						
							
							[1.6.x]  Fixed   #21068  -- Added some docs for DiscoverRunner  
						
						... 
						
						
						
						Thanks jcd.
Backport of e4b012feeb 
						
						
					 
					
						2013-09-07 16:11:03 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						2ab2d0fb25 
					 
					
						
						
							
							[1.6.x] Fixed a link in topics/testing/overview.txt  
						
						... 
						
						
						
						Backport of 0c295a7718 
						
						
					 
					
						2013-09-06 17:41:43 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						da44a8bdc2 
					 
					
						
						
							
							[1.6.x]  Fixed   #20646  -- Clarified the use of AbstractBaseUser.REQUIRED_FIELDS  
						
						... 
						
						
						
						Thanks craigbruce.
Backport of db3de52807 
						
						
					 
					
						2013-09-06 16:06:46 -04:00 
						 
				 
			
				
					
						
							
							
								Eric Boersma 
							
						 
					 
					
						
						
							
						
						180b9955cc 
					 
					
						
						
							
							[1.6.x]  Fixed   #21035  -- Changed docs to treat the acronym SQL phonetically.  
						
						... 
						
						
						
						The documentation and comments now all use 'an' to
refer to the word SQL and not 'a'.
Backport of 4d13cc56de 
						
						
					 
					
						2013-09-05 20:16:14 -04:00 
						 
				 
			
				
					
						
							
							
								Aymeric Augustin 
							
						 
					 
					
						
						
							
						
						115318051c 
					 
					
						
						
							
							[1.6.x] Replaced "not PY3" by "PY2", new in six 1.4.0.  
						
						... 
						
						
						
						Conflicts:
	django/db/backends/oracle/base.py
	django/db/backends/sqlite3/base.py
	django/db/models/base.py
Backport of 365c3e8b 
						
						
					 
					
						2013-09-03 07:34:45 -05:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						c0fb6bdde3 
					 
					
						
						
							
							[1.6.x]  Fixed   #21002  -- Documented JSON session serialization requires string keys  
						
						... 
						
						
						
						Thanks jeroen.pulles at redslider.net for the report.
Backport of 3baf1d1042 
						
						
					 
					
						2013-09-03 07:49:59 -04:00 
						 
				 
			
				
					
						
							
							
								Loic Bistuer 
							
						 
					 
					
						
						
							
						
						64383e8349 
					 
					
						
						
							
							[1.6.x] Made the doc about translating string literals in templates more prominent.  
						
						... 
						
						
						
						Backport of 9885f07757 
						
						
					 
					
						2013-08-31 08:00:33 -04:00 
						 
				 
			
				
					
						
							
							
								Phaneendra Chiruvella 
							
						 
					 
					
						
						
							
						
						68eca2b36f 
					 
					
						
						
							
							[1.6.x] Minor spelling correction in ModelForms docs  
						
						... 
						
						
						
						Backport of 2fbf949760 
						
						
					 
					
						2013-08-28 07:12:38 -04:00 
						 
				 
			
				
					
						
							
							
								Krzysztof Jurewicz 
							
						 
					 
					
						
						
							
						
						544a190ebf 
					 
					
						
						
							
							[1.6.x]  Fixed   #20981  -- Noted the default value of disable_existing_loggers.  
						
						... 
						
						
						
						Backport of 095643e691 
						
						
					 
					
						2013-08-27 10:27:44 -04:00 
						 
				 
			
				
					
						
							
							
								Jan Böcker 
							
						 
					 
					
						
						
							
						
						c4e2e4f630 
					 
					
						
						
							
							[1.6.x] Fixed typo in docs/topics/conditional-view-processing.txt  
						
						... 
						
						
						
						Backport of 5fd2c979cb 
						
						
					 
					
						2013-08-27 09:22:31 -04:00 
						 
				 
			
				
					
						
							
							
								Ramiro Morales 
							
						 
					 
					
						
						
							
						
						2a166623a6 
					 
					
						
						
							
							[1.6.x] Typos introduced in  57c82f909b.  
						
						
						
						
					 
					
						2013-08-22 22:33:59 -03:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						5f061986b9 
					 
					
						
						
							
							[1.6.x]  Fixed   #20922  -- Allowed customizing the serializer used by contrib.sessions  
						
						... 
						
						
						
						Added settings.SESSION_SERIALIZER which is the import path of a serializer
to use for sessions.
Thanks apollo13, carljm, shaib, akaariai, charettes, and dstufft for reviews.
Backport of b0ce6fe656 
						
						
					 
					
						2013-08-22 17:55:01 -04:00 
						 
				 
			
				
					
						
							
							
								Kevin Christopher Henry 
							
						 
					 
					
						
						
							
						
						bf9382fb02 
					 
					
						
						
							
							[1.6.x] Documentation -- Clarified use of 'view' in test client introduction.  
						
						... 
						
						
						
						Backport of 2e926b041c 
						
						
					 
					
						2013-08-22 09:39:14 -04:00 
						 
				 
			
				
					
						
							
							
								Ramiro Morales 
							
						 
					 
					
						
						
							
						
						26a4c83598 
					 
					
						
						
							
							[1.6.x] Made description of LANGUAGE_CODE setting more clear.  
						
						... 
						
						
						
						297f5af222 
					
						2013-08-22 08:29:59 -03:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						43f12f368b 
					 
					
						
						
							
							[1.6.x]  Fixed   #20890  -- Added missing import in class-based view docs.  
						
						... 
						
						
						
						Thanks André Augusto.
Backport of ab680725bf 
						
						
					 
					
						2013-08-10 18:08:27 -04:00 
						 
				 
			
				
					
						
							
							
								Leandro Regueiro 
							
						 
					 
					
						
						
							
						
						4c90081b5b 
					 
					
						
						
							
							[1.6.x] Added section labels in cache docs  
						
						... 
						
						
						
						Backport of 709cd2c4b7 
						
						
					 
					
						2013-08-06 11:56:31 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						06f484dcf9 
					 
					
						
						
							
							[1.6.x]  Fixed   #20862  -- Updated startproject MIDDLEWARE_CLASSES in docs.  
						
						... 
						
						
						
						Thanks Keryn Knight.
Backport of 26c4bd38ac 
						
						
					 
					
						2013-08-05 08:16:56 -04:00 
						 
				 
			
				
					
						
							
							
								Justin Michalicek 
							
						 
					 
					
						
						
							
						
						77293f9354 
					 
					
						
						
							
							[1.6.x]  Fixed   #20855  -- Added documentation of current_app and extra_context params to django.contrib.auth views  
						
						... 
						
						
						
						refs #5298  and refs #8342 
Backport of 61ecb5f48a 
						
						
					 
					
						2013-08-04 08:05:36 -04:00 
						 
				 
			
				
					
						
							
							
								Alasdair Nicol 
							
						 
					 
					
						
						
							
						
						ccef8b2aa2 
					 
					
						
						
							
							[1.6.x] Added missing request argument to example in URL dispatcher docs  
						
						... 
						
						
						
						Backport of a0c58113b9 
						
						
					 
					
						2013-08-03 19:36:15 -04:00 
						 
				 
			
				
					
						
							
							
								minusf 
							
						 
					 
					
						
						
							
						
						518faa19c1 
					 
					
						
						
							
							[1.6.x] Misc doc cleanups.  
						
						... 
						
						
						
						Backport of 70c080fcdb 
						
						
					 
					
						2013-07-29 07:06:29 -04:00 
						 
				 
			
				
					
						
							
							
								Jannis Leidel 
							
						 
					 
					
						
						
							
						
						c456a27725 
					 
					
						
						
							
							[1.6.x]  Fixed   #20774  -- Mention the new django-localflavor app as a replacement for the contrib app. Backport from master.  
						
						
						
						
					 
					
						2013-07-29 12:05:47 +02:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						192154fb17 
					 
					
						
						
							
							[1.6.x] Fixed ReST typo in topics/class-based-views/mixins.txt  
						
						... 
						
						
						
						Backport of 0b35a2cce3 
						
						
					 
					
						2013-07-28 14:10:11 -04:00 
						 
				 
			
				
					
						
							
							
								Sergio Oliveira 
							
						 
					 
					
						
						
							
						
						496f319970 
					 
					
						
						
							
							[1.6.x] LocaleMiddleware isn't default anymore (corrected docs)  
						
						... 
						
						
						
						Changed in @23229061fcb836ecca2195cc75f91e331279a5d1
Backport of cf6c754629 
						
						
					 
					
						2013-07-19 06:36:26 -04:00 
						 
				 
			
				
					
						
							
							
								Matt Deacalion Stevens 
							
						 
					 
					
						
						
							
						
						e7435fbe2f 
					 
					
						
						
							
							[1.6.x] Fixed Croatia's country code in localflavor docs  
						
						... 
						
						
						
						Backport of 97e5398629 
						
						
					 
					
						2013-07-19 05:30:55 -04:00 
						 
				 
			
				
					
						
							
							
								Loic Bistuer 
							
						 
					 
					
						
						
							
						
						b7556a4980 
					 
					
						
						
							
							[1.6.x]  Fixed   #20772  -- Fixed minor typo in form media docs.  
						
						... 
						
						
						
						Backport of aa41eb9b8b 
						
						
					 
					
						2013-07-19 05:19:46 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						579ca9ee8d 
					 
					
						
						
							
							[1.6.x]  Fixed   #20762  -- Clarified that add_fieldsets is not a standard ModelAdmin attribute.  
						
						... 
						
						
						
						Backport of dce8945ea6 
						
						
					 
					
						2013-07-18 12:41:51 -04:00 
						 
				 
			
				
					
						
							
							
								Loic Bistuer 
							
						 
					 
					
						
						
							
						
						ed473d61e5 
					 
					
						
						
							
							[1.6.x] Reworked docs for ModelForm validation.  
						
						... 
						
						
						
						Backport of fba6c2ede7 
						
						
					 
					
						2013-07-16 19:21:55 -04:00 
						 
				 
			
				
					
						
							
							
								David Binetti 
							
						 
					 
					
						
						
							
						
						f8fd38b560 
					 
					
						
						
							
							[1.6.x] Fixed grammatical error in auth docs  
						
						... 
						
						
						
						Backport of 51b50c47c7 
						
						
					 
					
						2013-07-14 12:35:26 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						fe0a563f81 
					 
					
						
						
							
							[1.6.x]  Fixed   #20730  -- Fixed "Programmatically creating permissions" error.  
						
						... 
						
						
						
						Thanks glarrain for the report.
Backport of 684a606a4e 
						
						
					 
					
						2013-07-11 11:07:51 -04:00 
						 
				 
			
				
					
						
							
							
								SusanTan 
							
						 
					 
					
						
						
							
						
						c1b24b09f4 
					 
					
						
						
							
							[1.6.x]  Fixed   #18261  -- Clarified 'project root directory'  
						
						... 
						
						
						
						Backport of ef3fddf26e 
						
						
					 
					
						2013-07-09 07:16:31 -04:00 
						 
				 
			
				
					
						
							
							
								James Bennett 
							
						 
					 
					
						
						
							
						
						b2afe39663 
					 
					
						
						
							
							[1.6.x]  Fixed   #19695  -- Retitle "Form Media" to "Form Assets".  
						
						... 
						
						
						
						Backport of c0f03175ce 
						
						
					 
					
						2013-07-08 14:09:02 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						730069197f 
					 
					
						
						
							
							[1.6.x]  Fixed   #16965  -- Clarified Formset can_delete docs.  
						
						... 
						
						
						
						Thanks gregcorey@ for the suggestion.
Backport of 660c30ed95 
						
						
					 
					
						2013-07-08 12:21:25 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						cf8d0933cb 
					 
					
						
						
							
							[1.6.x]  Fixed   #12346  -- Added a note on how to validate InlineFormSets.  
						
						... 
						
						
						
						Thanks johnsmith for the suggestion.
Backport of 181f63c22d 
						
						
					 
					
						2013-07-08 08:31:46 -04:00 
						 
				 
			
				
					
						
							
							
								Claude Paroz 
							
						 
					 
					
						
						
							
						
						a9dd6221af 
					 
					
						
						
							
							[1.6.x]  Fixed   #20224  -- Update docs examples which mention __unicode__  
						
						... 
						
						
						
						Thanks Marc Tamlyn and Tim Graham for the review.
Backport of 7442eb1a24 
						
						
					 
					
						2013-07-05 19:30:08 +02:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						541a30c376 
					 
					
						
						
							
							[1.6.x]  Fixed   #20134  -- Correct list of fields that UserManager requires.  
						
						... 
						
						
						
						Thanks semenov and pegler.
Backport of da5069f68f 
						
						
					 
					
						2013-07-04 10:20:02 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						25b9939fed 
					 
					
						
						
							
							[1.6.x]  Fixed   #20690  -- Mentioned LOCALE_PATHS earlier in translation docs.  
						
						... 
						
						
						
						Thanks rene@ for the suggestion.
Backport of 231e31c690 
						
						
					 
					
						2013-07-04 05:45:16 -04:00 
						 
				 
			
				
					
						
							
							
								SusanTan 
							
						 
					 
					
						
						
							
						
						75041d5ea3 
					 
					
						
						
							
							[1.6.x]  Fixed   #20609  -- Documented how to use request.user with RequestFactory  
						
						... 
						
						
						
						Thanks michel@ for the suggestion.
Backport of 067e0424ce 
						
						
					 
					
						2013-07-03 11:11:04 -04:00 
						 
				 
			
				
					
						
							
							
								Tomáš Ehrlich 
							
						 
					 
					
						
						
							
						
						2f9e5483f6 
					 
					
						
						
							
							[1.6.x]  Fixed   #20687  -- Added documentation for django.core.signing API.  
						
						... 
						
						
						
						Thanks Baptiste Mispelon for the suggestion.
Backport of c5bc98d7e1 
						
						
					 
					
						2013-07-03 10:38:53 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						5ecdf0eb9c 
					 
					
						
						
							
							[1.6.x] A couple more semicolon -> colon fixes; refs  #18134 .  
						
						... 
						
						
						
						Backport of 3632d289de 
						
						
					 
					
						2013-07-02 14:16:22 -04:00 
						 
				 
			
				
					
						
							
							
								Baptiste Mispelon 
							
						 
					 
					
						
						
							
						
						e03a88ba21 
					 
					
						
						
							
							[1.6.x]  Fixed   #20659  -- Fixed PublisherDetail in CBV topic documentation.  
						
						... 
						
						
						
						Backport of 88de53d4a8 
						
						
					 
					
						2013-07-01 14:10:03 +02:00 
						 
				 
			
				
					
						
							
							
								Aymeric Augustin 
							
						 
					 
					
						
						
							
						
						0de21a6a7a 
					 
					
						
						
							
							Stopped branding Python 3 support as experimental.  
						
						
						
						
					 
					
						2013-07-01 11:52:00 +02:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						3493f18d78 
					 
					
						
						
							
							[1.6.x]  Fixed   #20667  - Removed discussion of DEBUG from tutorial.  
						
						... 
						
						
						
						Backport of 0d642aac86 from master. 
						
						
					 
					
						2013-06-30 14:56:10 -04:00