Renamed "committers" to "team".

docs/faq/general.txt

@@ -66,9 +66,8 @@ Who's behind this?
 ------------------
 
 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
+newspaper in Lawrence, Kansas, USA. Django's now run by an international
-volunteers; you can read all about them over at the :doc:`list of committers
+:doc:`team of volunteers </internals/team>`.
-</internals/committers>`.
 
 Which sites use Django?
 -----------------------

docs/index.txt

@@ -310,7 +310,7 @@ you can contribute:
 * **Community:**
   :doc:`How to get involved <internals/contributing/index>` |
   :doc:`The release process <internals/release-process>` |
-  :doc:`Team of committers <internals/committers>` |
+  :doc:`Meet the team <internals/team>` |
   :doc:`The Django source code repository <internals/git>` |
   :doc:`Security policies <internals/security>` |
   :doc:`Mailing lists <internals/mailing-lists>`

docs/internals/contributing/bugs-and-features.txt

@@ -152,7 +152,7 @@ However, consensus is not always possible. If consensus cannot be reached, or
 if the discussion towards a consensus fizzles out without a concrete decision,
 we use a more formal process.
 
-Any :doc:`core committer</internals/committers>` may call for a formal vote
+Any :doc:`core committer</internals/team>` may call for a formal vote
 using the same voting mechanism above. A proposition will be considered carried
 by the core team if:
 
@@ -170,8 +170,8 @@ take to convert that "-1" into at least a "+0".
 
 Whenever possible, these formal votes should be announced and held in
 public on the |django-developers| mailing list. However, overly sensitive
-or contentious issues -- including, most notably, votes on new core
+or contentious issues -- including, most notably, votes on new team
-committers -- may be held in private.
+members -- may be held in private.
 
 
 .. _searching: https://code.djangoproject.com/search

docs/internals/contributing/committing-code.txt

@@ -2,7 +2,7 @@
 Committing code
 ===============
 
-This section is addressed to the :doc:`/internals/committers` and to anyone
+This section is addressed to the :doc:`/internals/team` and to anyone
 interested in knowing how code gets committed into Django core. If you're a
 community member who wants to contribute code to Django, have a look at
 :doc:`writing-code/working-with-git` instead.

docs/internals/contributing/triaging-tickets.txt

@@ -57,10 +57,9 @@ Since a picture is worth a thousand words, let's start there:
 
 We've got two roles in this diagram:
 
-* :doc:`Committers</internals/committers>` (also called core developers):
+* Committers (also called core developers): people with commit access who are
-  people with commit access who are responsible for making the big
+  responsible for making decisions and integrating the contributions of the
-  decisions, writing large portions of the code and integrating the
+  community.
-  contributions of the community.
 
 * Ticket triagers: anyone in the Django community who chooses to
   become involved in Django's development process. Our Trac installation
@@ -314,7 +313,7 @@ A ticket can be resolved in a number of ways:
       discussion in the |django-developers| mailing list. Feel free to
       start or join in discussions of "wontfix" tickets on the
       |django-developers| mailing list, but please do not reopen tickets
-      closed as "wontfix" by a :doc:`core developer</internals/committers>`.
+      closed as "wontfix" by a :doc:`core developer</internals/team>`.
 
 * duplicate
       Used when another ticket covers the same issue. By closing duplicate
@@ -407,7 +406,7 @@ the ticket database:
   review a patch that you submit.
 
 * Please **don't** reverse a decision that has been made by a :doc:`core
-  developer</internals/committers>`. If you disagree with a decision that
+  developer</internals/team>`. If you disagree with a decision that
   has been made, please post a message to |django-developers|.
 
 * If you're unsure if you should be making a change, don't make the

docs/internals/contributing/writing-code/working-with-git.txt

@@ -7,7 +7,7 @@ requests. If you're interested in how core developers handle them, see
 
 Below, we are going to show how to create a GitHub pull request containing the
 changes for Trac ticket #xxxxx. By creating a fully-ready pull request you
-will make the committers' job easier, meaning that your work is more likely to
+will make the reviewer's job easier, meaning that your work is more likely to
 be merged into Django.
 
 You could also upload a traditional patch to Trac, but it's less practical for

docs/internals/index.txt

@@ -18,7 +18,7 @@ the hood".
 
    contributing/index
    mailing-lists
-   committers
+   team
    security
    release-process
    deprecation

docs/internals/team.txt

@@ -1,6 +1,6 @@
-=================
+===========
-Django committers
+Django team
-=================
+===========
 
 The original team
 =================
@@ -55,14 +55,11 @@ Journal-World`_ of Lawrence, Kansas, USA.
 .. _heroku: http://heroku.com/
 .. _Rdio: http://rdio.com
 
-Current developers
+The current team
-==================
+================
 
 Currently, Django is led by a team of volunteers from around the globe.
 
-Core developers
----------------
-
 These are the folks who have a long history of contributions, a solid track
 record of being helpful on the mailing lists, and a proven desire to dedicate
 serious time to Django. In return, they've been granted the coveted commit bit,
@@ -554,8 +551,8 @@ Baptiste Mispelon
     .. _Solid Links: http://solidlinks.nl/
     .. _Erik's Pony Checkup: http://ponycheckup.com/
 
-Developers Emeritus
+Retired team members
-===================
+====================
 
 Georg "Hugo" Bauer
     Georg created Django's internationalization system, managed i18n