Moved some people to "past team members".

1 files changed, 73 insertions, 78 deletions

diff --git a/docs/internals/team.txt b/docs/internals/team.txt
index af33d3e731..996655f991 100644
--- a/docs/internals/team.txt
+++ b/docs/internals/team.txt
@@ -67,16 +67,6 @@ record of being helpful on the mailing lists, and a proven desire to dedicate
 serious time to Django. In return, they've been invited to join the :ref:`core
 team <core-team>`.
 
-Malcolm Tredinnick
-    Malcolm originally wanted to be a mathematician, somehow ended up a software
-    developer. He's contributed to many Open Source projects, has served on the
-    board of the GNOME foundation, and will kick your ass at chess.
-
-    When he's not busy being an International Man of Mystery, Malcolm lives in
-    Sydney, Australia.
-
-    *Malcolm passed away on March 17, 2013.*
-
 `Luke Plant`_
     At University Luke studied physics and Materials Science and also
     met `Michael Meeks`_ who introduced him to Linux and Open Source,
@@ -109,7 +99,7 @@ Malcolm Tredinnick
     .. _russell keith-magee: http://cecinestpasun.com/
 
 `James Bennett`_
-    James is Django's release manager, and also contributes to the
+    James is one of Django's release managers, and also contributes to the
     documentation and provide the occasional bugfix.
 
     James came to Web development from philosophy when he discovered
@@ -123,60 +113,6 @@ Malcolm Tredinnick
     .. _james bennett: http://b-list.org/
     .. _keeps a blog: `james bennett`_
 
-`Gary Wilson`_
-    Gary starting contributing patches to Django in 2006 while developing Web
-    applications for `The University of Texas`_ (UT).  Since, he has made
-    contributions to the email and forms systems, as well as many other
-    improvements and code cleanups throughout the code base.
-
-    Gary is currently a developer and software engineering graduate student at
-    UT, where his dedication to spreading the ways of Python and Django never
-    ceases.
-
-    Gary lives in Austin, Texas, USA.
-
-    .. _Gary Wilson: http://thegarywilson.com/
-    .. _The University of Texas: http://www.utexas.edu/
-
-Matt Boersma
-    Matt is responsible for Django's Oracle support.
-
-Ian Kelly
-    Ian is also responsible for Django's support for Oracle.
-
-Joseph Kocherhans
-    Joseph was the director of lead development at EveryBlock and previously
-    developed at the Lawrence Journal-World. He is treasurer of the `Django
-    Software Foundation`_. He often disappears for several days into the woods,
-    attempts to teach himself computational linguistics, and annoys his
-    neighbors with his Charango_ playing.
-
-    Joseph's first contribution to Django was a series of improvements to the
-    authorization system leading up to support for pluggable authorization.
-    Since then, he's worked on the new forms system, its use in the admin, and
-    many other smaller improvements.
-
-    Joseph lives in Chicago, USA.
-
-    .. _django software foundation: https://www.djangoproject.com/foundation/
-    .. _charango: http://en.wikipedia.org/wiki/Charango
-
-`Brian Rosner`_
-    Brian is the Chief Architect at Eldarion_ managing and developing
-    Django / Pinax_ based Web sites. He enjoys learning more about programming
-    languages and system architectures and contributing to open source
-    projects.
-
-    Brian helped immensely in getting Django's "newforms-admin" branch finished
-    in time for Django 1.0; he's now a full committer, continuing to improve on
-    the admin and forms system.
-
-    Brian lives in Denver, Colorado, USA.
-
-    .. _brian rosner: http://brosner.com/
-    .. _eldarion: http://eldarion.com/
-    .. _pinax: http://pinaxproject.com/
-
 Justin Bronn
     Justin Bronn is a computer scientist and attorney specializing
     in legal topics related to intellectual property and spatial law.
@@ -217,19 +153,6 @@ Karen Tracey
     .. _pip: http://www.pip-installer.org/
     .. _Mozilla: http://www.mozilla.org/
 
-`James Tauber`_
-    James is the lead developer of Pinax_ and the CEO and founder of
-    Eldarion_. He has been doing open source software since 1993, Python
-    since 1998 and Django since 2006. He serves on the board of the Python
-    Software Foundation and is currently on a leave of absence from a PhD in
-    linguistics.
-
-    James currently lives in Boston, MA, USA but originally hails from
-    Perth, Western Australia where he attended the same high school as
-    Russell Keith-Magee.
-
-    .. _James Tauber: http://jtauber.com/
-
 `Andrew Godwin`_
     Andrew is a freelance Python developer and tinkerer, and has been
     developing against Django since 2007. He graduated from Oxford University
@@ -570,3 +493,75 @@ Robert Wittams
     Gabriel works as a developer in the SF Bay Area, CA, USA.
 
     .. _gabriel hurley: http://strikeawe.com/
+
+Malcolm Tredinnick
+    Malcolm originally wanted to be a mathematician and somehow ended up a
+    software developer. He contributed to many Open Source projects, served on
+    the board of the GNOME foundation, and was a great chess player.
+
+    Malcolm was deeply involved in many part of Django - most notably, the
+    ORM, but many other internals bear his fingerprints. Django’s support for
+    unicode and autoescaping in templates can both be almost entirely
+    attributed to Malcolm.
+
+    He was an International Man of Mystery and lived Sydney, Australia.
+
+    *Malcolm passed away on March 17, 2013.*
+
+Matt Boersma
+    Matt helped with Django's Oracle support.
+
+Ian Kelly
+    Ian also helped with Oracle support.
+
+Joseph Kocherhans
+    Joseph was the director of lead development at EveryBlock and previously
+    developed at the Lawrence Journal-World. He often disappears for several
+    days into the woods, attempts to teach himself computational linguistics,
+    and annoys his neighbors with his Charango_ playing.
+
+    Joseph's first contribution to Django was a series of improvements to the
+    authorization system leading up to support for pluggable authorization.
+    Since then, he's worked on the new forms system, its use in the admin, and
+    many other smaller improvements.
+
+    Joseph lives in Chicago, USA.
+
+    .. _charango: http://en.wikipedia.org/wiki/Charango
+
+`Gary Wilson`_
+    Gary starting contributing patches to Django in 2006 while developing Web
+    applications for `The University of Texas`_ (UT).  Since, he has made
+    contributions to the email and forms systems, as well as many other
+    improvements and code cleanups throughout the code base.
+
+    Gary lives in Austin, Texas, USA.
+
+    .. _Gary Wilson: http://thegarywilson.com/
+    .. _The University of Texas: http://www.utexas.edu/
+
+`Brian Rosner`_
+    Brian enjoys learning more about programming languages and system
+    architectures and contributing to open source projects.
+
+    He helped immensely in getting Django's "newforms-admin" branch finished
+    in time for Django 1.0.
+
+    Brian lives in Denver, Colorado, USA.
+
+    .. _brian rosner: http://brosner.com/
+
+`James Tauber`_
+    James is the lead developer of Pinax_ and the CEO and founder of
+    Eldarion_. He has been doing open source software since 1993, Python
+    since 1998 and Django since 2006. He serves on the board of the Python
+    Software Foundation and is currently on a leave of absence from a PhD in
+    linguistics.
+
+    James currently lives in Boston, MA, USA but originally hails from
+    Perth, Western Australia where he attended the same high school as
+    Russell Keith-Magee.
+
+    .. _James Tauber: http://jtauber.com/
+    .. _eldarion: http://eldarion.com/
+    .. _pinax: http://pinaxproject.com/