Legal work. Added about.html, license.html, and feature.properties
diff --git a/ant/org.eclipse.ant.core/.project b/ant/org.eclipse.ant.core/.project
index 787040f..4f65961 100644
--- a/ant/org.eclipse.ant.core/.project
+++ b/ant/org.eclipse.ant.core/.project
@@ -16,6 +16,5 @@
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.team.cvs.core.cvsnature</nature>
</natures>
</projectDescription>
diff --git a/ant/org.eclipse.ant.core/about.html b/ant/org.eclipse.ant.core/about.html
index d79e465..260df8b 100644
--- a/ant/org.eclipse.ant.core/about.html
+++ b/ant/org.eclipse.ant.core/about.html
@@ -20,18 +20,24 @@
</tr>
<tr>
<td>
-<p>7th May, 2002</p>
+<p>10th June, 2002</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
-<a href="http://www.eclipse.org/legal/cpl-v05.html">Common Public License Version 0.5</a> "CPL". For purposes of the CPL, "Program" will mean the Content.</p>
+<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 0.5 ("CPL"). A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v05.html">http://www.eclipse.org/legal/cpl-v05.html</a>.
+For purposes of the CPL, "Program" will mean the Content.</p>
<h3>Third Party Content</h3>
<p>The Content includes items that have been sourced from third parties as follows:</p>
<p><b>Ant 1.4.1</b></p>
-<p>The plug-in is based on software developed by The Apache Software Foundation as part of the Jakarta project.
-The following classes "Ant Derivative Work" are based on Ant code:</p>
+<p>The plug-in is based on software developed by The Apache Software Foundation as part of the Jakarta project. Therefore:</p>
+
+<blockquote>
+This product includes software developed by the Apache Software Foundation (<a href="http://www.apache.org/">http://www.apache.org/</a>).
+</blockquote>
+
+<p>The following classes "Ant Derivative Work" are based on Ant code:</p>
<ul>
<li>InternalAntRunner contained in antsupportlib.jar and antsupportlibsrc.zip</li>
@@ -41,8 +47,8 @@
<blockquote>Copyright (c) 1999 The Apache Software Foundation. All rights reserved.</blockquote>
-<p>Your use of the Ant Derivative Work is subject to the terms and conditions of the
-<a href="http://jakarta.apache.org/ant/manual/LICENSE">Apache Software License 1.1</a>.
+<p>Your use of the Ant Derivative Work is subject to the terms and conditions of the Apache Software License 1.1 which
+is available at <a href="http://jakarta.apache.org/ant/manual/LICENSE">http://jakarta.apache.org/ant/manual/LICENSE</a>.
More specifically:</p>
<blockquote>
1. Redistributions of source code must retain the above copyright notice, this list of<br />
@@ -85,8 +91,8 @@
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 "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
+<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
diff --git a/platform/org.eclipse.platform/.project b/platform/org.eclipse.platform/.project
index 59f8399..824510e 100644
--- a/platform/org.eclipse.platform/.project
+++ b/platform/org.eclipse.platform/.project
@@ -13,6 +13,5 @@
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.team.cvs.core.cvsnature</nature>
</natures>
</projectDescription>
diff --git a/platform/org.eclipse.platform/about.html b/platform/org.eclipse.platform/about.html
index e621ee3..3cadefa 100644
--- a/platform/org.eclipse.platform/about.html
+++ b/platform/org.eclipse.platform/about.html
@@ -20,10 +20,11 @@
</tr>
<tr>
<td>
-<p>23rd May, 2002</p>
+<p>10th June, 2002</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
-<a href="http://www.eclipse.org/legal/cpl-v05.html">Common Public License Version 0.5</a> ("CPL"). For purposes of the CPL, "Program" will mean the Content.</p>
+Common Public License Version 0.5 ("CPL"). A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v05.html">http://www.eclipse.org/legal/cpl-v05.html</a>.
+For purposes of the CPL, "Program" will mean the Content.</p>
<h3>Contributions</h3>
diff --git a/platform/org.eclipse.platform/notice.html b/platform/org.eclipse.platform/notice.html
index e1ee5bf..99b6a89 100644
--- a/platform/org.eclipse.platform/notice.html
+++ b/platform/org.eclipse.platform/notice.html
@@ -23,51 +23,48 @@
<tr>
<td>
- <p>31 May, 2002</p>
-<p>ECLIPSE.ORG
-MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR
-OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS
-OR NOTICES INDICATED OR REFERENCED BELOW.
-BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE
-LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND
-CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN
-YOU MAY NOT USE THE CONTENT.</p>
+ <p>14th June, 2002</p>
-<p>Unless otherwise indicated, all Content made available by
-Eclipse.org is provided to you under the terms and conditions of the <a
-href="cpl-v05.html">Common Public License Version 0.5</a>. For purposes of the Common Public License,
-"Program" will mean the Content.</p>
+<p>ECLIPSE.ORG MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-<p>Content includes, but is not limited to, source code, object
-code, documentation and other files maintained in the Eclipse.org CVS
-repository ("Repository") and subsequently released as project builds
-("Builds").</p>
+<p>Unless otherwise indicated, all Content made available by Eclipse.org is provided to you under the terms and conditions of the Common Public License Version 0.5
+ ("CPL"). A copy of the CPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/cpl-v05.html">http://www.eclipse.org/legal/cpl-v05.html</a>.
+ For purposes of the CPL, "Program" will mean the Content.</p>
- <p>Content as files may contain portions distributed under different license
- agreements and/or notices. Details about these license agreements and
- notices are contained in "about.html" files ("Abouts"). Abouts are located
- in the Repository in the root directory for each CVS module. Abouts in
- Builds may be in the program root directory, plug-in directories, or in
- subdirectories of the src/ directory of certain plugins. Such Abouts govern
- your use of the associated software in that directory, not the Common
- Public License.</p>
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
+ modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-<p>You must agree to the terms and conditions of the <a
-href="cpl-v05.html">Common Public License Version 0.5</a> and
-all Abouts contained in any Content and any other terms and
-conditions that are provided with the Content, if any.</p>
+<p>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features"). A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins and/or Fragments associated with a Feature. Plug-ins and Fragments are located in directories
+ named "plugins" and Features are located in directories named "features".</p>
+
+<p>Features may also include other Features ("Included Features"). Files named "feature.xml" may contain a list of the names and version numbers of Included Features.</p>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on
-the import, possession, and use, and/or re-export to another country, of
-encryption software. BEFORE using any encryption software, please
-check the country's laws, regulations and policies concerning the import,
-possession, or use, and re-export of encryption software, to see if this
-is permitted.</p>
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Subdirectories of the directory named "src" of certain Plug-ins</li>
+ <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by Eclipse.org is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties".
+Such Abouts, Feature Licenses and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory. The Abouts, Feature Licenses and Feature Update Licenses may refer to the CPL or other license agreements, notices or terms and conditions . It is your obligation to read and accept all such all terms and conditions prior to use of the Content.
+If no About, Feature License or Feature Update License is provided, please contact Eclipse.org to determine what terms and conditions govern that particular Content.</p>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</p>
</td></tr></table>
</body>
-
</html>
diff --git a/update/org.eclipse.update.core.linux/.project b/update/org.eclipse.update.core.linux/.project
index 13f79b6..d41874c 100644
--- a/update/org.eclipse.update.core.linux/.project
+++ b/update/org.eclipse.update.core.linux/.project
@@ -29,6 +29,5 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.team.cvs.core.cvsnature</nature>
</natures>
</projectDescription>
diff --git a/update/org.eclipse.update.core.linux/about.html b/update/org.eclipse.update.core.linux/about.html
index 441774f..3cadefa 100644
--- a/update/org.eclipse.update.core.linux/about.html
+++ b/update/org.eclipse.update.core.linux/about.html
@@ -20,10 +20,11 @@
</tr>
<tr>
<td>
-<p>11th December, 2001</p>
+<p>10th June, 2002</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
-<a href="http://www.eclipse.org/legal/cpl-v05.html">Common Public License Version 0.5</a> "CPL". For purposes of the CPL, "Program" will mean the Content.</p>
+<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 0.5 ("CPL"). A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v05.html">http://www.eclipse.org/legal/cpl-v05.html</a>.
+For purposes of the CPL, "Program" will mean the Content.</p>
<h3>Contributions</h3>
@@ -31,8 +32,8 @@
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 "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
+<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
diff --git a/update/org.eclipse.update.core.win32/.project b/update/org.eclipse.update.core.win32/.project
index 161280e..7446979 100644
--- a/update/org.eclipse.update.core.win32/.project
+++ b/update/org.eclipse.update.core.win32/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.update.win32</name>
+ <name>org.eclipse.update.core.win32</name>
<comment></comment>
<projects>
<project>org.eclipse.core.boot</project>
@@ -27,6 +27,5 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.team.cvs.core.cvsnature</nature>
</natures>
</projectDescription>
diff --git a/update/org.eclipse.update.core.win32/about.html b/update/org.eclipse.update.core.win32/about.html
index 441774f..3cadefa 100644
--- a/update/org.eclipse.update.core.win32/about.html
+++ b/update/org.eclipse.update.core.win32/about.html
@@ -20,10 +20,11 @@
</tr>
<tr>
<td>
-<p>11th December, 2001</p>
+<p>10th June, 2002</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
-<a href="http://www.eclipse.org/legal/cpl-v05.html">Common Public License Version 0.5</a> "CPL". For purposes of the CPL, "Program" will mean the Content.</p>
+<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 0.5 ("CPL"). A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v05.html">http://www.eclipse.org/legal/cpl-v05.html</a>.
+For purposes of the CPL, "Program" will mean the Content.</p>
<h3>Contributions</h3>
@@ -31,8 +32,8 @@
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 "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
+<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
diff --git a/update/org.eclipse.update.core/.project b/update/org.eclipse.update.core/.project
index 4a516ed..5248656 100644
--- a/update/org.eclipse.update.core/.project
+++ b/update/org.eclipse.update.core/.project
@@ -28,6 +28,5 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.team.cvs.core.cvsnature</nature>
</natures>
</projectDescription>
diff --git a/update/org.eclipse.update.core/about.html b/update/org.eclipse.update.core/about.html
index 768324e..75b318e 100644
--- a/update/org.eclipse.update.core/about.html
+++ b/update/org.eclipse.update.core/about.html
@@ -20,10 +20,11 @@
</tr>
<tr>
<td>
-<p>11th December, 2001</p>
+<p>10th June, 2002</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
-<a href="http://www.eclipse.org/legal/cpl-v05.html">Common Public License Version 0.5</a> "CPL". For purposes of the CPL, "Program" will mean the Content.</p>
+<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 0.5 ("CPL"). A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v05.html">http://www.eclipse.org/legal/cpl-v05.html</a>.
+For purposes of the CPL, "Program" will mean the Content.</p>
<h3>Contributions</h3>
@@ -31,8 +32,8 @@
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 "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
+<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
diff --git a/update/org.eclipse.update.ui.forms/.project b/update/org.eclipse.update.ui.forms/.project
index 9e3a979..37d76d1 100644
--- a/update/org.eclipse.update.ui.forms/.project
+++ b/update/org.eclipse.update.ui.forms/.project
@@ -29,6 +29,5 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.team.cvs.core.cvsnature</nature>
</natures>
</projectDescription>
diff --git a/update/org.eclipse.update.ui.forms/about.html b/update/org.eclipse.update.ui.forms/about.html
index 768324e..75b318e 100644
--- a/update/org.eclipse.update.ui.forms/about.html
+++ b/update/org.eclipse.update.ui.forms/about.html
@@ -20,10 +20,11 @@
</tr>
<tr>
<td>
-<p>11th December, 2001</p>
+<p>10th June, 2002</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
-<a href="http://www.eclipse.org/legal/cpl-v05.html">Common Public License Version 0.5</a> "CPL". For purposes of the CPL, "Program" will mean the Content.</p>
+<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 0.5 ("CPL"). A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v05.html">http://www.eclipse.org/legal/cpl-v05.html</a>.
+For purposes of the CPL, "Program" will mean the Content.</p>
<h3>Contributions</h3>
@@ -31,8 +32,8 @@
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 "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
+<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
diff --git a/update/org.eclipse.update.ui.win32/.project b/update/org.eclipse.update.ui.win32/.project
index 8374903..706350c 100644
--- a/update/org.eclipse.update.ui.win32/.project
+++ b/update/org.eclipse.update.ui.win32/.project
@@ -29,6 +29,5 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.team.cvs.core.cvsnature</nature>
</natures>
</projectDescription>
diff --git a/update/org.eclipse.update.ui.win32/about.html b/update/org.eclipse.update.ui.win32/about.html
index 441774f..3cadefa 100644
--- a/update/org.eclipse.update.ui.win32/about.html
+++ b/update/org.eclipse.update.ui.win32/about.html
@@ -20,10 +20,11 @@
</tr>
<tr>
<td>
-<p>11th December, 2001</p>
+<p>10th June, 2002</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
-<a href="http://www.eclipse.org/legal/cpl-v05.html">Common Public License Version 0.5</a> "CPL". For purposes of the CPL, "Program" will mean the Content.</p>
+<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 0.5 ("CPL"). A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v05.html">http://www.eclipse.org/legal/cpl-v05.html</a>.
+For purposes of the CPL, "Program" will mean the Content.</p>
<h3>Contributions</h3>
@@ -31,8 +32,8 @@
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 "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
+<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
diff --git a/update/org.eclipse.update.ui/.project b/update/org.eclipse.update.ui/.project
index 68cadbe..571baa9 100644
--- a/update/org.eclipse.update.ui/.project
+++ b/update/org.eclipse.update.ui/.project
@@ -32,6 +32,5 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.team.cvs.core.cvsnature</nature>
</natures>
</projectDescription>
diff --git a/update/org.eclipse.update.ui/about.html b/update/org.eclipse.update.ui/about.html
index 768324e..75b318e 100644
--- a/update/org.eclipse.update.ui/about.html
+++ b/update/org.eclipse.update.ui/about.html
@@ -20,10 +20,11 @@
</tr>
<tr>
<td>
-<p>11th December, 2001</p>
+<p>10th June, 2002</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
-<a href="http://www.eclipse.org/legal/cpl-v05.html">Common Public License Version 0.5</a> "CPL". For purposes of the CPL, "Program" will mean the Content.</p>
+<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 0.5 ("CPL"). A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v05.html">http://www.eclipse.org/legal/cpl-v05.html</a>.
+For purposes of the CPL, "Program" will mean the Content.</p>
<h3>Contributions</h3>
@@ -31,8 +32,8 @@
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 "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
+<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
