Skip to content

Commit

Permalink
Merge pull request #2 from sjmackenzie/master
Browse files Browse the repository at this point in the history
Problem: GPL license conflicts with ETC project's license direction
  • Loading branch information
sorpaas committed Apr 30, 2017
2 parents 0b3653f + 5a1527e commit b8eeb11
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
6 changes: 4 additions & 2 deletions 1/README.md
Expand Up @@ -3,7 +3,9 @@ domain: rfc.unprotocols.org
shortname: 1/C4
name: Collective Code Construction Contract
status: stable
editor: Pieter Hintjens <ph@imatix.com>
editor: Stewart Mackenzie <setori88@gmail.com>
contributors:
- Pieter Hintjens <ph@imatix.com>
---

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.
Expand Down Expand Up @@ -51,7 +53,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.
Expand Down
3 changes: 2 additions & 1 deletion 2/README.md
Expand Up @@ -3,8 +3,9 @@ domain: rfc.unprotocols.org
shortname: 2/COSS
name: Consensus-Oriented Specification System
status: draft
editor: Yurii Rashkovskii <yrashk@gmail.com>
editor: Stewart Mackenzie <setori88@gmail.com>
contributors:
- Yurii Rashkovskii <yrashk@gmail.com>
- Pieter Hintjens <ph@imatix.com>
- André Rebentisch <andre@openstandards.de>
- Alberto Barrionuevo <abarrio@opentia.es>
Expand Down
4 changes: 3 additions & 1 deletion README.md
Expand Up @@ -7,10 +7,12 @@ 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 [read this](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)
* 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.

0 comments on commit b8eeb11

Please sign in to comment.