mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-23 10:07:19 +00:00
Code Issues Releases Wiki Activity

Minor rewording of contributing tiddler

Browse Source
This commit is contained in:
Jeremy Ruston 2013-09-21 18:04:22 +01:00
parent b04c7bbd3a
commit 7070313cd2
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contributing.md
View File

@ -27,7 +27,10 @@ ContributorLicenseAgreement</a> from individual contributors before contribution
For individuals use: <a class='tw-tiddlylink tw-tiddlylink-external' href='https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md'> For individuals use: <a class='tw-tiddlylink tw-tiddlylink-external' href='https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md'>
CLA-individual</a></li><li> CLA-individual</a></li><li>
For entities use: <a class='tw-tiddlylink tw-tiddlylink-external' href='https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md'> For entities use: <a class='tw-tiddlylink tw-tiddlylink-external' href='https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md'>
CLA-entity</a></li></ul><h3 class=''> CLA-entity</a></li></ul><p>
<em>
This is a first pass at a CLA for <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='http://five.tiddlywiki.com/static/TiddlyWiki.html'>
TiddlyWiki</a>. 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</em></p><h3 class=''>
How to sign the CLA</h3><pre> How to sign the CLA</h3><pre>
git clone https://github.com/Jermolene/TiddlyWiki5.git TiddlyWiki5 git clone https://github.com/Jermolene/TiddlyWiki5.git TiddlyWiki5
cd TiddlyWiki5 cd TiddlyWiki5
@ -35,15 +38,12 @@ git checkout -b sign-cla</pre><p>
<strong> <strong>
Add your name and the date to cla-individual.md or cla-entity.md</strong>. Date format (YYYY/MM/DD) Add your name and the date to cla-individual.md or cla-entity.md</strong>. Date format (YYYY/MM/DD)
eg: <code> eg: <code>
Jermy Ruston - 2011/11/22</code></p><pre> Jeremy Ruston, @Jermolene, 2011/11/22</code></p><pre>
git add . git add .
git commit -m &quot;sign contributor license agreement&quot; git commit -m &quot;sign contributor license agreement&quot;
git push origin sign-cla</pre><p> git push origin sign-cla</pre><p>
<strong> <strong>
Go to your github repo and create a pull request.</strong></p><h4 class=''> Go to your github repo and create a pull request.</strong></p><p>
Remark for Alpha and Beta Sontributors</h4><p>
This is the first CLA, <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='http://five.tiddlywiki.com/static/TiddlyWiki.html'>
TiddlyWiki</a> 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.</p><p>
<strong> <strong>
Thank you!</strong></p><h4 class=''> Thank you!</strong></p><h4 class=''>
Attribution</h4><p> Attribution</h4><p>

8
editions/tw5.com/tiddlers/Contributing.tid
View File

@ -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 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]] * 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 !!! 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) ''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 . git add .
@ -44,10 +46,6 @@ git push origin sign-cla
''Go to your github repo and create a pull request.'' ''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!'' ''Thank you!''
!!!! Attribution !!!! Attribution