diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2014-07-13 09:58:53 +0200 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2014-08-01 14:41:24 +0200 |
| commit | 5ad48a9ef2f83d06e94e7ca0988c4b7218aae0fb (patch) | |
| tree | 7fff53684a5666cfc1b7ba7faad8ccbf199b372a /docs/internals/contributing | |
| parent | 1ed6fbcf44f0eebf29fd9b36be03bc5d73acee0a (diff) | |
Renamed "committers" to "team".
Diffstat (limited to 'docs/internals/contributing')
4 files changed, 10 insertions, 11 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 diff --git a/docs/internals/contributing/committing-code.txt b/docs/internals/contributing/committing-code.txt index 5de2ef0378..ff5cce00ea 100644 --- a/docs/internals/contributing/committing-code.txt +++ b/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. diff --git a/docs/internals/contributing/triaging-tickets.txt b/docs/internals/contributing/triaging-tickets.txt index 76aee6646e..f274c2ab68 100644 --- a/docs/internals/contributing/triaging-tickets.txt +++ b/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): - people with commit access who are responsible for making the big - decisions, writing large portions of the code and integrating the - contributions of the community. +* Committers (also called core developers): people with commit access who are + responsible for making decisions and integrating the 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 diff --git a/docs/internals/contributing/writing-code/working-with-git.txt b/docs/internals/contributing/writing-code/working-with-git.txt index 9d48835cf1..81c8b8a682 100644 --- a/docs/internals/contributing/writing-code/working-with-git.txt +++ b/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 |
