From 48aeedd485a43995624ad0400fdf4034debe2aab Mon Sep 17 00:00:00 2001 From: Ceki Gulcu Date: Sun, 13 Jul 2014 13:25:29 +0200 Subject: [PATCH] Revert "add Eric Dahl to cla list" This reverts commit 147ed05b09fc60430d87aa1da984d7a24092aa6a. --- logback-site/src/site/pages/cla.txt | 83 ++++++++++++++--------------- 1 file changed, 41 insertions(+), 42 deletions(-) mode change 100755 => 100644 logback-site/src/site/pages/cla.txt diff --git a/logback-site/src/site/pages/cla.txt b/logback-site/src/site/pages/cla.txt old mode 100755 new mode 100644 index 7dbafe5ad..f13018d7f --- a/logback-site/src/site/pages/cla.txt +++ b/logback-site/src/site/pages/cla.txt @@ -1,21 +1,20 @@ - QOS.CH Sarl + QOS.ch Individual Contributor License Agreement ("Agreement") This agreement is an adaptation of the Apache Software Foundation ICL -agreement where references to ASF have been replaced by QOS.ch -Sarl. We thank the ASF for allowing QOS.CH Sarl to make use of their -ICL agreement. +agreement where references to ASF have been replaced by QOS.ch. We +thank the ASF for allowing QOS.ch to make use of their ICL agreement. -Thank you for your interest in QOS.CH Sarl. In order to clarify the +Thank you for your interest in QOS.ch. In order to clarify the intellectual property license granted with Contributions from any -person or entity, QOS.CH Sarl must have a Contributor License -Agreement ("CLA") on file that has been signed by each Contributor, -indicating agreement to the license terms below. This license is for -your protection as a Contributor as well as the protection of QOS.CH -Sarl and its users; it does not change your rights to use your own +person or entity, QOS.ch must have a Contributor License Agreement +("CLA") on file that has been signed by each Contributor, indicating +agreement to the license terms below. This license is for your +protection as a Contributor as well as the protection of QOS.ch and +its users; it does not change your rights to use your own Contributions for any other purpose. If you have not already done so, -please complete and send an original signed Agreement to QOS.CH Sarl, -rue Enning 4, 1003 Lausanne, Switzerland. Please read this document +please complete and send an original signed Agreement to QOS.ch, rue +Enning 4, 1003 Lausanne, Switzerland. Please read this document carefully before signing and keep a copy for your records. Full name: ____________________________ E-Mail: ___________________ @@ -28,49 +27,49 @@ carefully before signing and keep a copy for your records. You accept and agree to the following terms and conditions for Your -present and future Contributions submitted QOS.CH Sarl. In return, -QOS.CH Sarl shall not use Your Contributions in a way that is contrary -to the public benefit. Except for the license granted herein to -QOS.CH Sarl and recipients of software distributed by QOS.CH Sarl, You -reserve all right, title, and interest in and to Your Contributions. +present and future Contributions submitted QOS.ch. In return, QOS.ch +shall not use Your Contributions in a way that is contrary to the +public benefit. Except for the license granted herein to QOS.ch and +recipients of software distributed by QOS.ch, You reserve all right, +title, and interest in and to Your Contributions. 1. Definitions. "You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement - with QOS.CH Sarl. For legal entities, the entity making a - Contribution and all other entities that control, are controlled - by, or are under common control with that entity are considered to - be a single Contributor. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. + with QOS.ch. For legal entities, the entity making a Contribution + and all other entities that control, are controlled by, or are + under common control with that entity are considered to be a single + Contributor. For the purposes of this definition, "control" means + (i) the power, direct or indirect, to cause the direction or + management of such entity, whether by contract or otherwise, or + (ii) ownership of fifty percent (50%) or more of the outstanding + shares, or (iii) beneficial ownership of such entity. "Contribution" shall mean any original work of authorship, including any modifications or additions to an existing work, that - is intentionally submitted by You to QOS.CH Sarl for inclusion in, - or documentation of, any of the products owned or managed by QOS.CH - Sarl (the "Work"). For the purposes of this definition, "submitted" + is intentionally submitted by You to QOS.ch for inclusion in, or + documentation of, any of the products owned or managed by QOS.ch + (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent - to QOS.CH Sarl or its representatives, including but not limited to + to QOS.ch or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on - behalf of, QOS.CH Sarl for the purpose of discussing and improving - the Work, but excluding communication that is conspicuously marked - or otherwise designated in writing by You as "Not a Contribution." + behalf of, QOS.ch for the purpose of discussing and improving the + Work, but excluding communication that is conspicuously marked or + otherwise designated in writing by You as "Not a Contribution." 2. Grant of Copyright License. Subject to the terms and conditions of - this Agreement, You hereby grant to QOS.CH Sarl and to recipients - of software distributed by QOS.CH Sarl a perpetual, worldwide, + this Agreement, You hereby grant to QOS.ch and to recipients of + software distributed by QOS.ch a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works. -3. Grant of Patent License. Subject to the terms and conditions of - this Agreement, You hereby grant to QOS.CH Sarl and to recipients - of software distributed by QOS.CH Sarl a perpetual, worldwide, +3. Grant of Patent License. Subject to the terms and conditions of + this Agreement, You hereby grant to QOS.ch and to recipients of + software distributed by QOS.ch a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where @@ -90,7 +89,7 @@ reserve all right, title, and interest in and to Your Contributions. that you create that includes your Contributions, you represent that you have received permission to make Contributions on behalf of that employer, that your employer has waived such rights for - your Contributions to QOS.CH Sarl. + your Contributions to QOS.ch. 5. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others). You @@ -110,16 +109,16 @@ reserve all right, title, and interest in and to Your Contributions. INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. 7. Should You wish to submit work that is not Your original creation, - You may submit it to QOS.CH Sarl separately from any Contribution, + You may submit it to QOS.ch separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [named here]". -8. You agree to notify QOS.CH Sarl of any facts or circumstances of - which you become aware that would make these representations - inaccurate in any respect. +8. You agree to notify QOS.ch of any facts or circumstances of which + you become aware that would make these representations inaccurate + in any respect. Please sign: __________________________________ Date: ________________ -- GitLab