diff --git a/AUTHORS b/AUTHORS
index 973e32d05a..3544e3b81a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,18 +12,25 @@ The PRIMARY AUTHORS are (and/or have been):
* Luke Plant
* Russell Keith-Magee
* Robert Wittams
+ * James Bennett
* Gary Wilson
+ * Matt Boersma
+ * Ian Kelly
+ * Joseph Kocherhans
* Brian Rosner
* Justin Bronn
* Karen Tracey
* Jannis Leidel
* James Tauber
* Alex Gaynor
+ * Simon Meers
* Andrew Godwin
* Carl Meyer
* Ramiro Morales
+ * Gabriel Hurley
* Chris Beaven
* Honza Král
+ * Tim Graham
* Idan Gazit
* Paul McMillan
* Julien Phalip
@@ -36,6 +43,7 @@ The PRIMARY AUTHORS are (and/or have been):
* Preston Holmes
* Simon Charette
* Donald Stufft
+ * Daniel Lindsley
* Marc Tamlyn
More information on the main contributors to Django can be found in
@@ -91,7 +99,6 @@ answer newbie questions, and generally made Django that much better:
Shannon -jj Behrens
Esdras Beleza
Chris Bennett
- James Bennett
Danilo Bargen
Shai Berger
berto
@@ -104,7 +111,6 @@ answer newbie questions, and generally made Django that much better:
Simon Blanchard
Craig Blaszczyk
David Blewett
- Matt Boersma
Artem Gnilov
Matías Bordese
Nate Bragg
@@ -278,7 +284,6 @@ answer newbie questions, and generally made Django that much better:
Rob Hudson
Jason Huggins
Jeff Hui
- Gabriel Hurley
Hyun Mi Ae
Ibon
Tom Insam
@@ -327,7 +332,6 @@ answer newbie questions, and generally made Django that much better:
Meir Kriheli
Bruce Kroeze
krzysiek.pawlik@silvermedia.pl
- Joseph Kocherhans
konrad@gwu.edu
knox
David Krauth
@@ -360,7 +364,6 @@ answer newbie questions, and generally made Django that much better:
limodou
Philip Lindborg
Simon Litchfield
- Daniel Lindsley
Trey Long
Laurent Luce
Martin Mahner
diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt
index 6b9c7df14a..131f9c0f26 100644
--- a/docs/internals/committers.txt
+++ b/docs/internals/committers.txt
@@ -88,6 +88,23 @@ Malcolm Tredinnick
*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,
+ re-igniting an interest in programming. Since then he has
+ contributed to a number of Open Source projects and worked
+ professionally as a developer.
+
+ Luke has contributed many excellent improvements to Django,
+ including database-level improvements, the CSRF middleware and
+ many unit tests.
+
+ Luke currently works for a church in Bradford, UK, and part-time
+ as a freelance developer.
+
+.. _luke plant: http://lukeplant.me.uk/
+.. _michael meeks: http://en.wikipedia.org/wiki/Michael_Meeks_(software)
+
`Russell Keith-Magee`_
Russell studied physics as an undergraduate, and studied neural networks for
his PhD. His first job was with a startup in the defense industry developing
@@ -102,6 +119,42 @@ Malcolm Tredinnick
.. _russell keith-magee: http://cecinestpasun.com/
+`James Bennett`_
+ James is Django's release manager, and also contributes to the
+ documentation and provide the occasional bugfix.
+
+ James came to Web development from philosophy when he discovered
+ that programmers get to argue just as much while collecting much
+ better pay. He lives in Lawrence, Kansas and previously worked at
+ World Online; currently, he's part of the Web development team at
+ Mozilla.
+
+ He `keeps a blog`_, and enjoys fine port and talking to his car.
+
+.. _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
@@ -119,23 +172,6 @@ Joseph Kocherhans
.. _django software foundation: https://www.djangoproject.com/foundation/
.. _charango: http://en.wikipedia.org/wiki/Charango
-`Luke Plant`_
- At University Luke studied physics and Materials Science and also
- met `Michael Meeks`_ who introduced him to Linux and Open Source,
- re-igniting an interest in programming. Since then he has
- contributed to a number of Open Source projects and worked
- professionally as a developer.
-
- Luke has contributed many excellent improvements to Django,
- including database-level improvements, the CSRF middleware and
- many unit tests.
-
- Luke currently works for a church in Bradford, UK, and part-time
- as a freelance developer.
-
-.. _luke plant: http://lukeplant.me.uk/
-.. _michael meeks: http://en.wikipedia.org/wiki/Michael_Meeks_(software)
-
`Brian Rosner`_
Brian is currently the tech lead at Eldarion_ managing and developing
Django / Pinax_ based Web sites. He enjoys learning more about programming
@@ -153,21 +189,6 @@ Joseph Kocherhans
.. _django dose: http://djangodose.com/
.. _pinax: http://pinaxproject.com/
-`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/
-
Justin Bronn
Justin Bronn is a computer scientist and attorney specializing
in legal topics related to intellectual property and spatial law.
@@ -232,6 +253,15 @@ Karen Tracey
.. _Alex Gaynor: http://alexgaynor.net
.. _Rdio: http://rdio.com
+`Simon Meers`_
+ Simon discovered Django 0.96 during his Computer Science PhD research and
+ has been developing with it full-time ever since. His core code
+ contributions are mostly in Django's admin application.
+
+ Simon works as a freelance developer based in Wollongong, Australia.
+
+.. _Simon Meers: http://simonmeers.com/
+
`Andrew Godwin`_
Andrew is a freelance Python developer and tinkerer, and has been
developing against Django since 2007. He graduated from Oxford University
@@ -265,6 +295,18 @@ Ramiro Morales
Ramiro lives in Córdoba, Argentina.
+`Gabriel Hurley`_
+ Gabriel has been working with Django since 2008, shortly after the 1.0
+ release. Convinced by his business partner that Python and Django were the
+ right direction for the company, he couldn't have been more happy with the
+ decision. His contributions range across many areas in Django, but years of
+ copy-editing and an eye for detail lead him to be particularly at home
+ while working on Django's documentation.
+
+ Gabriel works as a web developer in Berkeley, CA, USA.
+
+.. _gabriel hurley: http://strikeawe.com/
+
`Chris Beaven`_
Chris has been submitting patches and suggesting crazy ideas for Django
since early 2006. An advocate for community involvement and a long-term
@@ -290,6 +332,13 @@ Honza Král
.. _Whiskey Media: http://www.whiskeymedia.com/
+Tim Graham
+ When exploring Web frameworks for an independent study project in the fall
+ of 2008, Tim discovered Django and was lured to it by the documentation.
+ He enjoys contributing to the docs because they're awesome.
+
+ Tim works as a software engineer and lives in Philadelphia, PA, USA.
+
`Idan Gazit`_
As a self-professed design geek, Idan was initially attracted to Django
sometime between magic-removal and queryset-refactor. Formally trained
@@ -439,6 +488,18 @@ Jeremy Dunck
.. _Ultimate Frisbee: http://www.montrealultimate.ca
.. _Reptiletech: http://www.reptiletech.com
+Donald Stufft
+ Donald found Python and Django in 2007 while trying to find a language,
+ and web framework that he really enjoyed using after many years of PHP. He
+ fell in love with the beauty of Python and the way Django made tasks simple
+ and easy. His contributions to Django focus primarily on ensuring that it
+ is and remains a secure web framework.
+
+ Donald currently works at `Nebula Inc`_ as a Software Engineer for their
+ security team and lives in the Greater Philadelphia Area.
+
+.. _Nebula Inc: https://www.nebula.com/
+
`Daniel Lindsley`_
Pythonista since 2003, Djangonaut since 2006. Daniel started with Django
just after the v0.90 release (back when ``Manipulators`` looked good) & fell
@@ -453,56 +514,6 @@ Jeremy Dunck
.. _`Daniel Lindsley`: http://toastdriven.com/
.. _`Amazon Web Services`: https://aws.amazon.com/
-`James Bennett`_
- James is Django's release manager, and also contributes to the
- documentation and provide the occasional bugfix.
-
- James came to Web development from philosophy when he discovered
- that programmers get to argue just as much while collecting much
- better pay. He lives in Lawrence, Kansas and previously worked at
- World Online; currently, he's part of the Web development team at
- Mozilla.
-
- He `keeps a blog`_, and enjoys fine port and talking to his car.
-
-.. _james bennett: http://b-list.org/
-.. _keeps a blog: `james bennett`_
-
-Ian Kelly
- Ian is responsible for Django's support for Oracle.
-
-Matt Boersma
- Matt is also responsible for Django's Oracle support.
-
-`Simon Meers`_
- Simon discovered Django 0.96 during his Computer Science PhD research and
- has been developing with it full-time ever since. His core code
- contributions are mostly in Django's admin application. He is also helping
- to improve Django's documentation.
-
- Simon works as a freelance developer based in Wollongong, Australia.
-
-.. _simon meers: http://simonmeers.com/
-
-`Gabriel Hurley`_
- Gabriel has been working with Django since 2008, shortly after the 1.0
- release. Convinced by his business partner that Python and Django were the
- right direction for the company, he couldn't have been more happy with the
- decision. His contributions range across many areas in Django, but years of
- copy-editing and an eye for detail lead him to be particularly at home
- while working on Django's documentation.
-
- Gabriel works as a web developer in Berkeley, CA, USA.
-
-.. _gabriel hurley: http://strikeawe.com/
-
-Tim Graham
- When exploring Web frameworks for an independent study project in the fall
- of 2008, Tim discovered Django and was lured to it by the documentation.
- He enjoys contributing to the docs because they're awesome.
-
- Tim works as a software engineer and lives in Philadelphia, PA, USA.
-
Marc Tamlyn
Marc started life on the web using Django 1.2 back in 2010, and has never
looked back. He was involved with rewriting the class based view
@@ -515,18 +526,6 @@ Marc Tamlyn
.. _CCBV: http://ccbv.co.uk/
.. _Incuna Ltd: http://incuna.com/
-Donald Stufft
- Donald found Python and Django in 2007 while trying to find a language,
- and web framework that he really enjoyed using after many years of PHP. He
- fell in love with the beauty of Python and the way Django made tasks simple
- and easy. His contributions to Django focus primarily on ensuring that it
- is and remains a secure web framework.
-
- Donald currently works at `Nebula Inc`_ as a Software Engineer for their
- security team and lives in the Greater Philadelphia Area.
-
-.. _Nebula Inc: https://www.nebula.com/
-
Developers Emeritus
===================