Merge "Infra 4010 - update ECA text and add question id"
diff --git a/ECA.html b/ECA.html
index f9da440..5ef8cf5 100644
--- a/ECA.html
+++ b/ECA.html
@@ -7,117 +7,109 @@
<body lang="EN-US">
<div id="text1">
<h1>Eclipse Contributor Agreement</h1>
-
- <p>Version 3.0.0 October 22, 2018</p>
-
+ <p>Version 3.1.0 January 14, 2021</p>
<p id="reference">
<strong>This is a reference copy of the terms of the Eclipse Contributor Agreement. To actually complete
and submit an ECA, please go to the <a href="https://accounts.eclipse.org/user/eca">ECA form</a>.</strong>
</p>
-
- <p>Thank you for your interest in one or more projects managed by the Eclipse Foundation, Inc.
- ("Eclipse Foundation"). In order for You (as defined below) to make intellectual property
- Contributions (as defined below) now or in the future to Eclipse Foundation projects,
- You must agree to this Eclipse Contributor Agreement ("ECA").
- If You have any questions about this agreement, licensing, or anything related to
- intellectual property at the Eclipse Foundation, please send an email to
- <a href="mailto:license@eclipse.org">license@eclipse.org</a>.</p>
-
+ <p>Thank you for your interest in one or more projects managed by the Eclipse.org Foundation, Inc. and/or the Eclipse Foundation AISBL (collectively, "Eclipse"). In order for You (as defined below) to make intellectual property
+ Contributions (as defined below) now or in the future to Eclipse projects,
+ You must agree to this Eclipse Contributor Agreement ("ECA").
+ If You have any questions about this agreement, licensing, or anything related to
+ intellectual property at Eclipse, please send an email to
+ <a href="mailto:license@eclipse.org">license@eclipse.org</a>.
+ </p>
<p>Please read this ECA carefully before accepting its terms. By accepting the ECA, You are agreeing to
- be bound by its terms. If You want to accept this ECA, complete the form completely, print a copy for
- Your records, and when ready, press the “Accept” button at the end of this form.</p>
-
+ be bound by its terms. If You want to accept this ECA, complete the form completely, print a copy for
+ Your records, and when ready, press the “Accept” button at the end of this form.
+ </p>
<p>As used in this ECA: (i) “You" (or "Your") shall mean the entity that
- is making this Agreement with the Eclipse Foundation; (ii)"Contribution" shall mean
- any original work of authorship, including any modifications or additions to an existing work,
- that is submitted by You to the Eclipse Foundation for inclusion in, or documentation of, any of
- the Eclipse Foundation projects; and (iii) “Submit” (or “Submitted”) means
- any form of communication sent to the Eclipse Foundation (e.g. the content You post on electronic
- mailing lists, forums, content management systems, source code control systems, code review systems,
- issue tracking systems, etc. that are used by the Eclipse Foundation).</p>
-
+ is making this Agreement with Eclipse; (ii)"Contribution" shall mean
+ any original work of authorship, including any modifications or additions to an existing work,
+ that is submitted by You to Eclipse for inclusion in, or documentation of, any of
+ the Eclipse projects; and (iii) “Submit” (or “Submitted”) means
+ any form of communication sent to Eclipse (e.g. the content You post on electronic
+ mailing lists, forums, content management systems, source code control systems, code review systems,
+ issue tracking systems, etc. that are used by Eclipse).
+ </p>
<p>This agreement applies to all Contributions You Submit.</p>
-
- <p>This ECA, and the license(s) associated with the particular Eclipse Foundation projects You
- are contributing to, provides a license to Your Contributions to the Eclipse Foundation and
- downstream consumers, but You still own Your Contributions, and except for the licenses provided
- for in this ECA, You reserve all right, title and interest in Your Contributions.
- In addition to the above, You grant a non- exclusive, worldwide, perpetual, royalty-free
- license of all necessary rights under Your copyright in and to Your Contributions (the “Specification
- Grant”): (a) for the Eclipse Foundation (and its contributors solely as a part of foundation projects)
- to create, reproduce, prepare derivative works of, publicly display, publicly perform, distribute and
- sublicense specifications subject to the terms of the then-current Eclipse Foundation Specification
- License, based on or derived from the Specification Content (as defined below) and (b) for recipients of
- such specifications to create, reproduce, and distribute implementations thereof based on the portion of
- Your Contributions or material derived from them in the specifications, subject to the terms of
- the then-current Eclipse Foundation Specification License.</p>
-
- <p>“Specification Content” is the collection of interface definitions for the Application
- or User interfaces (“Interfaces”) provided by the work to which Your Contribution was made,
- descriptions of the structure and semantic behavior of those Interfaces, and data formats and protocols
- associated with those Interfaces, all of which as are reasonably necessary to enable the development of
- independent implementations of those Interfaces. For the sake of clarity, Specification Content does
- not include implementation detail of how the Eclipse project code or Your Contribution implements the
- Interfaces in the Specification and the Specification Grant provide above would not cover such additional
- material.</p>
-
- <p>The Eclipse Foundation requires that each Contribution You Submit now or in the future to comply with
- the following commitments documented in the Developer Certificate of Origin (DCO). To confirm that
- You have read and agreed to each, please click on the box beside each one.</p>
- </div>
- <div id="text2">
- <h2>Developer Certificate of Origin</h2>
- <p>Version 1.1</p>
- <p>
- Copyright (C) 2004, 2006 The Linux Foundation and its contributors.<br/>
- 660 York Street, Suite 102,<br/>
- San Francisco, CA 94110 USA<br/>
+ <p>This ECA, and the license(s) associated with the particular Eclipse projects You
+ are contributing to, provides a license to Your Contributions to Eclipse and
+ downstream consumers, but You still own Your Contributions, and except for the licenses provided
+ for in this ECA, You reserve all right, title and interest in Your Contributions.
+ In addition to the above, You grant a non-exclusive, worldwide, perpetual, royalty-free
+ license of all necessary rights under Your copyright in and to Your Contributions (the “Specification
+ Grant”): (a) for Eclipse (and its contributors solely as a part of Eclipse projects)
+ to create, reproduce, prepare derivative works of, publicly display, publicly perform, distribute and
+ sublicense specifications subject to the terms of the then-current Eclipse Foundation Specification
+ License, based on or derived from the Specification Content (as defined below) and (b) for recipients of
+ such specifications to create, reproduce, and distribute implementations thereof based on the portion of
+ Your Contributions or material derived from them in the specifications, subject to the terms of
+ the then-current Eclipse Foundation Specification License.
</p>
- <p>
- Everyone is permitted to copy and distribute verbatim copies of this license document,
- but changing it is not allowed.
+ <p>“Specification Content” is the collection of interface definitions for the application or user interfaces (“Interfaces”) provided by the work to which Your Contribution was made,
+ descriptions of the structure and semantic behavior of those Interfaces, and data formats and protocols
+ associated with those Interfaces, all of which as are reasonably necessary to enable the development of
+ independent implementations of those Interfaces. For the sake of clarity, Specification Content does
+ not include implementation detail of how the Eclipse project code or Your Contribution implements the
+ Interfaces in the Specification and the Specification Grant provided above would not cover such additional
+ material.
</p>
- <h3>Developer's Certificate of Origin 1.1</h3>
- <p>By making a contribution to this project, I certify that: </p>
+ <p>Eclipse requires that each Contribution You Submit now or in the future to comply with
+ the following commitments documented in the Developer Certificate of Origin (DCO). To confirm that
+ You have read and agreed to each, please click on the box beside each one.
+ </p>
</div>
- <ol style="list-style-type: lower-alpha;">
- <li id="question1">
- The contribution was created in whole or in part by me and I have the right to submit
- it under the open source license indicated in the file or
- </li>
- <li id="question2">
- The contribution is based upon previous work that, to the best of my knowledge, is
- covered under an appropriate open source license and I have the right under that
- license to submit that work with modifications, whether created in whole or in part by
- me, under the same open source license (unless I am permitted to submit under a
- different license), as indicated in the file or
- </li>
- <li id="question3">
- The contribution was provided directly to me by some other person who certified (a),
- (b) or (c) and I have not modified it.
- </li>
- <li id="question4">
- I understand and agree that this project and the contribution are public and that a
- record of the contribution (including all personal information I submit with it, including
- my signoff) is maintained indefinitely and may be redistributed consistent with this
- project or the open source license(s) involved.
- </li>
- </ol>
+ <pre>
+<span id="text2-title"> Developer Certificate of Origin</span>
+<span id="text2-version"> Version 1.1</span>
+
+<span id="text2-copyright"> Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+ 660 York Street, Suite 102,
+ San Francisco, CA 94110 USA</span>
+
+<span id="text2-permission"> Everyone is permitted to copy and distribute verbatim copies of this
+ license document, but changing it is not allowed.</span>
+
+<span id="text2-title2"> Developer's Certificate of Origin 1.1</span>
+
+<span id="text2-certify"> By making a contribution to this project, I certify that:</span>
+
+ (a) <span id="question1">The contribution was created in whole or in part by me and I
+ have the right to submit it under the open source license
+ indicated in the file; or</span>
+
+ (b) <span id="question2">The contribution is based upon previous work that, to the best
+ of my knowledge, is covered under an appropriate open source
+ license and I have the right under that license to submit that
+ work with modifications, whether created in whole or in part
+ by me, under the same open source license (unless I am
+ permitted to submit under a different license), as indicated
+ in the file; or</span>
+
+ (c) <span id="question3">The contribution was provided directly to me by some other
+ person who certified (a), (b) or (c) and I have not modified
+ it.</span>
+
+ (d) <span id="question4">I understand and agree that this project and the contribution
+ are public and that a record of the contribution (including all
+ personal information I submit with it, including my signoff) is
+ maintained indefinitely and may be redistributed consistent with
+ this project or the open source license(s) involved.</span>
+ </pre>
<div id="text3">
<p>
- You will promptly notify the Eclipse Foundation if You become aware of any facts or circumstances
+ You will promptly notify Eclipse if You become aware of any facts or circumstances
that would make these commitments inaccurate in any way. To do so, please send an email to
<a href="mailto:license@eclipse.org">license@eclipse.org</a>
</p>
<p>
- The Eclipse Foundation takes intellectual property very seriously, so we are going to ask
+ Eclipse takes intellectual property very seriously, so we are going to ask
You to re­-confirm this ECA every three years.
</p>
</div>
- <div id="text4">
- <p>
- You represent that the information provided below is accurate.
- </p>
- </div>
+ <p id="text4">
+ You represent that the information provided below is accurate.
+ </p>
</body>
</html>
\ No newline at end of file
