From a9067d31d6b07f02cb3bedcc28624714f0babee6 Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Wed, 18 Sep 2013 15:38:32 +0200 Subject: [PATCH 1/8] cla-individual draft ok --- contributing.md | 82 ++++++++++++++++------------ licenses/cla-entity.md | 108 +++++++++++++++++++++++++++++++++++++ licenses/cla-individual.md | 108 +++++++++++++++++++++++++++++++++++++ 3 files changed, 264 insertions(+), 34 deletions(-) create mode 100644 licenses/cla-entity.md create mode 100644 licenses/cla-individual.md diff --git a/contributing.md b/contributing.md index 0719aea4e..0e28ed29a 100644 --- a/contributing.md +++ b/contributing.md @@ -1,34 +1,48 @@ -

-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:

    -
  • -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.

- -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 +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! diff --git a/licenses/cla-entity.md b/licenses/cla-entity.md new file mode 100644 index 000000000..fa93db99f --- /dev/null +++ b/licenses/cla-entity.md @@ -0,0 +1,108 @@ +TiddlyWiki5 Individual Contributor License Agreement +==================================================== + +Thank you for your interest in contributing to TiddlyWiki5 ("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 at https://github.com/Jermolene/TiddlyWiki5/blob/master/contributing.md. 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. + +1. Definitions +--------------- + +"You" means the individual who Submits a Contribution to Us. + +"CLA" means Contributor License Agreement (this document) + +"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in . + +"Copyright" means all rights protecting works of authorship owned or controlled by You, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence including any extensions by You. + +"Material" means the work of authorship which is made available by Us to third parties. When this Agreement covers more than one software project, the Material means the work of authorship to which the Contribution was Submitted. After You Submit the Contribution, it may be included in the Material. + +"Submit" means any form of electronic, verbal, or written communication sent to Us or our representatives, including but not limited to electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Us for the purpose of discussing and improving the Material, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution." + +"Submission Date" means the date on which You Submit a Contribution to Us. + +"Effective Date" means the date You execute this Agreement or the date You first Submit a Contribution to Us, whichever is earlier. + +"Media" means any portion of a Contribution which is not software. + +2. Grant of Rights +------------------ + +### 2.1 Copyright License + +(a) You retain ownership of the Copyright in Your Contribution and have the same rights to use or license the Contribution which You would have had without entering into the Agreement. + +(b) To the maximum extent permitted by the relevant law, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable license under the Copyright covering the Contribution, with the right to sublicense such rights through multiple tiers of sublicensees, to reproduce, modify, display, perform and distribute the Contribution as part of the Material; provided that this license is conditioned upon compliance with Section 2.3. + +### 2.2 Patent License + +For patent claims including, without limitation, method, process, and apparatus claims which You own, control or have the right to grant, now or in the future, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable patent license, with the right to sublicense these rights to multiple tiers of sublicensees, to make, have made, use, sell, offer for sale, import and otherwise transfer the Contribution and the Contribution in combination with the Material (and portions of such combination). This license is granted only to the extent that the exercise of the licensed rights infringes such patent claims; and provided that this license is conditioned upon compliance with Section 2.3. + +### 2.3 Outbound License + +As a condition on the grant of rights in Sections 2.1 and 2.2, We agree to license the Contribution only under the terms of the license or licenses which We are using on the Submission Date for the Material or the following additional licenses: BSD 3-clause "New" or "Revised" License (including any right to adopt any future version of a license if permitted). + +In addition, We may use the following licenses for Media in the Contribution: Creative Commons Attribution 3.0 (including any right to adopt any future version of a license if permitted). + +### 2.4 Moral Rights. + +If moral rights apply to the Contribution, to the maximum extent permitted by law, You waive and agree not to assert such moral rights against Us or our successors in interest, or any of our licensees, either direct or indirect. + +### 2.5 Our Rights. +You acknowledge that We are not obligated to use Your Contribution as part of the Material and may decide to include any Contribution We consider appropriate. + +### 2.6 Reservation of Rights. +Any rights not expressly licensed under this section are expressly reserved by You. + +### 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/`. + +3. Agreement +------------ + +You confirm that: + +(a) You have the legal authority to enter into this Agreement. + +(b) You own the Copyright and patent claims covering the Contribution which are required to grant the rights under Section 2. + +(c) The grant of rights under Section 2 does not violate any grant of rights which You have made to third parties, including Your employer. If You are an employee, You have had Your employer approve this Agreement or sign the Entity version of this document. If You are less than eighteen years old, please have Your parents or guardian sign the Agreement. + +(d) You have followed the instructions in , if You do not own the Copyright in the entire work of authorship Submitted. + +4. Disclaimer +-------------- + +EXCEPT FOR THE EXPRESS WARRANTIES IN SECTION 3, THE CONTRIBUTION IS PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION TO THE MINIMUM PERIOD PERMITTED BY LAW. + +5. Consequential Damage Waiver +------------------------------ + +TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED. + +6. Miscellaneous +---------------- + +6.1 This Agreement will be governed by and construed in accordance with the laws of excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement. + +6.2 This Agreement sets out the entire agreement between You and Us for Your Contributions to Us and overrides all other agreements or understandings. + +6.3 If You or We assign the rights or obligations received through this Agreement to a third party, as a condition of the assignment, that third party must agree in writing to abide by all the rights and obligations in the Agreement. + +6.4 The failure of either party to require performance by the other party of any provision of this Agreement in one situation shall not affect the right of a party to require such performance at any time in the future. A waiver of performance under a provision in one situation shall not be considered a waiver of the performance of the provision in the future or a waiver of the provision in its entirety. + +6.5 If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and which is enforceable. The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law. + +6.6 This document text was created using [Harmony (HA-CLA-I-LIST) Version 1.0](http://www.harmonyagreements.org) + +List of Contributors +==================== + +The below-signed are contributors to a code repository that is part of the project named "TiddlyWiki5". Each below-signed contributor has read, understand and agrees to the terms above in the section within this document entitled "TiddlyWiki5 Individual Contributor License Agreement" as of the date beside his or her name. + +Contributors +------------ + +Mario Pietsch, 2013/09/18 + diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md new file mode 100644 index 000000000..fa93db99f --- /dev/null +++ b/licenses/cla-individual.md @@ -0,0 +1,108 @@ +TiddlyWiki5 Individual Contributor License Agreement +==================================================== + +Thank you for your interest in contributing to TiddlyWiki5 ("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 at https://github.com/Jermolene/TiddlyWiki5/blob/master/contributing.md. 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. + +1. Definitions +--------------- + +"You" means the individual who Submits a Contribution to Us. + +"CLA" means Contributor License Agreement (this document) + +"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in . + +"Copyright" means all rights protecting works of authorship owned or controlled by You, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence including any extensions by You. + +"Material" means the work of authorship which is made available by Us to third parties. When this Agreement covers more than one software project, the Material means the work of authorship to which the Contribution was Submitted. After You Submit the Contribution, it may be included in the Material. + +"Submit" means any form of electronic, verbal, or written communication sent to Us or our representatives, including but not limited to electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Us for the purpose of discussing and improving the Material, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution." + +"Submission Date" means the date on which You Submit a Contribution to Us. + +"Effective Date" means the date You execute this Agreement or the date You first Submit a Contribution to Us, whichever is earlier. + +"Media" means any portion of a Contribution which is not software. + +2. Grant of Rights +------------------ + +### 2.1 Copyright License + +(a) You retain ownership of the Copyright in Your Contribution and have the same rights to use or license the Contribution which You would have had without entering into the Agreement. + +(b) To the maximum extent permitted by the relevant law, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable license under the Copyright covering the Contribution, with the right to sublicense such rights through multiple tiers of sublicensees, to reproduce, modify, display, perform and distribute the Contribution as part of the Material; provided that this license is conditioned upon compliance with Section 2.3. + +### 2.2 Patent License + +For patent claims including, without limitation, method, process, and apparatus claims which You own, control or have the right to grant, now or in the future, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable patent license, with the right to sublicense these rights to multiple tiers of sublicensees, to make, have made, use, sell, offer for sale, import and otherwise transfer the Contribution and the Contribution in combination with the Material (and portions of such combination). This license is granted only to the extent that the exercise of the licensed rights infringes such patent claims; and provided that this license is conditioned upon compliance with Section 2.3. + +### 2.3 Outbound License + +As a condition on the grant of rights in Sections 2.1 and 2.2, We agree to license the Contribution only under the terms of the license or licenses which We are using on the Submission Date for the Material or the following additional licenses: BSD 3-clause "New" or "Revised" License (including any right to adopt any future version of a license if permitted). + +In addition, We may use the following licenses for Media in the Contribution: Creative Commons Attribution 3.0 (including any right to adopt any future version of a license if permitted). + +### 2.4 Moral Rights. + +If moral rights apply to the Contribution, to the maximum extent permitted by law, You waive and agree not to assert such moral rights against Us or our successors in interest, or any of our licensees, either direct or indirect. + +### 2.5 Our Rights. +You acknowledge that We are not obligated to use Your Contribution as part of the Material and may decide to include any Contribution We consider appropriate. + +### 2.6 Reservation of Rights. +Any rights not expressly licensed under this section are expressly reserved by You. + +### 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/`. + +3. Agreement +------------ + +You confirm that: + +(a) You have the legal authority to enter into this Agreement. + +(b) You own the Copyright and patent claims covering the Contribution which are required to grant the rights under Section 2. + +(c) The grant of rights under Section 2 does not violate any grant of rights which You have made to third parties, including Your employer. If You are an employee, You have had Your employer approve this Agreement or sign the Entity version of this document. If You are less than eighteen years old, please have Your parents or guardian sign the Agreement. + +(d) You have followed the instructions in , if You do not own the Copyright in the entire work of authorship Submitted. + +4. Disclaimer +-------------- + +EXCEPT FOR THE EXPRESS WARRANTIES IN SECTION 3, THE CONTRIBUTION IS PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION TO THE MINIMUM PERIOD PERMITTED BY LAW. + +5. Consequential Damage Waiver +------------------------------ + +TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED. + +6. Miscellaneous +---------------- + +6.1 This Agreement will be governed by and construed in accordance with the laws of excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement. + +6.2 This Agreement sets out the entire agreement between You and Us for Your Contributions to Us and overrides all other agreements or understandings. + +6.3 If You or We assign the rights or obligations received through this Agreement to a third party, as a condition of the assignment, that third party must agree in writing to abide by all the rights and obligations in the Agreement. + +6.4 The failure of either party to require performance by the other party of any provision of this Agreement in one situation shall not affect the right of a party to require such performance at any time in the future. A waiver of performance under a provision in one situation shall not be considered a waiver of the performance of the provision in the future or a waiver of the provision in its entirety. + +6.5 If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and which is enforceable. The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law. + +6.6 This document text was created using [Harmony (HA-CLA-I-LIST) Version 1.0](http://www.harmonyagreements.org) + +List of Contributors +==================== + +The below-signed are contributors to a code repository that is part of the project named "TiddlyWiki5". Each below-signed contributor has read, understand and agrees to the terms above in the section within this document entitled "TiddlyWiki5 Individual Contributor License Agreement" as of the date beside his or her name. + +Contributors +------------ + +Mario Pietsch, 2013/09/18 + From dddb8bbccaf5f5b1f1793c7bb6266e19268dcbfd Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Wed, 18 Sep 2013 16:19:26 +0200 Subject: [PATCH 2/8] cla-individual and cla-entity draft for discussion --- licenses/cla-entity.md | 53 +++++++++++++++++++++----------------- licenses/cla-individual.md | 11 +++++--- licenses/copyright.tid | 1 + 3 files changed, 38 insertions(+), 27 deletions(-) create mode 120000 licenses/copyright.tid diff --git a/licenses/cla-entity.md b/licenses/cla-entity.md index fa93db99f..db4a54d43 100644 --- a/licenses/cla-entity.md +++ b/licenses/cla-entity.md @@ -1,20 +1,20 @@ -TiddlyWiki5 Individual Contributor License Agreement -==================================================== +TiddlyWiki5 Entity Contributor License Agreement +================================================ Thank you for your interest in contributing to TiddlyWiki5 ("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 at https://github.com/Jermolene/TiddlyWiki5/blob/master/contributing.md. 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. 1. Definitions ---------------- +-------------- -"You" means the individual who Submits a Contribution to Us. +"You" means any Legal Entity on behalf of whom a Contribution has been received by Us. -"CLA" means Contributor License Agreement (this document) +"CLA" means Contributor License Agreement (this document). -"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in . - -"Copyright" means all rights protecting works of authorship owned or controlled by You, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence including any extensions by You. +"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in https://github.com/Jermolene/TiddlyWiki5/blob/master/contributing.md. + +"Copyright" means all rights protecting works of authorship owned or controlled by You or Your Affiliates, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence including any extensions by You. "Material" means the work of authorship which is made available by Us to third parties. When this Agreement covers more than one software project, the Material means the work of authorship to which the Contribution was Submitted. After You Submit the Contribution, it may be included in the Material. @@ -26,8 +26,13 @@ This contributor agreement ("Agreement") documents the rights granted by contrib "Media" means any portion of a Contribution which is not software. +"Legal Entity" means an entity which is not a natural person. + +"Affiliates" means other Legal Entities that control, are controlled by, or under common control with that Legal Entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such Legal Entity, whether by contract or otherwise, (ii) ownership of fifty percent (50%) or more of the outstanding shares or securities which vote to elect the management or other persons who direct such Legal Entity or (iii) beneficial ownership of such entity. + + 2. Grant of Rights ------------------- +------------------- ### 2.1 Copyright License @@ -37,27 +42,31 @@ This contributor agreement ("Agreement") documents the rights granted by contrib ### 2.2 Patent License -For patent claims including, without limitation, method, process, and apparatus claims which You own, control or have the right to grant, now or in the future, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable patent license, with the right to sublicense these rights to multiple tiers of sublicensees, to make, have made, use, sell, offer for sale, import and otherwise transfer the Contribution and the Contribution in combination with the Material (and portions of such combination). This license is granted only to the extent that the exercise of the licensed rights infringes such patent claims; and provided that this license is conditioned upon compliance with Section 2.3. +For patent claims including, without limitation, method, process, and apparatus claims which You or Your Affiliates own, control or have the right to grant, now or in the future, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable patent license, with the right to sublicense these rights to multiple tiers of sublicensees, to make, have made, use, sell, offer for sale, import and otherwise transfer the Contribution and the Contribution in combination with the Material (and portions of such combination). This license is granted only to the extent that the exercise of the licensed rights infringes such patent claims; and provided that this license is conditioned upon compliance with Section 2.3. ### 2.3 Outbound License -As a condition on the grant of rights in Sections 2.1 and 2.2, We agree to license the Contribution only under the terms of the license or licenses which We are using on the Submission Date for the Material or the following additional licenses: BSD 3-clause "New" or "Revised" License (including any right to adopt any future version of a license if permitted). +As a condition on the grant of rights in Sections 2.1 and 2.2, We agree to license the Contribution only under the terms of the license or licenses which We are using on the Submission Date for the Material or the following additional licenses BSD 3-clause "New" or "Revised" License (including any right to adopt any future version of a license if permitted). In addition, We may use the following licenses for Media in the Contribution: Creative Commons Attribution 3.0 (including any right to adopt any future version of a license if permitted). -### 2.4 Moral Rights. +### 2.4 Moral Rights. If moral rights apply to the Contribution, to the maximum extent permitted by law, You waive and agree not to assert such moral rights against Us or our successors in interest, or any of our licensees, either direct or indirect. -### 2.5 Our Rights. +### 2.5 Our Rights. + You acknowledge that We are not obligated to use Your Contribution as part of the Material and may decide to include any Contribution We consider appropriate. ### 2.6 Reservation of Rights. -Any rights not expressly licensed under this section are expressly reserved by You. + +Any rights not expressly assigned or licensed under this section are expressly reserved by You. ### 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/`. + 3. Agreement ------------ @@ -65,21 +74,21 @@ You confirm that: (a) You have the legal authority to enter into this Agreement. -(b) You own the Copyright and patent claims covering the Contribution which are required to grant the rights under Section 2. +(b) You or Your Affiliates own the Copyright and patent claims covering the Contribution which are required to grant the rights under Section 2. -(c) The grant of rights under Section 2 does not violate any grant of rights which You have made to third parties, including Your employer. If You are an employee, You have had Your employer approve this Agreement or sign the Entity version of this document. If You are less than eighteen years old, please have Your parents or guardian sign the Agreement. +(c) The grant of rights under Section 2 does not violate any grant of rights which You or Your Affiliates have made to third parties. (d) You have followed the instructions in , if You do not own the Copyright in the entire work of authorship Submitted. 4. Disclaimer -------------- -EXCEPT FOR THE EXPRESS WARRANTIES IN SECTION 3, THE CONTRIBUTION IS PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION TO THE MINIMUM PERIOD PERMITTED BY LAW. +EXCEPT FOR THE EXPRESS WARRANTIES IN SECTION 3, THE CONTRIBUTION IS PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US AND BY US TO YOU. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION TO THE MINIMUM PERIOD PERMITTED BY LAW. 5. Consequential Damage Waiver ------------------------------- +------------------------------- -TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED. +TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU OR US BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED. 6. Miscellaneous ---------------- @@ -94,15 +103,13 @@ TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU BE LIABL 6.5 If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and which is enforceable. The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law. -6.6 This document text was created using [Harmony (HA-CLA-I-LIST) Version 1.0](http://www.harmonyagreements.org) +6.6 This document text was created using [Harmony (HA-CLA-E-LIST) Version 1.0](http://www.harmonyagreements.org) List of Contributors ==================== -The below-signed are contributors to a code repository that is part of the project named "TiddlyWiki5". Each below-signed contributor has read, understand and agrees to the terms above in the section within this document entitled "TiddlyWiki5 Individual Contributor License Agreement" as of the date beside his or her name. +The below-signed are contributors to a code repository that is part of the project named "TiddlyWiki5". Each below-signed contributor has read, understand and agrees to the terms above in the section within this document entitled "TiddlyWiki5 Entity Contributor License Agreement" as of the date beside his or her name. Contributors ------------ -Mario Pietsch, 2013/09/18 - diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index fa93db99f..058813e2d 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -12,7 +12,7 @@ This contributor agreement ("Agreement") documents the rights granted by contrib "CLA" means Contributor License Agreement (this document) -"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in . +"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in https://github.com/Jermolene/TiddlyWiki5/blob/master/contributing.md. "Copyright" means all rights protecting works of authorship owned or controlled by You, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence including any extensions by You. @@ -45,17 +45,20 @@ As a condition on the grant of rights in Sections 2.1 and 2.2, We agree to licen In addition, We may use the following licenses for Media in the Contribution: Creative Commons Attribution 3.0 (including any right to adopt any future version of a license if permitted). -### 2.4 Moral Rights. +### 2.4 Moral Rights. If moral rights apply to the Contribution, to the maximum extent permitted by law, You waive and agree not to assert such moral rights against Us or our successors in interest, or any of our licensees, either direct or indirect. -### 2.5 Our Rights. +### 2.5 Our Rights. + You acknowledge that We are not obligated to use Your Contribution as part of the Material and may decide to include any Contribution We consider appropriate. ### 2.6 Reservation of Rights. + Any rights not expressly licensed under this section are expressly reserved by You. ### 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/`. 3. Agreement @@ -72,7 +75,7 @@ You confirm that: (d) You have followed the instructions in , if You do not own the Copyright in the entire work of authorship Submitted. 4. Disclaimer --------------- +------------- EXCEPT FOR THE EXPRESS WARRANTIES IN SECTION 3, THE CONTRIBUTION IS PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION TO THE MINIMUM PERIOD PERMITTED BY LAW. diff --git a/licenses/copyright.tid b/licenses/copyright.tid new file mode 120000 index 000000000..40c58b5f2 --- /dev/null +++ b/licenses/copyright.tid @@ -0,0 +1 @@ +../core/copyright.tid \ No newline at end of file From 8766cc77cacc991ce5c06bbe17227a28aeb55839 Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Thu, 19 Sep 2013 13:40:24 +0200 Subject: [PATCH 3/8] relative link to contributing.md --- licenses/cla-individual.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 058813e2d..a11afe61d 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -3,7 +3,7 @@ TiddlyWiki5 Individual Contributor License Agreement Thank you for your interest in contributing to TiddlyWiki5 ("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 at https://github.com/Jermolene/TiddlyWiki5/blob/master/contributing.md. 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. +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 at [contributing information](../contributing.md). 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. 1. Definitions --------------- From b891f4fd403ba6c4e15146bf7dfa599e14603696 Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Thu, 19 Sep 2013 13:54:37 +0200 Subject: [PATCH 4/8] relative link to both cla's contributing.md --- licenses/cla-entity.md | 6 +++--- licenses/cla-individual.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/licenses/cla-entity.md b/licenses/cla-entity.md index db4a54d43..deab11ba0 100644 --- a/licenses/cla-entity.md +++ b/licenses/cla-entity.md @@ -3,7 +3,7 @@ TiddlyWiki5 Entity Contributor License Agreement Thank you for your interest in contributing to TiddlyWiki5 ("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 at https://github.com/Jermolene/TiddlyWiki5/blob/master/contributing.md. 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. +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 at [contributing.md](../contributing.md). 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. 1. Definitions -------------- @@ -12,7 +12,7 @@ This contributor agreement ("Agreement") documents the rights granted by contrib "CLA" means Contributor License Agreement (this document). -"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in https://github.com/Jermolene/TiddlyWiki5/blob/master/contributing.md. +"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in [contributing.md](../contributing.md). "Copyright" means all rights protecting works of authorship owned or controlled by You or Your Affiliates, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence including any extensions by You. @@ -78,7 +78,7 @@ You confirm that: (c) The grant of rights under Section 2 does not violate any grant of rights which You or Your Affiliates have made to third parties. -(d) You have followed the instructions in , if You do not own the Copyright in the entire work of authorship Submitted. +(d) You have followed the instructions in [contributing.md](../contributing.md), if You do not own the Copyright in the entire work of authorship Submitted. 4. Disclaimer -------------- diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index a11afe61d..68f0d9d01 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -3,7 +3,7 @@ TiddlyWiki5 Individual Contributor License Agreement Thank you for your interest in contributing to TiddlyWiki5 ("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 at [contributing information](../contributing.md). 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. +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 at [contributing.md](../contributing.md). 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. 1. Definitions --------------- @@ -12,7 +12,7 @@ This contributor agreement ("Agreement") documents the rights granted by contrib "CLA" means Contributor License Agreement (this document) -"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in https://github.com/Jermolene/TiddlyWiki5/blob/master/contributing.md. +"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in [contributing.md](../contributing.md). "Copyright" means all rights protecting works of authorship owned or controlled by You, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence including any extensions by You. @@ -72,7 +72,7 @@ You confirm that: (c) The grant of rights under Section 2 does not violate any grant of rights which You have made to third parties, including Your employer. If You are an employee, You have had Your employer approve this Agreement or sign the Entity version of this document. If You are less than eighteen years old, please have Your parents or guardian sign the Agreement. -(d) You have followed the instructions in , if You do not own the Copyright in the entire work of authorship Submitted. +(d) You have followed the instructions in [contributing.md](../contributing.md), if You do not own the Copyright in the entire work of authorship Submitted. 4. Disclaimer ------------- From 2cdaa19549870c8cea58f622c598765d0bbb63c7 Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Thu, 19 Sep 2013 15:53:05 +0200 Subject: [PATCH 5/8] moving Harmony project attribution to contributing.md. contributors need to add there github name. entities need to add entity info --- contributing.md | 4 ++++ licenses/cla-entity.md | 6 +++--- licenses/cla-individual.md | 8 ++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/contributing.md b/contributing.md index 0e28ed29a..d14f5cff1 100644 --- a/contributing.md +++ b/contributing.md @@ -46,3 +46,7 @@ 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 deab11ba0..9f1e5ca5a 100644 --- a/licenses/cla-entity.md +++ b/licenses/cla-entity.md @@ -103,12 +103,12 @@ TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU OR US BE 6.5 If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and which is enforceable. The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law. -6.6 This document text was created using [Harmony (HA-CLA-E-LIST) Version 1.0](http://www.harmonyagreements.org) - List of Contributors ==================== -The below-signed are contributors to a code repository that is part of the project named "TiddlyWiki5". Each below-signed contributor has read, understand and agrees to the terms above in the section within this document entitled "TiddlyWiki5 Entity Contributor License Agreement" as of the date beside his or her name. +The below-signed are contributors to a code repository that is part of the project named "TiddlyWiki5". Each below-signed contributor has read, understand and agrees to the terms above in the section within this document entitled "TiddlyWiki5 Entity Contributor License Agreement" as of **the date** beside his or her **real name**, the **github account name** and the **Entity name**. + +eg: Jeremy Ruston, Jermolene for Federatial Limited, 2011/11/22 Contributors ------------ diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 68f0d9d01..ce125768d 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -97,15 +97,15 @@ TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU BE LIABL 6.5 If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and which is enforceable. The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law. -6.6 This document text was created using [Harmony (HA-CLA-I-LIST) Version 1.0](http://www.harmonyagreements.org) - List of Contributors ==================== -The below-signed are contributors to a code repository that is part of the project named "TiddlyWiki5". Each below-signed contributor has read, understand and agrees to the terms above in the section within this document entitled "TiddlyWiki5 Individual Contributor License Agreement" as of the date beside his or her name. +The below-signed are contributors to a code repository that is part of the project named "TiddlyWiki5". Each below-signed contributor has read, understand and agrees to the terms above in the section within this document entitled "TiddlyWiki5 Individual Contributor License Agreement" as of **the date** beside his or her **real name** and **github account name**. + +eg: Jeremy Ruston, Jermolene, 2011/11/22 Contributors ------------ -Mario Pietsch, 2013/09/18 +Mario Pietsch, pmario, 2013/09/19 From 1ab104346123a509272ae849ffe7abb3b026afd5 Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Thu, 19 Sep 2013 16:09:43 +0200 Subject: [PATCH 6/8] removed external links from the CLA text, since links may break. --- licenses/cla-entity.md | 6 +++--- licenses/cla-individual.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/licenses/cla-entity.md b/licenses/cla-entity.md index 9f1e5ca5a..e82e57a14 100644 --- a/licenses/cla-entity.md +++ b/licenses/cla-entity.md @@ -3,7 +3,7 @@ TiddlyWiki5 Entity Contributor License Agreement Thank you for your interest in contributing to TiddlyWiki5 ("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 at [contributing.md](../contributing.md). 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. +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. 1. Definitions -------------- @@ -12,7 +12,7 @@ This contributor agreement ("Agreement") documents the rights granted by contrib "CLA" means Contributor License Agreement (this document). -"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in [contributing.md](../contributing.md). +"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in `contributing.md`, which is in the root directory of the project repository. "Copyright" means all rights protecting works of authorship owned or controlled by You or Your Affiliates, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence including any extensions by You. @@ -78,7 +78,7 @@ You confirm that: (c) The grant of rights under Section 2 does not violate any grant of rights which You or Your Affiliates have made to third parties. -(d) You have followed the instructions in [contributing.md](../contributing.md), if You do not own the Copyright in the entire work of authorship Submitted. +(d) You have followed the instructions in `contributing.md`, if You do not own the Copyright in the entire work of authorship Submitted. The file can be found in the root directory of the project repository. 4. Disclaimer -------------- diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index ce125768d..59d83e076 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -3,7 +3,7 @@ TiddlyWiki5 Individual Contributor License Agreement Thank you for your interest in contributing to TiddlyWiki5 ("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 at [contributing.md](../contributing.md). 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. +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. 1. Definitions --------------- @@ -12,7 +12,7 @@ This contributor agreement ("Agreement") documents the rights granted by contrib "CLA" means Contributor License Agreement (this document) -"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in [contributing.md](../contributing.md). +"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in `contributing.md`, which is in the root directory of the project repository. "Copyright" means all rights protecting works of authorship owned or controlled by You, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence including any extensions by You. @@ -72,7 +72,7 @@ You confirm that: (c) The grant of rights under Section 2 does not violate any grant of rights which You have made to third parties, including Your employer. If You are an employee, You have had Your employer approve this Agreement or sign the Entity version of this document. If You are less than eighteen years old, please have Your parents or guardian sign the Agreement. -(d) You have followed the instructions in [contributing.md](../contributing.md), if You do not own the Copyright in the entire work of authorship Submitted. +(d) You have followed the instructions in `contributing.md`, if You do not own the Copyright in the entire work of authorship Submitted. The file can be found in the root directory of the project repository. 4. Disclaimer ------------- From f2e9eafdbad2848c3e39fcfac9bd7a6a1fb544df Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Thu, 19 Sep 2013 16:49:00 +0200 Subject: [PATCH 7/8] reversed contributing.md, since it will be created automatically. Use the Contributing.tid instead. Minor tweaks to CLA's --- contributing.md | 86 +++++++++------------- editions/tw5.com/tiddlers/Contributing.tid | 39 ++++++++-- licenses/cla-entity.md | 2 +- licenses/cla-individual.md | 2 +- 4 files changed, 68 insertions(+), 61 deletions(-) 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:

    +
  • +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.

+ +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 ------------ From 343dc2963b95fe72e72f90e0849674236f18a2cf Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Sat, 21 Sep 2013 16:42:31 +0200 Subject: [PATCH 8/8] 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