From 55a8b66e21a681170c7c77c76c48c6e3cb88ca19 Mon Sep 17 00:00:00 2001 From: Martin Dosch Date: Sun, 1 Nov 2020 12:21:32 +0100 Subject: [PATCH 1/4] Treat XEPs in Deferred state the same as in Experimental state. --- docs/TRIAGING.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/TRIAGING.md b/docs/TRIAGING.md index 992de116..dbe82654 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 @@ -137,7 +137,9 @@ 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 + 4. If the XEP is in Deferred state and the changes are not purely editorial, + add a note to move the XEP to Experimental state. + 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]. From d6b210ea534b3044b48ba92eac18ae8f2b803490 Mon Sep 17 00:00:00 2001 From: Martin Dosch Date: Sun, 1 Nov 2020 12:28:26 +0100 Subject: [PATCH 2/4] Add tag [Needs Editor Action] for non-editorial changes to deferred XEPs. --- docs/TRIAGING.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/TRIAGING.md b/docs/TRIAGING.md index dbe82654..68b07b9c 100644 --- a/docs/TRIAGING.md +++ b/docs/TRIAGING.md @@ -138,7 +138,8 @@ If the PR is not touching a XEP, this guide does not apply. 4. Stop. 4. If the XEP is in Deferred state and the changes are not purely editorial, - add a note to move the XEP to Experimental state. + add a note to move the XEP to Experimental state and mark the PR as + [Needs Editor Action]. 5. Otherwise, mark the PR as [Ready to Merge], linking the XEP Author’s approval for documentation purposes. From b9160265f4a3239619cd79832d684c7f387b6190 Mon Sep 17 00:00:00 2001 From: Martin Dosch Date: Sun, 1 Nov 2020 12:33:27 +0100 Subject: [PATCH 3/4] Change no longer appropriate wording. --- docs/TRIAGING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/TRIAGING.md b/docs/TRIAGING.md index 68b07b9c..5715b182 100644 --- a/docs/TRIAGING.md +++ b/docs/TRIAGING.md @@ -140,8 +140,8 @@ If the PR is not touching a XEP, this guide does not apply. 4. 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]. - 5. Otherwise, mark the PR as [Ready to Merge], linking the XEP Author’s - approval for documentation purposes. + 5. Mark the PR as [Ready to Merge], linking the XEP Author’s approval for + documentation purposes. 6. Mark the PR as [Ready to Merge]. From 66fb96fd1733e28941526c413eed8bb7c9e3a4a6 Mon Sep 17 00:00:00 2001 From: Martin Dosch Date: Sun, 1 Nov 2020 12:42:43 +0100 Subject: [PATCH 4/4] Change order of steps for Experimental/Deferred XEPs. --- docs/TRIAGING.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/TRIAGING.md b/docs/TRIAGING.md index 5715b182..d7438a08 100644 --- a/docs/TRIAGING.md +++ b/docs/TRIAGING.md @@ -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,11 +140,8 @@ 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. 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]. - 5. Mark the PR as [Ready to Merge], linking the XEP Author’s approval for - documentation purposes. + 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].