diff --git a/docs/TRIAGING.md b/docs/TRIAGING.md index 992de116..d7438a08 100644 --- a/docs/TRIAGING.md +++ b/docs/TRIAGING.md @@ -90,10 +90,10 @@ If the PR is not touching a XEP, this guide does not apply. sense (an example is updating multiple XEPs which belong together, such as the MIX family). -4. Is the XEP **not** in Experimental state? +4. Is the XEP **not** in Experimental or Deferred state? - Changes to Non—Experimental XEPs need approval by the approving body as - defined in the XEP file itself. + Changes to Non—Experimental or non-Deferred XEPs need approval by the + approving body as defined in the XEP file itself. 1. Add the [Needs Council]/[Needs Board] label. To know which, check the `` of the XEPs. If the touched XEPs have different approvers @@ -111,10 +111,10 @@ If the PR is not touching a XEP, this guide does not apply. (second) version number part, add the [Needs Version Block] label and a comment explaining the situation for the next Editor (the Author does not need to do anything here). - 5. Stop. + 6. Stop. -5. Is the XEP in Experimental state and the PR opener is not an author of the - XEP? +5. Is the XEP in Experimental or Deferred state and the PR opener is not an + author of the XEP? Changes to Experimental XEPs are approved by the XEP Authors themselves. If the PR touches multiple XEPs and the XEP Authors do not overlap, ask @@ -125,7 +125,10 @@ If the PR is not touching a XEP, this guide does not apply. 2. If the PR adds a revision block and does not bump the minor-level (second) version number part, add the [Needs Version Block] label and a comment explaining the situation for the Processing Editor. - 3. If the issue has not been discussed on the standards list *or* if + 3. If the XEP is in Deferred state and the changes are not purely editorial, + add a note to move the XEP to Experimental state and mark the PR as + [Needs Editor Action]. + 4. If the issue has not been discussed on the standards list *or* if the XEP Author has not been involved in the discussion *or* the XEP Author has not explicitly ACKed the PR: @@ -137,7 +140,7 @@ If the PR is not touching a XEP, this guide does not apply. for each author in either the XEP or in xep.ent. 4. Stop. - 4. Otherwise, mark the PR as [Ready to Merge], linking the XEP Author’s + 5. Otherwise, mark the PR as [Ready to Merge], linking the XEP Author’s approval for documentation purposes. 6. Mark the PR as [Ready to Merge].