summaryrefslogtreecommitdiff
path: root/COLLABORATOR_GUIDE.md
diff options
context:
space:
mode:
Diffstat (limited to 'COLLABORATOR_GUIDE.md')
-rw-r--r--COLLABORATOR_GUIDE.md21
1 files changed, 11 insertions, 10 deletions
diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md
index 10a4803023..9a4b5184b3 100644
--- a/COLLABORATOR_GUIDE.md
+++ b/COLLABORATOR_GUIDE.md
@@ -130,7 +130,7 @@ can be fast-tracked and may be landed after a shorter delay:
* Changes that fix regressions.
When a pull request is deemed suitable to be fast-tracked, label it with
-`fast-track`. The pull request can be landed once 2 or more collaborators
+`fast-track`. The pull request can be landed once 2 or more Collaborators
approve both the pull request and the fast-tracking request, and the necessary
CI testing is done.
@@ -225,15 +225,16 @@ on how to handle those types of changes.
### Breaking Changes
Backwards-incompatible changes may land on the master branch at any time after
-sufficient review by collaborators and approval of at least two TSC members.
-
-Examples of breaking changes include, but are not necessarily limited to,
-removal or redefinition of existing API arguments, changing return values
-(except when return values do not currently exist), removing or modifying
-existing properties on an options argument, adding or removing errors,
-changing error messages in any way, altering expected timing of an event (e.g.
-moving from sync to async responses or vice versa), and changing the
-non-internal side effects of using a particular API.
+sufficient review by Collaborators and approval of at least two TSC members.
+
+Examples of breaking changes include:
+
+* removal or redefinition of existing API arguments
+* changing return values
+* removing or modifying existing properties on an options argument
+* adding or removing errors
+* altering expected timing of an event
+* changing the side effects of using a particular API
Purely additive changes (e.g. adding new events to `EventEmitter`
implementations, adding new arguments to a method in a way that allows