Commit 6dd982e5 authored by Wilko Manger's avatar Wilko Manger

Update CONTRIBUTING.md for DCO and add link to it

parent 8ad331a5
......@@ -10,27 +10,6 @@
When contributing code to Pattle, your code will be licensed under the
[AGPLv3](https://www.gnu.org/licenses/agpl-3.0.en.html).
## CLA
To contribute, a [CLA](https://git.pattle.im/pattle/util/cla/blob/master/cla.pdf)
has to be signed. This is the Fiduciary Contributor License Agreement,
a very free software friendly license agreement. It actually guarantees you (the Contributor)
that your contributions will never be relicensed to anything other than AGPL version 3 or
higher.
To sign the CLA, please send a signed copy to [wilko@rens.onl](mailto:wilko@rens.onl).
An image of your signature is also okay, to do this easily you can edit the
[HTML version](https://git.pattle.im/pattle/util/cla/blob/master/cla.html), add a
photo of your signature as an `<img>` tag, render it with
[`pandoc`](https://pandoc.org/) using:
```sh
pandoc cla-signed.html -t html -o cla-signed.pdf --css cla.css
```
Please note that in the future the signing process will be automated using
[CLAM](https://gitlab.com/Xatom/CLAM).
## General contribution steps
1. Fork the project.
......@@ -84,3 +63,67 @@
```
Here, `Wilko Manger` is the file creator, and `Nathan van Beelen` contributed later on.
## Before you can contribute
We use the [DCO](https://developercertificate.org/), which asserts that the
contribution is yours, and you allow Pattle to use it.
If you agree to what's stated in the DCO (also shown under), you can
sign-off your commits:
```
Signed-off-by: Joe Smith <joe.smith@email.org>
```
If your `user.name` and `user.email` are set for git, you can
sign-off your commits using:
```
git commit -s
```
Contributions can only be accepted if you agree to the DCO,
indicated by the sign-off.
See [CONTRIBUTING.md](CONTRIBUTING.md) for details on contributing.
### DCO
```text
Developer Certificate of Origin
Version 1.1
Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
660 York Street, Suite 102,
San Francisco, CA 94110 USA
Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.
Developer's Certificate of Origin 1.1
By making a contribution to this project, I certify that:
(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file; or
(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source
license and I have the right under that license to submit that
work with modifications, whether created in whole or in part
by me, under the same open source license (unless I am
permitted to submit under a different license), as indicated
in the file; or
(c) The contribution was provided directly to me by some other
person who certified (a), (b) or (c) and I have not modified
it.
(d) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.
```
\ No newline at end of file
......@@ -74,6 +74,8 @@
Contributions can only be accepted if you agree to the DCO,
indicated by the sign-off.
See [CONTRIBUTING.md](CONTRIBUTING.md) for details on contributing.
### DCO
```text
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment