diff options
| author | acolyer <acolyer> | 2006-06-01 10:46:14 +0000 |
|---|---|---|
| committer | acolyer <acolyer> | 2006-06-01 10:46:14 +0000 |
| commit | c82fae9bb7478f78837f98ac4b43564f1eef8770 (patch) | |
| tree | bd0ba8acf227ad641acddbae212200f5143e75ac /eclipse.plugin/org.aspectj.ajde.doc/about.html | |
| parent | b6c89301f2389edcd017c66968cce7d628a708a0 (diff) | |
| download | aspectj-c82fae9bb7478f78837f98ac4b43564f1eef8770.tar.gz aspectj-c82fae9bb7478f78837f98ac4b43564f1eef8770.zip | |
update license to EPL
Diffstat (limited to 'eclipse.plugin/org.aspectj.ajde.doc/about.html')
| -rw-r--r-- | eclipse.plugin/org.aspectj.ajde.doc/about.html | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/eclipse.plugin/org.aspectj.ajde.doc/about.html b/eclipse.plugin/org.aspectj.ajde.doc/about.html index 8e5456fdc..8b033adcc 100644 --- a/eclipse.plugin/org.aspectj.ajde.doc/about.html +++ b/eclipse.plugin/org.aspectj.ajde.doc/about.html @@ -5,26 +5,24 @@ <meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> </head> <body lang="EN-US"> -<h2>About This Content</h2> - -<p>5th November, 2003</p> -<h3>License</h3> -<p>Eclipse.org makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Common Public License Version 1.0 ("CPL"). A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>. -For purposes of the CPL, "Program" will mean the Content.</p> -<h3>Contributions</h3> +<h3>About This Content</h3> -<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise -made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such -Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p> + <p>May 2, 2006</p> + <h3>License</h3> -<p>If this Content is licensed to you under license terms and conditions other than the CPL ("Other License"), any modifications, enhancements and/or -other code and/or documentation ("Modifications") uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the -host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available -to others under the terms of the Other License. In addition, with regard to Modifications for which you are the copyright holder, you are also -providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of -the CPL.</p> + <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). + Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the + Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available + at <a href="../../org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>. + For purposes of the EPL, "Program" will mean the Content.</p> + <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is + being redistributed by another party ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the RedistributorŐs license + that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise + indicated below, the terms and conditions of the EPL still apply to any source code in the Content + and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> + </body> </html>
\ No newline at end of file |