Cleaned up the list of authors/contributors so that people actually working on Django get some props.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8936 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 4 insertions, 50 deletions

diff --git a/docs/faq/general.txt b/docs/faq/general.txt
index 346ddd643c..10af6d0329 100644
--- a/docs/faq/general.txt
+++ b/docs/faq/general.txt
@@ -68,56 +68,10 @@ application layer. And it ships with a simple-yet-powerful
 Who's behind this?
 ------------------
 
-Django was developed at `World Online`_, the Web department of a newspaper in
-Lawrence, Kansas, USA.
-
-`Adrian Holovaty`_
-    Adrian is a Web developer with a background in journalism. He was lead
-    developer at World Online for 2.5 years, during which time Django was
-    developed and implemented on World Online's sites. Now he works for
-    washingtonpost.com building rich, database-backed information sites, and
-    continues to oversee Django development. He likes playing guitar (Django
-    Reinhardt style) and hacking on side projects such as `chicagocrime.org`_.
-    He lives in Chicago.
-
-    On IRC, Adrian goes by ``adrian_h``.
-
-`Jacob Kaplan-Moss`_
-    Jacob is a whipper-snapper from California who spends equal time coding and
-    cooking. He's lead developer at World Online and actively hacks on various
-    cool side projects. He's contributed to the Python-ObjC bindings and was
-    the first guy to figure out how to write Tivo apps in Python. Lately he's
-    been messing with Python on the PSP. He lives in Lawrence, Kansas.
-
-    On IRC, Jacob goes by ``jacobkm``.
-
-`Simon Willison`_
-    Simon is a well-respected Web developer from England. He had a one-year
-    internship at World Online, during which time he and Adrian developed
-    Django from scratch. The most enthusiastic Brit you'll ever meet, he's
-    passionate about best practices in Web development and has maintained a
-    well-read Web-development blog for years at http://simon.incutio.com.
-    He works for Yahoo UK, where he managed to score the title "Hacker Liason."
-    He lives in London.
-
-    On IRC, Simon goes by ``SimonW``.
-
-`Wilson Miner`_
-    Wilson's design-fu makes us all look like rock stars. By day, he's an
-    interactive designer for `Apple`_. Don't ask him what he's working on, or
-    he'll have to kill you. He lives in San Francisco.
-
-    On IRC, Wilson goes by ``wilsonian``.
-
-.. _`World Online`: http://code.djangoproject.com/wiki/WorldOnline
-.. _`Adrian Holovaty`: http://www.holovaty.com/
-.. _`washingtonpost.com`: http://www.washingtonpost.com/
-.. _`chicagocrime.org`: http://www.chicagocrime.org/
-.. _`Simon Willison`: http://simon.incutio.com/
-.. _`simon.incutio.com`: http://simon.incutio.com/
-.. _`Jacob Kaplan-Moss`: http://www.jacobian.org/
-.. _`Wilson Miner`: http://www.wilsonminer.com/
-.. _`Apple`: http://www.apple.com/
+Django was originally developed at World Online, the Web department of a
+newspaper in Lawrence, Kansas, USA. Django's now run by an international team of
+volunteers; you can read all about them over at the :ref:`list of committers
+<internals-committers>`>
 
 Which sites use Django?
 -----------------------