mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Merged recent Django trunk changes.

Browse Source
This commit is contained in:
Russell Keith-Magee
2012-09-23 14:50:11 +08:00
parent 6494bf91f2 8599f64e54
commit 0229209c84
93 changed files with 548 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
docs/internals/committers.txt
View File

@@ -407,6 +407,18 @@ Jeremy Dunck
.. _vlogger: http://youtube.com/bryanveloso/
.. _shoutcaster: http://twitch.tv/vlogalonstar/
`Preston Holmes`_
Preston is a recovering neuroscientist who originally discovered Django as
part of a sweeping move to Python from a grab bag of half a dozen
languages. He was drawn to Django's balance of practical batteries included
philosophy, care and thought in code design, and strong open source
community. In addition to his current job in private progressive education,
Preston contributes some developer time to local non-profits.
Preston lives with his family and animal menagerie in Santa Barbara, CA, USA.
.. _Preston Holmes: http://www.ptone.com/
Specialists
-----------

2
docs/internals/deprecation.txt
View File

@@ -134,7 +134,7 @@ these changes.
* The function-based generic view modules will be removed in favor of their
class-based equivalents, outlined :doc:`here
</topics/class-based-views/index>`:
</topics/class-based-views/index>`.
* The :class:`~django.core.servers.basehttp.AdminMediaHandler` will be
removed. In its place use