diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 4475a910ff..4e3077163d 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -4,7 +4,7 @@ * [Issues and Pull Requests](#issues-and-pull-requests) * [Accepting Modifications](#accepting-modifications) - - [Involving the TC](#involving-the-tc) + - [Involving the CTC](#involving-the-ctc) * [Landing Pull Requests](#landing-pull-requests) - [Technical HOWTO](#technical-howto) - [I Just Made a Mistake](#i-just-made-a-mistake) @@ -26,7 +26,7 @@ pull requests to the Node.js project. Collaborators should feel free to take full responsibility for managing issues and pull requests they feel qualified to handle, as long as this is done while being mindful of these guidelines, the -opinions of other Collaborators and guidance of the TC. +opinions of other Collaborators and guidance of the CTC. Collaborators may **close** any issue or pull request they believe is not relevant for the future of the Node.js project. Where this is @@ -40,7 +40,7 @@ necessary. All modifications to the Node.js code and documentation should be performed via GitHub pull requests, including modifications by -Collaborators and TC members. +Collaborators and CTC members. All pull requests must be reviewed and accepted by a Collaborator with sufficient expertise who is able to take full responsibility for the @@ -64,7 +64,7 @@ Where there is no disagreement amongst Collaborators, a pull request may be landed given appropriate review. Where there is discussion amongst Collaborators, consensus should be sought if possible. The lack of consensus may indicate the need to elevate discussion to the -TC for resolution (see below). +CTC for resolution (see below). All bugfixes require a test case which demonstrates the defect. The test should *fail* before the change, and *pass* after the change. @@ -73,10 +73,10 @@ All pull requests that modify executable code should be subjected to continuous integration tests on the [project CI server](https://ci.nodejs.org/). -### Involving the TC +### Involving the CTC -Collaborators may opt to elevate pull requests or issues to the TC for -discussion by assigning the ***tc-agenda*** tag. This should be done +Collaborators may opt to elevate pull requests or issues to the CTC for +discussion by assigning the ***ctc-agenda*** tag. This should be done where a pull request: - has a significant impact on the codebase, @@ -84,7 +84,7 @@ where a pull request: - has failed to reach consensus amongst the Collaborators who are actively participating in the discussion. -The TC should serve as the final arbiter where required. +The CTC should serve as the final arbiter where required. ## Landing Pull Requests diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 3a7237215b..0ec424d45a 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -1,11 +1,11 @@ # Node.js Project Governance -## Technical Committee +## Core Technical Committee -The Node.js project is jointly governed by a Technical Steering Committee (TSC) +The Node.js project is jointly governed by a Core Technical Committee (CTC) which is responsible for high-level guidance of the project. -The TSC has final authority over this project including: +The CTC has final authority over this project including: * Technical direction * Project governance and process (including this policy) @@ -14,28 +14,28 @@ The TSC has final authority over this project including: * Conduct guidelines * Maintaining the list of additional Collaborators -Initial membership invitations to the TSC were given to individuals who +Initial membership invitations to the CTC were given to individuals who had been active contributors to Node.js, and who have significant experience with the management of the Node.js project. Membership is expected to evolve over time according to the needs of the project. -For the current list of TSC members, see the project +For the current list of CTC members, see the project [README.md](./README.md#current-project-team-members). ## Collaborators The [nodejs/node](https://github.com/nodejs/node) GitHub repository is -maintained by the TC and additional Collaborators who are added by the -TC on an ongoing basis. +maintained by the CTC and additional Collaborators who are added by the +CTC on an ongoing basis. Individuals making significant and valuable contributions are made Collaborators and given commit-access to the project. These -individuals are identified by the TC and their addition as -Collaborators is discussed during the weekly TC meeting. +individuals are identified by the CTC and their addition as +Collaborators is discussed during the weekly CTC meeting. _Note:_ If you make a significant contribution and are not considered -for commit-access, log an issue or contact a TC member directly and it -will be brought up in the next TC meeting. +for commit-access, log an issue or contact a CTC member directly and it +will be brought up in the next CTC meeting. Modifications of the contents of the nodejs/node repository are made on a collaborative basis. Anybody with a GitHub account may propose a @@ -51,8 +51,8 @@ on the consensus model used for governance. Collaborators may opt to elevate significant or controversial modifications, or modifications that have not found consensus to the -TC for discussion by assigning the ***tc-agenda*** tag to a pull -request or issue. The TC should serve as the final arbiter where +CTC for discussion by assigning the ***ctc-agenda*** tag to a pull +request or issue. The CTC should serve as the final arbiter where required. For the current list of Collaborators, see the project @@ -61,39 +61,39 @@ For the current list of Collaborators, see the project A guide for Collaborators is maintained in [COLLABORATOR_GUIDE.md](./COLLABORATOR_GUIDE.md). -## TC Membership +## CTC Membership -TC seats are not time-limited. There is no fixed size of the TC. +CTC seats are not time-limited. There is no fixed size of the CTC. However, the expected target is between 6 and 12, to ensure adequate coverage of important areas of expertise, balanced with the ability to make decisions efficiently. -There is no specific set of requirements or qualifications for TC +There is no specific set of requirements or qualifications for CTC membership beyond these rules. -The TC may add additional members to the TC by a standard TC motion. +The CTC may add additional members to the CTC by a standard CTC motion. -A TC member may be removed from the TC by voluntary resignation, or by -a standard TC motion. +A CTC member may be removed from the CTC by voluntary resignation, or by +a standard CTC motion. -Changes to TC membership should be posted in the agenda, and may be -suggested as any other agenda item (see "TC Meetings" below). +Changes to CTC membership should be posted in the agenda, and may be +suggested as any other agenda item (see "CTC Meetings" below). -No more than 1/3 of the TC members may be affiliated with the same -employer. If removal or resignation of a TC member, or a change of -employment by a TC member, creates a situation where more than 1/3 of -the TC membership shares an employer, then the situation must be -immediately remedied by the resignation or removal of one or more TC +No more than 1/3 of the CTC members may be affiliated with the same +employer. If removal or resignation of a CTC member, or a change of +employment by a CTC member, creates a situation where more than 1/3 of +the CTC membership shares an employer, then the situation must be +immediately remedied by the resignation or removal of one or more CTC members affiliated with the over-represented employer(s). -## TC Meetings +## CTC Meetings -The TC meets weekly on a Google Hangout On Air. The meeting is run by -a designated moderator approved by the TC. Each meeting should be +The CTC meets weekly on a Google Hangout On Air. The meeting is run by +a designated moderator approved by the CTC. Each meeting should be published to YouTube. -Items are added to the TC agenda which are considered contentious or -are modifications of governance, contribution policy, TC membership, +Items are added to the CTC agenda which are considered contentious or +are modifications of governance, contribution policy, CTC membership, or release process. The intention of the agenda is not to approve or review all patches. @@ -102,26 +102,23 @@ group of Collaborators. Any community member or contributor can ask that something be added to the next meeting's agenda by logging a GitHub Issue. Any Collaborator, -TC member or the moderator can add the item to the agenda by adding -the ***tc-agenda*** tag to the issue. +CTC member or the moderator can add the item to the agenda by adding +the ***ctc-agenda*** tag to the issue. -Prior to each TC meeting, the moderator will share the Agenda with -members of the TC. TC members can add any items they like to the -agenda at the beginning of each meeting. The moderator and the TC +Prior to each CTC meeting, the moderator will share the Agenda with +members of the CTC. CTC members can add any items they like to the +agenda at the beginning of each meeting. The moderator and the CTC cannot veto or remove items. -The TC may invite persons or representatives from certain projects to -participate in a non-voting capacity. These invitees currently are: - -* A representative from [build](https://github.com/node-forward/build) - chosen by that project. +The CTC may invite persons or representatives from certain projects to +participate in a non-voting capacity. The moderator is responsible for summarizing the discussion of each agenda item and sending it as a pull request after the meeting. ## Consensus Seeking Process -The TC follows a +The CTC follows a [Consensus Seeking](http://en.wikipedia.org/wiki/Consensus-seeking_decision-making) decision making model. @@ -129,7 +126,7 @@ When an agenda item has appeared to reach a consensus, the moderator will ask "Does anyone object?" as a final call for dissent from the consensus. -If an agenda item cannot reach a consensus, a TC member can call for +If an agenda item cannot reach a consensus, a CTC member can call for either a closing vote or a vote to table the issue to the next -meeting. The call for a vote must be approved by a majority of the TC +meeting. The call for a vote must be approved by a majority of the CTC or else the discussion will continue. Simple majority wins. diff --git a/README.md b/README.md index 04d55bde57..db2b7e5a65 100644 --- a/README.md +++ b/README.md @@ -367,11 +367,11 @@ handling your report. ## Current Project Team Members The Node.js project team comprises a group of core collaborators and a sub-group -that forms the _Technical Steering Committee_ (TSC) which governs the project. For more +that forms the _Core Technical Committee_ (CTC) which governs the project. For more information about the governance of the Node.js project, see [GOVERNANCE.md](./GOVERNANCE.md). -### TSC (Technical Steering Committee) +### CTC (Core Technical Committee) * [bnoordhuis](https://github.com/bnoordhuis) - **Ben Noordhuis** <info@bnoordhuis.nl> * [chrisdickinson](https://github.com/chrisdickinson) - **Chris Dickinson** <christopher.s.dickinson@gmail.com> @@ -431,7 +431,7 @@ information about the governance of the Node.js project, see * [yosuke-furukawa](https://github.com/yosuke-furukawa) - **Yosuke Furukawa** <yosuke.furukawa@gmail.com> * [zkat](https://github.com/zkat) - **Kat Marchán** <kzm@sykosomatic.org> -Collaborators & TSC members follow the [COLLABORATOR_GUIDE.md](./COLLABORATOR_GUIDE.md) in +Collaborators & CTC members follow the [COLLABORATOR_GUIDE.md](./COLLABORATOR_GUIDE.md) in maintaining the Node.js project. ### Release Team diff --git a/WORKING_GROUPS.md b/WORKING_GROUPS.md index bcde970469..3b07580dea 100644 --- a/WORKING_GROUPS.md +++ b/WORKING_GROUPS.md @@ -1,11 +1,11 @@ -# Node.js Working Groups +# Node.js Core Working Groups -Node.js Working Groups are autonomous projects created by the -[Technical Steering Committee (TSC)](https://github.com/nodejs/node/blob/master/GOVERNANCE.md#technical-committee). +Node.js Core Working Groups are autonomous projects created by the +[Core Technical Committee (CTC)](https://github.com/nodejs/node/blob/master/GOVERNANCE.md#core-technical-committee). -Working Groups can be formed at any time but must be ratified by the TSC. +Working Groups can be formed at any time but must be ratified by the CTC. Once formed the work defined in the Working Group charter is the -responsibility of the WG rather than the TSC. +responsibility of the WG rather than the CTC. It is important that Working Groups are not formed pre-maturely. Working Groups are not formed to *begin* a set of tasks but instead are formed @@ -14,7 +14,7 @@ think it would benefit from being done as an autonomous project. If the work defined in a Working Group charter is completed the Working Group should be dissolved and the responsibility for governance absorbed -back in to the TSC. +back in to the CTC. ## Current Working Groups @@ -229,9 +229,9 @@ Their responsibilities are: * Maintaining the [addon-examples](https://github.com/nodejs/node-addon-examples) GitHub repository, including code, issues and documentation. * Maintaining the C++ Addon API within the Node.js project, in subordination to - the Node.js TSC. + the Node.js CTC. * Maintaining the Addon documentation within the Node.js project, in - subordination to the Node.js TSC. + subordination to the Node.js CTC. * Maintaining the _nan_ package in npm, releasing new versions as appropriate. * Messaging about the future of the Node.js and NAN interface to give the community advance notice of changes.