From 343dc2963b95fe72e72f90e0849674236f18a2cf Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Sat, 21 Sep 2013 16:42:31 +0200 Subject: [PATCH] added Unamesa Association as (We or Us). Got OK from Jermolene to use CC-BY for media content. --- editions/tw5.com/tiddlers/Contributing.tid | 4 ++++ licenses/cla-entity.md | 2 +- licenses/cla-individual.md | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/editions/tw5.com/tiddlers/Contributing.tid b/editions/tw5.com/tiddlers/Contributing.tid index 37d18abcc..4365562da 100644 --- a/editions/tw5.com/tiddlers/Contributing.tid +++ b/editions/tw5.com/tiddlers/Contributing.tid @@ -44,6 +44,10 @@ git push origin sign-cla ''Go to your github repo and create a pull request.'' +!!!! Remark for Alpha and Beta Sontributors + +This is the first CLA, TiddlyWiki uses. So if we did miss something important, please let us know. If we make essential changes to the CLA, all contributors will need to sign it again. So we should get it right as soon as possible. + ''Thank you!'' !!!! Attribution diff --git a/licenses/cla-entity.md b/licenses/cla-entity.md index d93d8185c..a7c1c3781 100644 --- a/licenses/cla-entity.md +++ b/licenses/cla-entity.md @@ -1,7 +1,7 @@ TiddlyWiki5 Entity Contributor License Agreement ================================================ -Thank you for your interest in contributing to TiddlyWiki5 ("We" or "Us"). +Thank you for your interest in contributing to TiddlyWiki5. TiddlyWiki is owned by the UnaMesa Association ("We" or "Us"). This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please sign it and send it to Us by electronic submission, following the instructions in `contributing.md`, which is in the root directory of the project repository. This is a legally binding document, so please read it carefully before agreeing to it. The Agreement may cover more than one software project managed by Us. diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 35ff33518..5c0c92ca7 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -1,7 +1,7 @@ TiddlyWiki5 Individual Contributor License Agreement ==================================================== -Thank you for your interest in contributing to TiddlyWiki5 ("We" or "Us"). +Thank you for your interest in contributing to TiddlyWiki5. TiddlyWiki is owned by the UnaMesa Association ("We" or "Us"). This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please sign it and send it to Us by electronic submission, following the instructions in `contributing.md`, which is in the root directory of the project repository. This is a legally binding document, so please read it carefully before agreeing to it. The Agreement may cover more than one software project managed by Us. @@ -107,5 +107,5 @@ eg: Jeremy Ruston, Jermolene, 2011/11/22 Contributors ------------ -Mario Pietsch, pmario, 2013/09/19 +Mario Pietsch, pmario, 2013/09/21