From 7a44dd302891f7b290a85b23ee4da4085d823f26 Mon Sep 17 00:00:00 2001 From: Helge Date: Tue, 9 Apr 2024 19:48:55 +0000 Subject: [PATCH] Update Editors -> Facilitators (#260) See https://socialhub.activitypub.rocks/t/syncing-language-regarding-feps/3903 Reviewed-on: https://codeberg.org/fediverse/fep/pulls/260 Reviewed-by: silverpill Reviewed-by: Arnold Schrijver Co-authored-by: Helge Co-committed-by: Helge --- EDITORS.md | 12 ------------ FACILITATORS.md | 14 ++++++++++++++ README.md | 6 +++--- fep/a4ed/fep-a4ed.md | 38 +++++++++++++++++--------------------- scripts/README.md | 2 +- scripts/backmatter.md | 4 ++-- scripts/create_issue.py | 2 +- scripts/tracking_issue.md | 16 ---------------- 8 files changed, 38 insertions(+), 56 deletions(-) delete mode 100644 EDITORS.md create mode 100644 FACILITATORS.md delete mode 100644 scripts/tracking_issue.md diff --git a/EDITORS.md b/EDITORS.md deleted file mode 100644 index 3ccc694..0000000 --- a/EDITORS.md +++ /dev/null @@ -1,12 +0,0 @@ -# FEP Editors - -## About - -FEP Editors ensure that the procedures outlined in [FEP-a4ed: The Fediverse Enhancement Proposal Process](https://codeberg.org/fediverse/fep/src/branch/main/fep/a4ed/fep-a4ed.md) are followed. FEP Editors only facilitate the process, and are otherwise unbiased. All editors are members of the [SocialHub](https://socialhub.activitypub.rocks) developer community, a liaison of the [W3C Social Web Incubator Community Group](https://www.w3.org/community/SocialCG/), where they create related discussion topics in the [FEP forum category](https://socialhub.activitypub.rocks/c/standards/fep/54). - -## Facilitators - -- David Sterry: [@weex](https://socialhub.activitypub.rocks/u/weex/summary) at SocialHub, [@weex@c4.social](https://c4.social/@weex) -- Arnold Schrijver: [@aschrijver](https://socialhub.activitypub.rocks/u/aschrijver/summary) at SocialHub, [@smallcircles@social.coop](https://social.coop/@smallcircles) -- Anthony Wang: [@dodecahedron](https://socialhub.activitypub.rocks/u/dodecahedron/summary) at SocialHub, [@a@exozy.me](https://social.exozy.me/@a) -- Pere Lev: [@fr33domlover](https://socialhub.activitypub.rocks/u/fr33domlover/summary) at SocialHub, [@pere@micro.towards.vision](https://micro.towards.vision/@pere) diff --git a/FACILITATORS.md b/FACILITATORS.md new file mode 100644 index 0000000..7464a42 --- /dev/null +++ b/FACILITATORS.md @@ -0,0 +1,14 @@ +# FEP Facilitators + +## About + +FEP Facilitators ensure that the procedures outlined in [FEP-a4ed: The Fediverse Enhancement Proposal Process](https://codeberg.org/fediverse/fep/src/branch/main/fep/a4ed/fep-a4ed.md) are followed. FEP Facilitators are unbiased custodians of the process. All facilitators are members of the [SocialHub](https://socialhub.activitypub.rocks) developer community, a liaison of the [W3C Social Web Incubator Community Group](https://www.w3.org/community/SocialCG/), where they create related discussion topics in the [FEP forum category](https://socialhub.activitypub.rocks/c/standards/fep/54). + +## Facilitators + +- David Sterry: [@weex](https://socialhub.activitypub.rocks/u/weex/summary) at SocialHub, [@weex@c4.social](https://c4.social/@weex) +- Arnold Schrijver: [@aschrijver](https://socialhub.activitypub.rocks/u/aschrijver/summary) at SocialHub, [@smallcircles@social.coop](https://social.coop/@smallcircles) +- Anthony Wang: [@dodecahedron](https://socialhub.activitypub.rocks/u/dodecahedron/summary) at SocialHub, [@a@exozy.me](https://social.exozy.me/@a) +- Pere Lev: [@fr33domlover](https://socialhub.activitypub.rocks/u/fr33domlover/summary) at SocialHub, [@pere@micro.towards.vision](https://micro.towards.vision/@pere) +- Helge: [@helge](https://socialhub.activitypub.rocks/u/helge/summary) at SocialHub, [@helge@mymath.rocks](https://mymath.rocks/timeline/) +- silverpill: [@silverpill](https://socialhub.activitypub.rocks/u/silverpill/summary) at SocialHub, [@silverpill@mitra.social](https://mitra.social/@silverpill) diff --git a/README.md b/README.md index 927d07f..a29d346 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,8 @@ The FEP Process is an initiative of the [SocialHub](https://socialhub.activitypu | [FEP-d767: Extend ActivityPub with Valueflows](./fep/d767/fep-d767.md) | `WITHDRAWN` | [#76](https://codeberg.org/fediverse/fep/issues/76) | 2023-04-02 | 2024-02-03 | | [FEP-5bf0: Collection sorting and filtering](./fep/5bf0/fep-5bf0.md) | `DRAFT` | [#80](https://codeberg.org/fediverse/fep/issues/80) | 2023-04-10 | - | | [FEP-888d: Using https://w3id.org/fep as a base for FEP-specific namespaces](./fep/888d/fep-888d.md) | `DRAFT` | [#83](https://codeberg.org/fediverse/fep/issues/83) | 2023-04-10 | - | -| [FEP-612d: Identifying ActivityPub Objects through DNS](./fep/612d/fep-612d.md) | `DRAFT` | [#89](https://codeberg.org/fediverse/fep/issues/89) | 2023-04-18 | - | | [FEP-0ea0: Payment Links](./fep/0ea0/fep-0ea0.md) | `DRAFT` | [#88](https://codeberg.org/fediverse/fep/issues/88) | 2023-04-18 | - | +| [FEP-612d: Identifying ActivityPub Objects through DNS](./fep/612d/fep-612d.md) | `DRAFT` | [#89](https://codeberg.org/fediverse/fep/issues/89) | 2023-04-18 | - | | [FEP-fffd: Proxy Objects](./fep/fffd/fep-fffd.md) | `DRAFT` | [#95](https://codeberg.org/fediverse/fep/issues/95) | 2023-04-29 | - | | [FEP-4adb: Dereferencing identifiers with webfinger](./fep/4adb/fep-4adb.md) | `DRAFT` | [#100](https://codeberg.org/fediverse/fep/issues/100) | 2023-05-13 | - | | [FEP-a070: Ordered properties for plain JSON consumers](./fep/a070/fep-a070.md) | `DRAFT` | [#121](https://codeberg.org/fediverse/fep/issues/121) | 2023-06-13 | - | @@ -100,9 +100,9 @@ python scripts/new_proposal.py TITLE OF YOUR PROPOSAL that should create a prefilled template for you. -## Editors +## Facilitators -The list of FEP's is facilitated by Editors who are listed in the [EDITORS.md](EDITORS.md) file. Editors are neutral custodians of the FEP process, who merge PR's, create tracking issues, and start discussion threads for each FEP in the [SocialHub](https://socialhub.activitypub.rocks) developer community forum. +The list of FEP's is maintained by the facilitators who are listed in the [FACILITATORS.md](FACILITATORS.md) file. Facilitators are neutral custodians of the FEP process, who merge PR's, create tracking issues, and start discussion threads for each FEP in the [SocialHub](https://socialhub.activitypub.rocks) developer community forum. ## Contributing diff --git a/fep/a4ed/fep-a4ed.md b/fep/a4ed/fep-a4ed.md index ed6845e..6f0de03 100644 --- a/fep/a4ed/fep-a4ed.md +++ b/fep/a4ed/fep-a4ed.md @@ -8,14 +8,12 @@ discussionsTo: https://codeberg.org/fediverse/fep/issues/201 --- # FEP-a4ed: The Fediverse Enhancement Proposal Process - ## Summary A Fediverse Enhancement Proposal (FEP) is a document that provides information to the Fediverse community. The goal of a FEP is to improve interoperability and well-being of diverse services, applications and communities that form the Fediverse. This document describes the scope, format and process of publishing Fediverse Enhancement Proposals. - ## Scope and Objectives A Fediverse Enhancement Proposal (FEP) should be a concise and focused documentation of a specific topic that is of interest to the Fediverse community. @@ -30,7 +28,6 @@ Proposals are not limited to technical topics and may focus on social and cultur Proposals may be entertaining and humorous (unlike this proposal). - ## Language, Document Structure and Format All Fediverse Enhancement Proposals must be written in English, be properly formatted as CommonMark [CommonMark] and be reasonably grammatical. @@ -48,7 +45,7 @@ $ echo -n "The Fediverse Enhancement Proposal Process" | sha256sum | cut -c-4 a4ed ``` -By using the hash of the title as identifier we reduce the burden on editors to assign unique ids. This requires proposal titles to be unique. +By using the hash of the title as identifier we reduce the burden on facilitators to assign unique ids. This requires proposal titles to be unique. ### Metadata @@ -83,7 +80,6 @@ Following sections may be included in a proposal: Fediverse Enhancement Proposals must be placed in the public domain by the authors with a CC0 1.0 Universal (CC0 1.0) Public Domain Dedication. - ## The Fediverse Enhancement Proposals Process ``` @@ -101,25 +97,27 @@ Fediverse Enhancement Proposals must be placed in the public domain by the autho ``` 1. A Fediverse Enhancement Proposal can be submitted by individuals or groups of individuals (authors). See the `SUBMISSION.md` file for a list of accepted submission methods. -2. Within seven days one of the editors will read and respond to the proposal. The editor checks if the proposal conforms to the required structure and fits the scope and objective of the FEPs. The editor may request the authors to clarify, justify, or withdraw the proposal. Such a request must not reflect the personal bias of an editor. Rather, it will be made strictly to maintain a high quality of submissions. The editors reserve the right to reject a submission when a proposal amounts to blatant misuse of the process. The authors may seek feedback from the wider community if the submitted proposal is rejected or clarifications are requested. -3. If a FEP editor approves a submission it receives the status `DRAFT` and is added to the repository. Editor also creates a tracking issue for the proposal. +2. Within seven days one of the facilitators will read and respond to the proposal. The facilitator checks if the proposal conforms to the required structure and fits the scope and objective of the FEPs. The facilitator may request the authors to clarify, justify, or withdraw the proposal. Such a request must not reflect the personal bias of a facilitator. Rather, it will be made strictly to maintain a high quality of submissions. The facilitators reserve the right to reject a submission when a proposal amounts to blatant misuse of the process. The authors may seek feedback from the wider community if the submitted proposal is rejected or clarifications are requested. +3. If a FEP Facilitator approves a submission it receives the status `DRAFT` and is added to the repository. The facilitator also creates a tracking issue for the proposal. 4. While a proposal has the status `DRAFT`: - Authors are responsible for initiating community discussion and collecting feedback. - - Authors may submit updates to the proposal which will be checked in to the repository by an editor. Others may also submit updates, but in this case a change must be approved by at least one author. - - Authors may withdraw the submission upon which an editor will set the status of the submission to `WITHDRAWN`. + - Authors may submit updates to the proposal which will be checked in to the repository by a facilitator. Others may also submit updates, but in this case a change must be approved by at least one author. + - Authors may withdraw the submission upon which a facilitator will set the status of the submission to `WITHDRAWN`. 5. After at least 60 days the authors may request the proposal to be finalized. This is done by requesting final comments on the proposal. - - If there are no community objections within 14 days and the authors can show that they have initiated sufficient awareness and discussion of the proposal, an editor will set the status of the submission to `FINAL`. -6. If after 1 year the authors have not requested the proposal to be finalized, an editor should inquire about the status of the proposal. If authors don't respond, an editor will set the status of the submission to `WITHDRAWN`. + - If there are no community objections within 14 days and the authors can show that they have initiated sufficient awareness and discussion of the proposal, a facilitator will set the status of the submission to `FINAL`. +6. If after 1 year the authors have not requested the proposal to be finalized, a facilitator should inquire about the status of the proposal. If authors don't respond, a facilitator will set the status of the submission to `WITHDRAWN`. 7. A proposal with status `FINAL` can not be changed or updated in a way that would lead to adjustments to implementations. Minor corrections are allowed. 8. Any substantial change to finalized proposal must be submitted as a separate FEP. - - The new FEP MUST include a `replaces` metadata attribute pointing to FEPs it supersedes. - - If the new FEP becomes `FINAL`, the original one MUST point to it in an added `replacedBy` metadata attribute. + +- The new FEP MUST include a `replaces` metadata attribute pointing to FEPs it supersedes. +- If the new FEP becomes `FINAL`, the original one MUST point to it in an added `replacedBy` metadata attribute. + 9. A proposal with status `WITHDRAWN` remains in the repository and can be resubmitted. -10. After a proposal becomes `FINAL` an editor will archive all discussions linked in the tracking issue and add the resulting archive links to the tracking issue. +10. After a proposal becomes `FINAL` a facilitator will archive all discussions linked in the tracking issue and add the resulting archive links to the tracking issue. -### Editors +### Facilitators -A list of editors is maintained in the `EDITORS.md` file at the root of the FEP repository. +A list of facilitators is maintained in the `FACILITATORS.md` file at the root of the FEP repository. ### Submission Methods @@ -129,15 +127,14 @@ A list of methods in which a proposal may be submitted is maintained in the `SUB FEP-a4ed (The Fediverse Enhancement Proposal Process) is a living document and can be updated despite having the `FINAL` status. -Anyone can propose a change to FEP-a4ed (or other documents related to the FEP process) using any method listed in `SUBMISSION.md` file. The change must be approved by at least two editors (one of them could be the submitter). For any part of the FEP process, there must be a sufficient number of editors who agreed to do the maintenance work. Changes should not be accepted before at least 1 month passes after the last update, to give editors and the community time to review them and provide feedback. +Anyone can propose a change to FEP-a4ed (or other documents related to the FEP process) using any method listed in `SUBMISSION.md` file. The change must be approved by at least two facilitators (one of them could be the submitter). For any part of the FEP process, there must be a sufficient number of facilitators who agreed to do the maintenance work. Changes should not be accepted before at least 1 month passes after the last update, to give facilitators and the community time to review them and provide feedback. -Minor changes (i.e. a correction of a typo or of a broken link) can be accepted immediately after getting two approvals from editors. +Minor changes (i.e. a correction of a typo or of a broken link) can be accepted immediately after getting two approvals from facilitators. ## History The process and format described in this proposal is influenced by other community driven documentation efforts such as the BitTorrent Enhancement Proposal Process [BEP-1], Scheme Request for Implementation [SRFI] and the IETF RFC Series [RFC-8729]. - ## References - [SRFI] Dave Mason, [Scheme Request For Implementation - Process](https://srfi.schemers.org/srfi-process.html) @@ -146,9 +143,8 @@ The process and format described in this proposal is influenced by other communi - [CommonMark] John MacFarlane, [CommonMark Spec](https://spec.commonmark.org/0.29/) Version 0.29, 2019 - [Internet-Draft-terminology] Mallory Knodel, [Terminology, Power and Oppressive Language](https://tools.ietf.org/html/draft-knodel-terminology) - ## Copyright -CC0 1.0 Universal (CC0 1.0) Public Domain Dedication +CC0 1.0 Universal (CC0 1.0) Public Domain Dedication To the extent possible under law, the authors of this Fediverse Enhancement Proposal have waived all copyright and related or neighboring rights to this work. diff --git a/scripts/README.md b/scripts/README.md index 32ceaa2..3f63afb 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -1,4 +1,4 @@ -# tools for fep editors +# tools for fep facilitators Please follow the steps in configuration before following "Merge a FEP". diff --git a/scripts/backmatter.md b/scripts/backmatter.md index 0e0cda2..8a19be4 100644 --- a/scripts/backmatter.md +++ b/scripts/backmatter.md @@ -31,9 +31,9 @@ python scripts/new_proposal.py TITLE OF YOUR PROPOSAL that should create a prefilled template for you. -## Editors +## Facilitators -The list of FEP's is facilitated by Editors who are listed in the [EDITORS.md](EDITORS.md) file. Editors are neutral custodians of the FEP process, who merge PR's, create tracking issues, and start discussion threads for each FEP in the [SocialHub](https://socialhub.activitypub.rocks) developer community forum. +The list of FEP's is maintained by the facilitators who are listed in the [FACILITATORS.md](FACILITATORS.md) file. Facilitators are neutral custodians of the FEP process, who merge PR's, create tracking issues, and start discussion threads for each FEP in the [SocialHub](https://socialhub.activitypub.rocks) developer community forum. ## Contributing diff --git a/scripts/create_issue.py b/scripts/create_issue.py index fcf042a..b58c696 100644 --- a/scripts/create_issue.py +++ b/scripts/create_issue.py @@ -33,7 +33,7 @@ Please post links to relevant discussions as comment to this issue. `dateReceived`: {date1} -If no further actions are taken, the proposal may be set by editors to `WITHDRAWN` on {date2} (in 1 year). +If no further actions are taken, the proposal may be set by the facilitators to `WITHDRAWN` on {date2} (in 1 year). """ with open("scripts/config.json") as f: diff --git a/scripts/tracking_issue.md b/scripts/tracking_issue.md deleted file mode 100644 index 571dca4..0000000 --- a/scripts/tracking_issue.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -name: "FEP Tracking Issue" -about: "This template is for creating a tracking issue for a newly received FEP" -title: "[TRACKING] FEP-XXX: TITLE " ---- - -The proposal has been received. Thank you! - -This issue tracks discussions and updates to the proposal during the `DRAFT` period. - -Please post links to relevant discussions as comment to this issue. - -`dateReceived`: [DATE-RECEIVED] - -If no further actions are taken, the proposal may be set by editors to `WITHDRAWN` on [DATE-RECEIVED+1-YEAR] (in 1 year). -