diff --git a/contributing.md b/contributing.md index d14f5cff1..0719aea4e 100644 --- a/contributing.md +++ b/contributing.md @@ -1,52 +1,34 @@ -Contributing -============ - -TiddlyWiki5 welcomes contributions to its code and documentation via [GitHub](https://github.com/Jermolene/TiddlyWiki5). Please take a moment to read these notes to help make the process as smooth as possible. - -Bug Reports ------------ - -From a programmers perspective, a bug report that just says "it doesn't work" is highly frustrating. For effective debugging, we need as much information as possible. At a minimum, please ensure that you include: - - * A descriptive title - * A summary - * Steps to reproduce - * Expected behaviour - * Context (OS, browser etc.) - -There's a lot of good material on the web about bug reports: - -http://mhay68.tumblr.com/post/1648223018/what-makes-a-good-bug-report http://www.chiark.greenend.org.uk/~sgtatham/bugs.html - -Pull Requests --------------- - -Like other OpenSource projects, TiddlyWiki5 needs a signed ContributorLicenseAgreement from individual contributors before contributions of code can be accepted. - - * For individuals use: [CLA-individual](https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md) - * For entities use: [CLA-individual](https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md) - -### How it works - -``` -git clone https://github.com/Jermolene/TiddlyWiki5.git TiddlyWiki5 -cd TiddlyWiki5 -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 ` - -``` -git add . -git commit -m "sign contributor license agreement" -git push origin sign-cla -``` - -**Go to your github repo and create a pull request.** - -Thank you! - -#### Attribution - -The CLA documents used for this project where created using [Harmony Project Templates](http://www.harmonyagreements.org). "HA-CLA-I-LIST Version 1.0" for "CLA-individual" and "HA-CLA-E-LIST Version 1.0" for "CLA-entity" +

+Contributing to +TiddlyWiki5

+
+

+ +TiddlyWiki5 welcomes contributions to its code and documentation +via GitHub. Please take a moment to read these notes to help make the process as smooth as possible.

+Bug Reports

+From a programmers perspective, a bug report that just says "it doesn't work" is highly frustrating. For effective debugging, we need as much information as possible. At a minimum, please ensure that you include:

+There's a lot of good material on the web about bug reports:

+ +http://mhay68.tumblr.com/post/1648223018/what-makes-a-good-bug-report + +http://www.chiark.greenend.org.uk/~sgtatham/bugs.html

+Pull Requests

+Like other +OpenSource projects, +TiddlyWiki5 needs a signed +ContributorLicenseAgreement from individual contributors before contributions of code can be accepted.

+ +As of July 2013, +TiddlyWiki5 does not yet have the necessary infrastructure to permit CLAs to be signed and retained. +

+ +This file was automatically generated by +TiddlyWiki5 +

\ No newline at end of file diff --git a/editions/tw5.com/tiddlers/Contributing.tid b/editions/tw5.com/tiddlers/Contributing.tid index 0a6af112d..37d18abcc 100644 --- a/editions/tw5.com/tiddlers/Contributing.tid +++ b/editions/tw5.com/tiddlers/Contributing.tid @@ -1,10 +1,10 @@ -modified: 201307020736 +modified: 201309191633 title: Contributing tags: introduction -TiddlyWiki5 welcomes contributions to its code and documentation [[via GitHub|https://github.com/Jermolene/TiddlyWiki5]]. Please take a moment to read these notes to help make the process as smooth as possible. +TiddlyWiki5 welcomes contributions to its code and documentation via [[GitHub|https://github.com/Jermolene/TiddlyWiki5]]. Please take a moment to read these notes to help make the process as smooth as possible. -! Bug Reports +!! Bug Reports From a programmers perspective, a bug report that just says "it doesn't work" is highly frustrating. For effective debugging, we need as much information as possible. At a minimum, please ensure that you include: @@ -16,11 +16,36 @@ From a programmers perspective, a bug report that just says "it doesn't work" is There's a lot of good material on the web about bug reports: -http://mhay68.tumblr.com/post/1648223018/what-makes-a-good-bug-report -http://www.chiark.greenend.org.uk/~sgtatham/bugs.html +http://mhay68.tumblr.com/post/1648223018/what-makes-a-good-bug-report http://www.chiark.greenend.org.uk/~sgtatham/bugs.html -! Pull Requests +!! Pull Requests Like other OpenSource projects, TiddlyWiki5 needs a signed ContributorLicenseAgreement from individual contributors before contributions of code can be accepted. -//As of July 2013, TiddlyWiki5 does not yet have the necessary infrastructure to permit CLAs to be signed and retained.// +* 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]] + +!!! How to sign the CLA + +``` +git clone https://github.com/Jermolene/TiddlyWiki5.git TiddlyWiki5 +cd TiddlyWiki5 +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` + +``` +git add . +git commit -m "sign contributor license agreement" +git push origin sign-cla +``` + +''Go to your github repo and create a pull request.'' + +''Thank you!'' + +!!!! Attribution + +The CLA documents used for this project where created using [[Harmony Project Templates|http://www.harmonyagreements.org]]. "~HA-CLA-I-LIST Version 1.0" for "CLA-individual" and "~HA-CLA-E-LIST Version 1.0" for "CLA-entity" diff --git a/licenses/cla-entity.md b/licenses/cla-entity.md index e82e57a14..d93d8185c 100644 --- a/licenses/cla-entity.md +++ b/licenses/cla-entity.md @@ -64,7 +64,7 @@ Any rights not expressly assigned or licensed under this section are expressly r ### 2.7 3rd Party Libraries and Plugins -We may use 3rd party libraries to create TiddlyWiki5 plugins. These libraries may have there own licenses. 3rd party software and licenses are not subject in this CLA, while TiddlyWiki5 plugins, that use these libraries are. 3rd party libraries may be included everywhere, especially in the following directories and there subdirectories: `plugins/` and `editions/`. +We may use 3rd party libraries to create TiddlyWiki5 plugins. These libraries may have their own licenses. 3rd party software and licenses are not subject in this CLA, while TiddlyWiki5 plugins that use these libraries are. 3rd party libraries may be included everywhere, especially in the following directories and their subdirectories: `plugins/` and `editions/`. 3. Agreement diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 59d83e076..35ff33518 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -59,7 +59,7 @@ Any rights not expressly licensed under this section are expressly reserved by Y ### 2.7 3rd Party Libraries and Plugins -We may use 3rd party libraries to create TiddlyWiki5 plugins. These libraries may have there own licenses. 3rd party software and licenses are not subject in this CLA, while TiddlyWiki5 plugins, that use these libraries are. 3rd party libraries may be included everywhere, especially in the following directories and there subdirectories: `plugins/` and `editions/`. +We may use 3rd party libraries to create TiddlyWiki5 plugins. These libraries may have their own licenses. 3rd party software and licenses are not subject in this CLA, while TiddlyWiki5 plugins that use these libraries are. 3rd party libraries may be included everywhere, especially in the following directories and their subdirectories: `plugins/` and `editions/`. 3. Agreement ------------