Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSonia Dimitrov2005-02-26 00:03:36 +0000
committerSonia Dimitrov2005-02-26 00:03:36 +0000
commit73a5aef8af8bdbe5d6a67068aa19a4cd1bc2bdc7 (patch)
tree693c992048bea2d2905840802abbda584894da7d /bundles/org.eclipse.team.cvs.core
parent8ad73a2641994c2c851d94c5e09bb1041dfa6337 (diff)
downloadeclipse.platform.team-73a5aef8af8bdbe5d6a67068aa19a4cd1bc2bdc7.tar.gz
eclipse.platform.team-73a5aef8af8bdbe5d6a67068aa19a4cd1bc2bdc7.tar.xz
eclipse.platform.team-73a5aef8af8bdbe5d6a67068aa19a4cd1bc2bdc7.zip
update legal files
Diffstat (limited to 'bundles/org.eclipse.team.cvs.core')
-rw-r--r--bundles/org.eclipse.team.cvs.core/about.html26
1 files changed, 9 insertions, 17 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/about.html b/bundles/org.eclipse.team.cvs.core/about.html
index 42aa848cb..ca61580e8 100644
--- a/bundles/org.eclipse.team.cvs.core/about.html
+++ b/bundles/org.eclipse.team.cvs.core/about.html
@@ -7,11 +7,16 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>23rd March, 2004</p>
+<p>February 24, 2005</p>
<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 (&quot;CPL&quot;). 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, &quot;Program&quot; will mean the Content.</p>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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.</p>
<h3>Third Party Content</h3>
@@ -28,18 +33,5 @@ in the file <a href="asl-v20.txt">asl-v20.txt</a> and is also available at <a hr
<p>The names &quot;Ant&quot; and &quot;Apache Software Foundation&quot; must not be used to endorse or promote products derived from this
software without prior written permission. For written permission, please contact <a href="mailto:apache@apache.org">apache@apache.org</a>.</p>
-<h3>Contributions</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>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) 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>
-
</body>
</html> \ No newline at end of file

Back to the top