From a04e08631949e3a63aa774deba79098c0235e67d Mon Sep 17 00:00:00 2001 From: Stewart Mackenzie Date: Sat, 29 Apr 2017 22:19:13 +0800 Subject: [PATCH 1/6] Problem: Pieter Hintjens has moved off this mortal coil Solution: Stewart will take over editor role of 1/C4 --- 1/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1/README.md b/1/README.md index b8f19ca..9571c70 100644 --- a/1/README.md +++ b/1/README.md @@ -3,7 +3,7 @@ domain: rfc.unprotocols.org shortname: 1/C4 name: Collective Code Construction Contract status: stable -editor: Pieter Hintjens +editor: Stewart Mackenzie --- The Collective Code Construction Contract (C4) is an evolution of the github.com [Fork + Pull Model](http://help.github.com/send-pull-requests/), aimed at providing an optimal collaboration model for free software projects. This is revision 2 of the C4 specification. From 0a3b8c986a27a409f25fe9f59532f59f011f919a Mon Sep 17 00:00:00 2001 From: Stewart Mackenzie Date: Sun, 30 Apr 2017 04:42:53 +0800 Subject: [PATCH 2/6] Problem: The SHALL keyword conflicts with the Apache 2 License Solution: Make the choice of license "RECOMMENDED", but not mandatory. Yet the sprit of C4 is to retain a share-and-share alike mentality which is very good for community building. --- 1/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1/README.md b/1/README.md index 9571c70..d67d4dc 100644 --- a/1/README.md +++ b/1/README.md @@ -51,7 +51,7 @@ C4 is meant to provide a reusable optimal collaboration model for open source so ### 2.2. Licensing and Ownership -1. The project SHALL use a share-alike license such as the MPLv2, or a GPLv3 variant thereof (GPL, LGPL, AGPL). +1. The project SHOULD use a share-alike license such as the MPLv2, or a GPLv3 variant thereof (GPL, LGPL, AGPL). 1. All contributions to the project source code ("patches") SHALL use the same license as the project. 1. All patches are owned by their authors. There SHALL NOT be any copyright assignment process. 1. Each Contributor SHALL be responsible for identifying themselves in the project Contributor list. From d77177342103ee0e07d3c09c9962dc61a46fb23b Mon Sep 17 00:00:00 2001 From: Stewart Mackenzie Date: Sun, 30 Apr 2017 04:48:11 +0800 Subject: [PATCH 3/6] Problem: The chosen licene of specs is in conflict ETC's direction Solution: change the chosen license of specifications to be CC0. This obviously excludes the C4 and COSS as are already mandated as GPL and any derivative should be GPL. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8a28e78..fc46a0f 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,6 @@ You can start contributing by sending a pull request to https://github.com/ether * A specification SHOULD be created and modified by pull requests according to [RFC 1/C4](1/README.md) * Specification lifecycle SHOULD follow the lifecycle defined in [RFC 2/COSS](2/README.md) -* Specification SHOULD use GPL v3 or a later version of the license +* Specification SHOULD use the CC0 license * Specification SHOULD use [RFC 2119](http://tools.ietf.org/html/rfc2119) key words. * Non-cosmetic changes are allowed only on Raw and Draft specifications. From fb5498234be1ae99f4da668d6530483ccd41e13a Mon Sep 17 00:00:00 2001 From: Stewart Mackenzie Date: Sun, 30 Apr 2017 04:50:44 +0800 Subject: [PATCH 4/6] Problem: no temporary link to rendered content is supplied Solution: add it --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index fc46a0f..baacbca 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ We collect specifications for APIs, file formats, protocols, and processes. You can start contributing by sending a pull request to https://github.com/ethereumproject/rfc on GitHub. +Please visit https://sjmackenzie.gitbooks.io/rfc/content/ for the rendered content. + ## Guidelines * A specification SHOULD be created and modified by pull requests according to [RFC 1/C4](1/README.md) From 59d2cdc3880d4735738272502f8eb532fd79f523 Mon Sep 17 00:00:00 2001 From: Stewart Mackenzie Date: Sun, 30 Apr 2017 05:02:58 +0800 Subject: [PATCH 5/6] Problem: 2/COSS doesn't have a maintainer Solution: Make Yurii Rashkovskii to be a contributor and Stewart takes over editorial rights of 2/COSS. Also Pieter Hintjens needs acknowledgement as contributor --- 1/README.md | 2 ++ 2/README.md | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/1/README.md b/1/README.md index d67d4dc..4945462 100644 --- a/1/README.md +++ b/1/README.md @@ -4,6 +4,8 @@ shortname: 1/C4 name: Collective Code Construction Contract status: stable editor: Stewart Mackenzie +contributors: + - Pieter Hintjens --- The Collective Code Construction Contract (C4) is an evolution of the github.com [Fork + Pull Model](http://help.github.com/send-pull-requests/), aimed at providing an optimal collaboration model for free software projects. This is revision 2 of the C4 specification. diff --git a/2/README.md b/2/README.md index c9a256a..e6521dd 100644 --- a/2/README.md +++ b/2/README.md @@ -3,8 +3,9 @@ domain: rfc.unprotocols.org shortname: 2/COSS name: Consensus-Oriented Specification System status: draft -editor: Yurii Rashkovskii +editor: Stewart Mackenzie contributors: + - Yurii Rashkovskii - Pieter Hintjens - André Rebentisch - Alberto Barrionuevo From 5a1527e2f625b6ee88cc9b1b6dd6228a7b177239 Mon Sep 17 00:00:00 2001 From: Stewart Mackenzie Date: Sun, 30 Apr 2017 05:11:49 +0800 Subject: [PATCH 6/6] Problem: URL doesn't need to be displayed Solution: make it a link, this'll allow for a smoother transition and silly questions like who's hosting the account don't arise. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index baacbca..a1a73f1 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ We collect specifications for APIs, file formats, protocols, and processes. You can start contributing by sending a pull request to https://github.com/ethereumproject/rfc on GitHub. -Please visit https://sjmackenzie.gitbooks.io/rfc/content/ for the rendered content. +Please [read this](https://sjmackenzie.gitbooks.io/rfc/content/) for the rendered content. ## Guidelines