From 7070313cd2be7cf2c626e17457730d2cc5772e1a Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Sat, 21 Sep 2013 18:04:22 +0100 Subject: [PATCH] Minor rewording of contributing tiddler --- contributing.md | 12 ++++++------ editions/tw5.com/tiddlers/Contributing.tid | 8 +++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/contributing.md b/contributing.md index 8e356d101..7dbaf266d 100644 --- a/contributing.md +++ b/contributing.md @@ -27,7 +27,10 @@ ContributorLicenseAgreement from individual contributors before contribution For individuals use: CLA-individual
  • For entities use: -CLA-entity
  • +CLA-entity

    + +This is a first pass at a CLA for +TiddlyWiki. Please let us know if we missed something important. If we do have to make essential changes to the CLA, there is a possibility that all contributors will need to sign it again

    How to sign the CLA

     git clone https://github.com/Jermolene/TiddlyWiki5.git TiddlyWiki5
     cd TiddlyWiki5
    @@ -35,15 +38,12 @@ git checkout -b sign-cla

    Add your name and the date to cla-individual.md or cla-entity.md. Date format (YYYY/MM/DD) eg: -Jermy Ruston - 2011/11/22

    +Jeremy Ruston, @Jermolene, 2011/11/22

     git add .
     git commit -m "sign contributor license agreement"
     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.

    +Go to your github repo and create a pull request.

    Thank you!

    Attribution

    diff --git a/editions/tw5.com/tiddlers/Contributing.tid b/editions/tw5.com/tiddlers/Contributing.tid index 4365562da..48f5acb28 100644 --- a/editions/tw5.com/tiddlers/Contributing.tid +++ b/editions/tw5.com/tiddlers/Contributing.tid @@ -25,6 +25,8 @@ Like other OpenSource projects, TiddlyWiki5 needs a signed ContributorLicenseAgr * For individuals use: [[CLA-individual|https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md]] * For entities use: [[CLA-entity|https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md]] +//This is a first pass at a CLA for TiddlyWiki. Please let us know if we missed something important. If we do have to make essential changes to the CLA, there is a possibility that all contributors will need to sign it again// + !!! How to sign the CLA ``` @@ -34,7 +36,7 @@ git checkout -b sign-cla ``` ''Add your name and the date to cla-individual.md or cla-entity.md''. Date format (YYYY/MM/DD) -eg: `Jermy Ruston - 2011/11/22` +eg: `Jeremy Ruston, @Jermolene, 2011/11/22` ``` git add . @@ -44,10 +46,6 @@ 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