summaryrefslogtreecommitdiff
path: root/docs/internals/contributing/bugs-and-features.txt
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2014-07-13 09:58:53 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2014-08-01 14:41:24 +0200
commit5ad48a9ef2f83d06e94e7ca0988c4b7218aae0fb (patch)
tree7fff53684a5666cfc1b7ba7faad8ccbf199b372a /docs/internals/contributing/bugs-and-features.txt
parent1ed6fbcf44f0eebf29fd9b36be03bc5d73acee0a (diff)
downloaddjango-5ad48a9ef2f83d06e94e7ca0988c4b7218aae0fb.tar.gz
Renamed "committers" to "team".
Diffstat (limited to 'docs/internals/contributing/bugs-and-features.txt')
-rw-r--r--docs/internals/contributing/bugs-and-features.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/internals/contributing/bugs-and-features.txt b/docs/internals/contributing/bugs-and-features.txt
index 636bd27e57..842c4236b4 100644
--- a/docs/internals/contributing/bugs-and-features.txt
+++ b/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
-committers -- may be held in private.
+or contentious issues -- including, most notably, votes on new team
+members -- may be held in private.
.. _searching: https://code.djangoproject.com/search