django1

Author	SHA1	Message	Date
Malcolm Tredinnick	a9c2f033cd	Upgraded included simplejson to 2.0.7. Also changed importing logic to prefer a system-installed version of simplejson (unless it's an earlier version that does not contian the C speedups), then the json module from Python 2.6, then the version shipped with Django. Fixed #9266. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9707 bcc190cf-cafb-0310-a4f2-bffc1f526a37	2009-01-06 05:13:02 +00:00
Karen Tracey	2efa5f80d6	Fixed #9374 -- Added missing close paren in serialization doc. Thanks jordy. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9318 bcc190cf-cafb-0310-a4f2-bffc1f526a37	2008-11-01 20:14:36 +00:00
Jacob Kaplan-Moss	5697f87914	Fixed #8701 , a couple of bad links in the docs. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8941 bcc190cf-cafb-0310-a4f2-bffc1f526a37	2008-09-03 20:23:18 +00:00
Jacob Kaplan-Moss	97cb07c3a1	Massive reorganization of the docs. See the new docs online at http://docs.djangoproject.com/. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8506 bcc190cf-cafb-0310-a4f2-bffc1f526a37	2008-08-23 22:25:40 +00:00