commit 10b2a929e21ba8eeb1953bc3fe5eef9691f50e6c
author John Arthorne <johna> Wed May 12 13:52:28 2010 +0000
committer John Arthorne <johna> Wed May 12 13:52:28 2010 +0000
tree 90364c9836d34b24ed471033c1400bbecac19cbe
parent 06c780230c0695acac386cf19b5fad6e3fc61ca0

Bug 311590 -  Remove all Update Manager API

update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/ConfiguratorUtils.java

diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/ConfiguratorUtils.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/ConfiguratorUtils.java
index cbe2cc0..9e3a925 100644
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/ConfiguratorUtils.java
+++ b/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/ConfiguratorUtils.java
@@ -28,8 +28,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class ConfiguratorUtils {
 	/**

update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/IPlatformConfiguration.java

diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/IPlatformConfiguration.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/IPlatformConfiguration.java
index 58a5a02..921d3b3 100644
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/IPlatformConfiguration.java
+++ b/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/IPlatformConfiguration.java
@@ -30,8 +30,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IPlatformConfiguration {
 

update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/IPlatformConfigurationFactory.java

diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/IPlatformConfigurationFactory.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/IPlatformConfigurationFactory.java
index bc0f044..fb5b165 100644
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/IPlatformConfigurationFactory.java
+++ b/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/IPlatformConfigurationFactory.java
@@ -21,8 +21,8 @@
  * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
  * (repeatedly) as the API evolves.
  * </p>
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IPlatformConfigurationFactory {
 	/**

update/org.eclipse.update.core/src/org/eclipse/update/configuration/IActivity.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IActivity.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IActivity.java
index 47b7d45..dd699bb 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IActivity.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IActivity.java
@@ -29,8 +29,8 @@
  * </p>
  * @see org.eclipse.update.configuration.IInstallConfiguration
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IActivity extends IAdaptable {
 

update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSite.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSite.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSite.java
index 58d3249..3c63d60 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSite.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSite.java
@@ -31,8 +31,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IConfiguredSite extends IAdaptable {
 

update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSiteChangedListener.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSiteChangedListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSiteChangedListener.java
index 44de641..eb7b40e 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSiteChangedListener.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSiteChangedListener.java
@@ -21,8 +21,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IConfiguredSiteChangedListener {
 	

update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfiguration.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfiguration.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfiguration.java
index eb78cff..d496449 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfiguration.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfiguration.java
@@ -29,8 +29,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IInstallConfiguration extends IAdaptable {
 

update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfigurationChangedListener.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfigurationChangedListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfigurationChangedListener.java
index 1183177..dece0b5 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfigurationChangedListener.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfigurationChangedListener.java
@@ -19,8 +19,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IInstallConfigurationChangedListener {
 	

update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallDeltaHandler.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallDeltaHandler.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallDeltaHandler.java
index d3348ad..29997bc 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallDeltaHandler.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallDeltaHandler.java
@@ -20,7 +20,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 2.0
- * @deprecated Do not use this interface. The extension point deltaHandler has been deprecated.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IInstallDeltaHandler{
 

update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSite.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSite.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSite.java
index d4e8279..371535e 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSite.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSite.java
@@ -29,8 +29,8 @@
  * (repeatedly) as the API evolves.
  * </p> 
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface ILocalSite extends IAdaptable {
 

update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSiteChangedListener.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSiteChangedListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSiteChangedListener.java
index 51b0d66..4073334 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSiteChangedListener.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSiteChangedListener.java
@@ -19,8 +19,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface ILocalSiteChangedListener {
 	

update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSystemInfoListener.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSystemInfoListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSystemInfoListener.java
index ae52dd8..5828a6d 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSystemInfoListener.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSystemInfoListener.java
@@ -24,8 +24,8 @@
  * @see LocalSystemInfo#removeInfoListener(ILocalSystemInfoListener)
  * @see LocalSystemInfo#fireSystemInfoChanged(IVolume,int)
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface ILocalSystemInfoListener {
 	

update/org.eclipse.update.core/src/org/eclipse/update/configuration/IProblemHandler.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IProblemHandler.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IProblemHandler.java
index 46ca5b8..71436e7 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IProblemHandler.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IProblemHandler.java
@@ -22,8 +22,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IProblemHandler {
 

update/org.eclipse.update.core/src/org/eclipse/update/configuration/ISessionDelta.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ISessionDelta.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ISessionDelta.java
index 29b0790..66b6bb3 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ISessionDelta.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ISessionDelta.java
@@ -26,6 +26,7 @@
  * </p>
  * @since 2.0
  * @deprecated Do not use this interface
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface ISessionDelta extends IAdaptable {
 

update/org.eclipse.update.core/src/org/eclipse/update/configuration/IVolume.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IVolume.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IVolume.java
index 7612622..a85121a 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IVolume.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IVolume.java
@@ -28,8 +28,8 @@
  * </p>
  * @see org.eclipse.update.configuration.LocalSystemInfo
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IVolume extends IAdaptable {
 

update/org.eclipse.update.core/src/org/eclipse/update/configuration/LocalSystemInfo.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/LocalSystemInfo.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/LocalSystemInfo.java
index 7cf2076..0fc42dc 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/LocalSystemInfo.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/LocalSystemInfo.java
@@ -30,8 +30,8 @@
  * </p>
  * @see ILocalSystemInfoListener
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class LocalSystemInfo {
 	

update/org.eclipse.update.core/src/org/eclipse/update/configuration/package.html

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/package.html b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/package.html
index 3cf1e8e..a35e812 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/package.html
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/package.html
@@ -16,10 +16,8 @@
 the update support  by writing additional feature and site implementation
 do not need to make use of interfaces defined in this package.
 <p>
-<b>Note:</b> This package is part of an interim API that is still under development and expected to
-change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-(repeatedly) as the API evolves.
+<b>Note:</b> This package has been deprecated and will be deleted in a future
+release.  See bug 311590 for details.
 </p>
 </body>
 </html>

update/org.eclipse.update.core/src/org/eclipse/update/core/ArchiveReference.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ArchiveReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ArchiveReference.java
index d5ced7b..635496b 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ArchiveReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/ArchiveReference.java
@@ -26,8 +26,8 @@
  * @see org.eclipse.update.core.IArchiveReference
  * @see org.eclipse.update.core.model.ArchiveReferenceModel
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class ArchiveReference
 	extends ArchiveReferenceModel

update/org.eclipse.update.core/src/org/eclipse/update/core/BaseFeatureFactory.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseFeatureFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseFeatureFactory.java
index f37279a..56fd899 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseFeatureFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseFeatureFactory.java
@@ -42,8 +42,8 @@
  * @see org.eclipse.update.core.IFeatureFactory
  * @see org.eclipse.update.core.model.FeatureModelFactory
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public abstract class BaseFeatureFactory extends FeatureModelFactory implements IFeatureFactory {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/BaseInstallHandler.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseInstallHandler.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseInstallHandler.java
index 82cc097..8e813b6 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseInstallHandler.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseInstallHandler.java
@@ -28,8 +28,8 @@
  * </p> 
  * @see org.eclipse.update.core.IInstallHandler
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class BaseInstallHandler implements IInstallHandler {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/BaseSiteFactory.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseSiteFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseSiteFactory.java
index 5e7225c..9e51ab7 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseSiteFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseSiteFactory.java
@@ -52,8 +52,8 @@
  * @see org.eclipse.update.core.ISiteFactory
  * @see org.eclipse.update.core.model.SiteModelFactory
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public abstract class BaseSiteFactory extends SiteModelFactory implements ISiteFactory {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/Category.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Category.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Category.java
index c87d33b..5286554 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Category.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/Category.java
@@ -26,8 +26,8 @@
  * @see org.eclipse.update.core.ICategory
  * @see org.eclipse.update.core.model.CategoryModel
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class Category extends CategoryModel implements ICategory {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/ContentReference.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ContentReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ContentReference.java
index 2055915..04bd47f 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ContentReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/ContentReference.java
@@ -43,8 +43,8 @@
  * @see org.eclipse.update.core.JarContentReference
  * @see org.eclipse.update.core.JarEntryContentReference
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class ContentReference {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/Feature.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Feature.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Feature.java
index afc6f6a..329ef57 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Feature.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/Feature.java
@@ -54,8 +54,8 @@
  * @see org.eclipse.update.core.IFeature
  * @see org.eclipse.update.core.model.FeatureModel
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class Feature extends FeatureModel implements IFeature {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java
index e131244..25768f3 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java
@@ -58,8 +58,8 @@
  * </p>
  * @see org.eclipse.update.core.IFeatureContentProvider
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public abstract class FeatureContentProvider implements IFeatureContentProvider {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureReference.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureReference.java
index 615c31e..9f5f143 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureReference.java
@@ -36,8 +36,8 @@
  * @see org.eclipse.update.core.IFeatureReference
  * @see org.eclipse.update.core.model.FeatureReferenceModel
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class FeatureReference extends FeatureReferenceModel implements IFeatureReference, IPlatformEnvironment {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/IArchiveReference.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IArchiveReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IArchiveReference.java
index c56589a..493c5b6 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IArchiveReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IArchiveReference.java
@@ -33,8 +33,8 @@
  * </p>
  * @see org.eclipse.update.core.ArchiveReference
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IArchiveReference extends IAdaptable {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/ICategory.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ICategory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ICategory.java
index acca787..6d67499 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ICategory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/ICategory.java
@@ -33,8 +33,8 @@
  * </p>
  * @see org.eclipse.update.core.Category
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface ICategory  extends IAdaptable{
 

update/org.eclipse.update.core/src/org/eclipse/update/core/IContentConsumer.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IContentConsumer.java
index 19ece44..516ab2d 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IContentConsumer.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IContentConsumer.java
@@ -30,8 +30,8 @@
  * </p>
  * @see org.eclipse.update.core.IFeatureContentConsumer
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IContentConsumer {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/IFeature.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeature.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeature.java
index c4bb09f..8af1af9 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeature.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeature.java
@@ -42,8 +42,8 @@
  * </p>
  * @see org.eclipse.update.core.Feature
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IFeature extends IAdaptable, IPlatformEnvironment {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentConsumer.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentConsumer.java
index a08af85..3c781cd 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentConsumer.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentConsumer.java
@@ -39,8 +39,8 @@
  * </p>
  * @see org.eclipse.update.core.IContentConsumer
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IFeatureContentConsumer {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentProvider.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentProvider.java
index d0657e5..02ec971 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentProvider.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentProvider.java
@@ -46,8 +46,8 @@
  * </p>
  * @see org.eclipse.update.core.FeatureContentProvider
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IFeatureContentProvider {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureFactory.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureFactory.java
index 35d8b40..3e5965e 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureFactory.java
@@ -32,8 +32,8 @@
  * </p>
  * @see org.eclipse.update.core.BaseFeatureFactory
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IFeatureFactory {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureReference.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureReference.java
index e4624f3..af1b9c3 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureReference.java
@@ -32,8 +32,8 @@
  * </p>
  * @see org.eclipse.update.core.FeatureReference
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IFeatureReference extends IAdaptable,IPlatformEnvironment {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/IImport.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IImport.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IImport.java
index 30051dd..b10e1ad 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IImport.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IImport.java
@@ -31,8 +31,8 @@
  * </p>
  * @see org.eclipse.update.core.Import
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IImport extends IAdaptable, IUpdateConstants, IPlatformEnvironment {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/IIncludedFeatureReference.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IIncludedFeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IIncludedFeatureReference.java
index 4a344bf..a999246 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IIncludedFeatureReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IIncludedFeatureReference.java
@@ -33,8 +33,8 @@
  * </p>
  * @see org.eclipse.update.core.FeatureReference
  * @since 2.0.1
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IIncludedFeatureReference extends IFeatureReference, IAdaptable {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandler.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandler.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandler.java
index fac1223..e71ecc9 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandler.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandler.java
@@ -33,8 +33,8 @@
  * </p>
  * @see org.eclipse.update.core.BaseInstallHandler
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IInstallHandler {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandlerEntry.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandlerEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandlerEntry.java
index a7a39b9..ba96386 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandlerEntry.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandlerEntry.java
@@ -32,8 +32,8 @@
  * @see org.eclipse.update.core.InstallHandlerEntry
  * @see org.eclipse.update.core.IInstallHandler
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IInstallHandlerEntry extends IAdaptable {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandlerWithFilter.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandlerWithFilter.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandlerWithFilter.java
index cf5c056..80c97e1 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandlerWithFilter.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandlerWithFilter.java
@@ -12,8 +12,8 @@
 
 /**
  * Custom install handler.
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IInstallHandlerWithFilter extends IInstallHandler{
 

update/org.eclipse.update.core/src/org/eclipse/update/core/INonPluginEntry.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/INonPluginEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/INonPluginEntry.java
index e00a8d8..978f06a 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/INonPluginEntry.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/INonPluginEntry.java
@@ -35,8 +35,8 @@
  * @see org.eclipse.update.core.NonPluginEntry
  * @see org.eclipse.update.core.FeatureContentProvider
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface INonPluginEntry extends IPlatformEnvironment, IAdaptable {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/IPlatformEnvironment.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IPlatformEnvironment.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IPlatformEnvironment.java
index 025cabd..3a79567 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IPlatformEnvironment.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IPlatformEnvironment.java
@@ -33,8 +33,8 @@
  * @see org.eclipse.update.core.PluginEntry
  * @see org.eclipse.update.core.FeatureContentProvider
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IPlatformEnvironment extends IAdaptable {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/IPluginEntry.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IPluginEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IPluginEntry.java
index 788595c..af88f4d 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IPluginEntry.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IPluginEntry.java
@@ -33,8 +33,8 @@
  * @see org.eclipse.update.core.PluginEntry
  * @see org.eclipse.update.core.FeatureContentProvider
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IPluginEntry extends IPlatformEnvironment,IAdaptable {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/ISite.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISite.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISite.java
index d8a3ea8..9449ead 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISite.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISite.java
@@ -32,8 +32,8 @@
  * </p>
  * @see org.eclipse.update.core.Site
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface ISite extends IAdaptable {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteContentProvider.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteContentProvider.java
index 0dc0457..977cb42 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteContentProvider.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteContentProvider.java
@@ -33,8 +33,8 @@
  * </p>
  * @see org.eclipse.update.core.SiteContentProvider
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface ISiteContentProvider {
 	

update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactory.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactory.java
index cf493d8..4133798 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactory.java
@@ -32,8 +32,8 @@
  * </p>
  * @see org.eclipse.update.core.BaseSiteFactory
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface ISiteFactory {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactoryExtension.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactoryExtension.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactoryExtension.java
index 27e4039..7e9deb6 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactoryExtension.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactoryExtension.java
@@ -35,8 +35,8 @@
  * </p>
  * @see org.eclipse.update.core.BaseSiteFactory
  * @since 2.1
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface ISiteFactoryExtension {
 	/**

update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFeatureReference.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFeatureReference.java
index 925197b..992787b 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFeatureReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFeatureReference.java
@@ -28,8 +28,8 @@
  * </p>
  * @see org.eclipse.update.core.SiteFeatureReference
  * @since 2.1
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface ISiteFeatureReference extends IFeatureReference, IAdaptable {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteWithMirrors.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteWithMirrors.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteWithMirrors.java
index 31b5c95..3779695 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteWithMirrors.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteWithMirrors.java
@@ -14,11 +14,11 @@
 
 /**
  * An extension of ISite that supports mirrors.
- * The regular update site contains features (optionally groupped by categories), while
+ * The regular update site contains features (optionally grouped by categories), while
  * a mirrored site can define zero or more updates sites (mirrors) with the same content.
  * This allows users to pick their own update site, for performance purposes.
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface ISiteWithMirrors extends ISite {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/IURLEntry.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IURLEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IURLEntry.java
index 3538178..1e9ee16 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IURLEntry.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IURLEntry.java
@@ -32,8 +32,8 @@
  * </p>
  * @see org.eclipse.update.core.URLEntry
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IURLEntry extends IAdaptable {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/IUpdateConstants.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IUpdateConstants.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IUpdateConstants.java
index 5f3c550..68e57da 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IUpdateConstants.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IUpdateConstants.java
@@ -21,8 +21,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 2.0.2
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IUpdateConstants {
 	

update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationListener.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationListener.java
index e041f53..221bc79 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationListener.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationListener.java
@@ -28,8 +28,8 @@
  * @see org.eclipse.update.core.IVerificationResult
  * @see org.eclipse.update.core.IVerifier
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IVerificationListener {
 	

update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationResult.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationResult.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationResult.java
index d400cc0..3409f7c 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationResult.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationResult.java
@@ -28,8 +28,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IVerificationResult {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/IVerifier.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerifier.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerifier.java
index 5b7bfee..13ad620 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerifier.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerifier.java
@@ -28,8 +28,8 @@
  * @see org.eclipse.update.core.IVerificationResult
  * @see org.eclipse.update.core.IFeatureContentProvider#getVerifier()
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IVerifier {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/Import.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Import.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Import.java
index 5504b3f..df354e6 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Import.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/Import.java
@@ -28,8 +28,8 @@
  * @see org.eclipse.update.core.IImport
  * @see org.eclipse.update.core.model.ImportModel
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class Import extends ImportModel implements IImport {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/IncludedFeatureReference.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IncludedFeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IncludedFeatureReference.java
index 16a869d..9abf604 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IncludedFeatureReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IncludedFeatureReference.java
@@ -35,8 +35,8 @@
  * </p>
  * @see org.eclipse.update.core.VersionedIdentifier
  * @since 2.0.1
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class IncludedFeatureReference
 	extends IncludedFeatureReferenceModel

update/org.eclipse.update.core/src/org/eclipse/update/core/InstallHandlerEntry.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallHandlerEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallHandlerEntry.java
index bffb6fa..77aacee 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallHandlerEntry.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallHandlerEntry.java
@@ -27,8 +27,8 @@
  * @see org.eclipse.update.core.model.InstallHandlerEntryModel
  * @see org.eclipse.update.core.IInstallHandler
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class InstallHandlerEntry
 	extends InstallHandlerEntryModel

update/org.eclipse.update.core/src/org/eclipse/update/core/InstallMonitor.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallMonitor.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallMonitor.java
index 8df5d85..5fee40d 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallMonitor.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallMonitor.java
@@ -27,8 +27,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class InstallMonitor implements IProgressMonitor {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/JarContentReference.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/JarContentReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/JarContentReference.java
index 2d8d1a5..fec8f38 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/JarContentReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/JarContentReference.java
@@ -34,8 +34,8 @@
  * @see org.eclipse.update.core.ContentReference
  * @see org.eclipse.update.core.JarEntryContentReference
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class JarContentReference extends ContentReference {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/JarEntryContentReference.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/JarEntryContentReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/JarEntryContentReference.java
index 08ce0b1..5664da2 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/JarEntryContentReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/JarEntryContentReference.java
@@ -28,8 +28,8 @@
  * @see org.eclipse.update.core.ContentReference
  * @see org.eclipse.update.core.JarContentReference
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class JarEntryContentReference extends ContentReference {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/NonPluginEntry.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/NonPluginEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/NonPluginEntry.java
index ab5d24b..8cf83af 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/NonPluginEntry.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/NonPluginEntry.java
@@ -26,8 +26,8 @@
  * @see org.eclipse.update.core.INonPluginEntry
  * @see org.eclipse.update.core.model.NonPluginEntryModel
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class NonPluginEntry
 	extends NonPluginEntryModel

update/org.eclipse.update.core/src/org/eclipse/update/core/PluginEntry.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/PluginEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/PluginEntry.java
index 08eb298..bb919e7 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/PluginEntry.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/PluginEntry.java
@@ -27,8 +27,8 @@
  * @see org.eclipse.update.core.IPluginEntry
  * @see org.eclipse.update.core.model.PluginEntryModel
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class PluginEntry extends PluginEntryModel implements IPluginEntry {
 	

update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java
index 97ddff2..62bce84 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java
@@ -40,8 +40,8 @@
  * @see org.eclipse.update.core.ISite
  * @see org.eclipse.update.core.model.SiteModel
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class Site extends SiteModel implements ISiteWithMirrors {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/SiteContentProvider.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteContentProvider.java
index df40967..0bcefd5 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteContentProvider.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteContentProvider.java
@@ -25,8 +25,8 @@
  * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
  * (repeatedly) as the API evolves.
  * </p>
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public abstract class SiteContentProvider implements ISiteContentProvider {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReference.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReference.java
index 137a3e2..4328d73 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReference.java
@@ -32,8 +32,8 @@
  * @see org.eclipse.update.core.ISiteFeatureReference
  * @see org.eclipse.update.core.SiteFeatureReferenceModel 
  * @since 2.1
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class SiteFeatureReference extends SiteFeatureReferenceModel implements ISiteFeatureReference {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReferenceModel.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReferenceModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReferenceModel.java
index 6cf716b..47a9ce6 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReferenceModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReferenceModel.java
@@ -29,8 +29,8 @@
  * </p>
  * @see org.eclipse.update.core.FeatureReference
  * @since 2.1
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class SiteFeatureReferenceModel extends FeatureReference {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/SiteManager.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteManager.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteManager.java
index 8171165..33dbd66 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteManager.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteManager.java
@@ -36,8 +36,8 @@
  * @see org.eclipse.update.configuration.ILocalSite
  * @see org.eclipse.update.configuration.IConfiguredSite
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class SiteManager {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/URLEntry.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/URLEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/URLEntry.java
index d3a3082..0c04dac 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/URLEntry.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/URLEntry.java
@@ -27,8 +27,8 @@
  * @see org.eclipse.update.core.IURLEntry
  * @see org.eclipse.update.core.model.URLEntryModel
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class URLEntry extends URLEntryModel implements IURLEntry {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/Utilities.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Utilities.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Utilities.java
index 2b55523..3e8c78d 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Utilities.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/Utilities.java
@@ -30,8 +30,8 @@
  * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
  * (repeatedly) as the API evolves.
  * </p>
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class Utilities {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/Verifier.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Verifier.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Verifier.java
index 52095bd..e1f9e04 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Verifier.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/Verifier.java
@@ -25,8 +25,8 @@
  * </p>
  * @see org.eclipse.update.core.IVerifier
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public abstract class Verifier implements IVerifier {
 	

update/org.eclipse.update.core/src/org/eclipse/update/core/VersionedIdentifier.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/VersionedIdentifier.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/VersionedIdentifier.java
index 2947363..b286480 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/VersionedIdentifier.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/VersionedIdentifier.java
@@ -28,8 +28,8 @@
  * </p>
  * @see org.eclipse.core.runtime.PluginVersionIdentifier
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class VersionedIdentifier {
 	private String id;

update/org.eclipse.update.core/src/org/eclipse/update/core/model/ArchiveReferenceModel.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ArchiveReferenceModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ArchiveReferenceModel.java
index f0a0f4d..8618cb0 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ArchiveReferenceModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ArchiveReferenceModel.java
@@ -28,8 +28,8 @@
  * </p>
  * @see org.eclipse.update.core.ArchiveReference
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class ArchiveReferenceModel extends ModelObject {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/model/CategoryModel.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/CategoryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/CategoryModel.java
index 8e7a2ea..3fbfb15 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/CategoryModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/CategoryModel.java
@@ -31,8 +31,8 @@
  * </p>
  * @see org.eclipse.update.core.Category
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class CategoryModel extends ModelObject {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/model/ContentEntryModel.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ContentEntryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ContentEntryModel.java
index c972caa..900e04b 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ContentEntryModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ContentEntryModel.java
@@ -26,8 +26,8 @@
  * @see org.eclipse.update.core.model.PluginEntryModel
  * @see org.eclipse.update.core.model.NonPluginEntryModel
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public abstract class ContentEntryModel extends ModelObject {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java
index 3c6348a..05d3bd3 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java
@@ -38,8 +38,8 @@
  * </ul>
  * 
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class DefaultFeatureParser extends DefaultHandler {
 	

update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java
index afccb07..7dfd978 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java
@@ -63,8 +63,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class DefaultSiteParser extends DefaultHandler {
 	

update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModel.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModel.java
index 947faf2..6535672 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModel.java
@@ -40,8 +40,8 @@
  * </p>
  * @see org.eclipse.update.core.Feature
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class FeatureModel extends ModelObject {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModelFactory.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModelFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModelFactory.java
index 1d54f19..8a5ce9e 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModelFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModelFactory.java
@@ -34,8 +34,8 @@
  * </p>
  * @see org.eclipse.update.core.BaseFeatureFactory
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class FeatureModelFactory {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureReferenceModel.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureReferenceModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureReferenceModel.java
index b4c816b..d943156 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureReferenceModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureReferenceModel.java
@@ -33,8 +33,8 @@
  * </p>
  * @see org.eclipse.update.core.FeatureReference
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class FeatureReferenceModel extends ModelObject {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/model/ImportModel.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ImportModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ImportModel.java
index 32da688..47add71 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ImportModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ImportModel.java
@@ -25,8 +25,8 @@
  * </p>
  * @see org.eclipse.update.core.Import
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class ImportModel extends ModelObject {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/model/IncludedFeatureReferenceModel.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/IncludedFeatureReferenceModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/IncludedFeatureReferenceModel.java
index aaa9ea5..4a66729 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/IncludedFeatureReferenceModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/IncludedFeatureReferenceModel.java
@@ -31,8 +31,8 @@
  * </p>
  * @see org.eclipse.update.core.IncludedFeatureReference
  * @since 2.1
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class IncludedFeatureReferenceModel extends FeatureReference {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallAbortedException.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallAbortedException.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallAbortedException.java
index a732f8c..eaf6801 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallAbortedException.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallAbortedException.java
@@ -23,8 +23,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class InstallAbortedException extends CoreException {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallHandlerEntryModel.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallHandlerEntryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallHandlerEntryModel.java
index da6f7e4..853d81b 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallHandlerEntryModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallHandlerEntryModel.java
@@ -29,8 +29,8 @@
  * </p>
  * @see org.eclipse.update.core.InstallHandlerEntry
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class InstallHandlerEntryModel extends ModelObject {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/model/InvalidSiteTypeException.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InvalidSiteTypeException.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InvalidSiteTypeException.java
index 7ad18ee..c4e17cb 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InvalidSiteTypeException.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InvalidSiteTypeException.java
@@ -22,8 +22,8 @@
  * </p>
  * @see org.eclipse.update.core.model.SiteModelFactory#canParseSiteType(String)
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class InvalidSiteTypeException extends Exception {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/model/ModelObject.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ModelObject.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ModelObject.java
index bdcc399..a640998 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ModelObject.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ModelObject.java
@@ -44,8 +44,8 @@
  * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
  * (repeatedly) as the API evolves.
  * </p>
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public abstract class ModelObject extends PlatformObject {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/model/NonPluginEntryModel.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/NonPluginEntryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/NonPluginEntryModel.java
index 7ae2bd3..ff96cde 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/NonPluginEntryModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/NonPluginEntryModel.java
@@ -25,15 +25,15 @@
  * </p>
  * @see org.eclipse.update.core.NonPluginEntry
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class NonPluginEntryModel extends ContentEntryModel {
 
 	private String id = null;
 
 	/**
-	 * Creates a uninitialized non-plug-in entry model object.
+	 * Creates a uninitialised non-plug-in entry model object.
 	 * 
 	 * @since 2.0
 	 */

update/org.eclipse.update.core/src/org/eclipse/update/core/model/PluginEntryModel.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/PluginEntryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/PluginEntryModel.java
index 02259d3..632254c 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/PluginEntryModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/PluginEntryModel.java
@@ -26,8 +26,8 @@
  * </p>
  * @see org.eclipse.update.core.PluginEntry
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class PluginEntryModel extends ContentEntryModel {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModel.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModel.java
index d124825..3d911ce 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModel.java
@@ -40,8 +40,8 @@
  * </p>
  * @see org.eclipse.update.core.Site
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class SiteModel extends ModelObject {
 

update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModelFactory.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModelFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModelFactory.java
index cdc5411..9c3b835 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModelFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModelFactory.java
@@ -35,8 +35,8 @@
  * </p>
  * @see org.eclipse.update.core.BaseSiteFactory
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class SiteModelFactory {
 	

update/org.eclipse.update.core/src/org/eclipse/update/core/model/URLEntryModel.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/URLEntryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/URLEntryModel.java
index 1ef1b91..21b751b 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/URLEntryModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/URLEntryModel.java
@@ -31,8 +31,8 @@
  * </p>
  * @see org.eclipse.update.core.URLEntry
  * @since 2.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class URLEntryModel extends ModelObject {
 	

update/org.eclipse.update.core/src/org/eclipse/update/core/model/package.html

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/package.html b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/package.html
index 414eb5b..03886d3 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/package.html
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/package.html
@@ -19,5 +19,9 @@
 in package <b>org.eclipse.update.core</b>.
 <p>Classes in this package would typically only be used directly when writing
 and alternate set of model objects for a feature and type implementation.
+<p>
+<b>Note:</b> This package has been deprecated and will be deleted in a future
+release.  See bug 311590 for details.
+</p>
 </body>
 </html>

update/org.eclipse.update.core/src/org/eclipse/update/core/package.html

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/package.html b/update/org.eclipse.update.core/src/org/eclipse/update/core/package.html
index 05da6c8..693e7b1 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/package.html
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/package.html
@@ -21,5 +21,9 @@
 in package <b>org.eclipse.update.core.model</b>. In general, developers
 should extend the convenience classes rather than completely reimplementing
 the specified interfaces.
+<p>
+<b>Note:</b> This package has been deprecated and will be deleted in a future
+release.  See bug 311590 for details.
+</p>
 </body>
 </html>

update/org.eclipse.update.core/src/org/eclipse/update/operations/IBatchOperation.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IBatchOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IBatchOperation.java
index 04eb2ca..412ca4c 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IBatchOperation.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IBatchOperation.java
@@ -22,8 +22,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IBatchOperation  extends IOperation {
 	/**

update/org.eclipse.update.core/src/org/eclipse/update/operations/IConfigFeatureOperation.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IConfigFeatureOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IConfigFeatureOperation.java
index 5b2376b..a4471ff 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IConfigFeatureOperation.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IConfigFeatureOperation.java
@@ -20,8 +20,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
-  * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
 */
 public interface IConfigFeatureOperation extends IFeatureOperation {
 }

update/org.eclipse.update.core/src/org/eclipse/update/operations/IFeatureOperation.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IFeatureOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IFeatureOperation.java
index 55336fd..752a74f 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IFeatureOperation.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IFeatureOperation.java
@@ -23,8 +23,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IFeatureOperation extends IOperation {
 	/**

update/org.eclipse.update.core/src/org/eclipse/update/operations/IInstallFeatureOperation.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IInstallFeatureOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IInstallFeatureOperation.java
index 7cbf0fa..18c7438 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IInstallFeatureOperation.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IInstallFeatureOperation.java
@@ -24,8 +24,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IInstallFeatureOperation extends IFeatureOperation {
 	/**

update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperation.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperation.java
index 10ab50a..1ff4133 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperation.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperation.java
@@ -24,8 +24,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IOperation {
 	/**

update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationFactory.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationFactory.java
index 7b2c811..756d002 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationFactory.java
@@ -23,8 +23,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IOperationFactory {
 	/**

update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationListener.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationListener.java
index 755996b..5909903 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationListener.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationListener.java
@@ -21,8 +21,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IOperationListener {
 	/**

update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationValidator.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationValidator.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationValidator.java
index a6139a8..a084882 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationValidator.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationValidator.java
@@ -24,8 +24,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IOperationValidator {
 

update/org.eclipse.update.core/src/org/eclipse/update/operations/IReplaceFeatureVersionOperation.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IReplaceFeatureVersionOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IReplaceFeatureVersionOperation.java
index d9a9dd2..4b09f57 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IReplaceFeatureVersionOperation.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IReplaceFeatureVersionOperation.java
@@ -20,8 +20,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IReplaceFeatureVersionOperation extends IFeatureOperation {
 }

update/org.eclipse.update.core/src/org/eclipse/update/operations/IRevertConfigurationOperation.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IRevertConfigurationOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IRevertConfigurationOperation.java
index 1bece29..be24541 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IRevertConfigurationOperation.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IRevertConfigurationOperation.java
@@ -19,8 +19,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IRevertConfigurationOperation extends IOperation {
 }

update/org.eclipse.update.core/src/org/eclipse/update/operations/IToggleSiteOperation.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IToggleSiteOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IToggleSiteOperation.java
index 35a971b..6c0d8a0 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IToggleSiteOperation.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IToggleSiteOperation.java
@@ -19,8 +19,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IToggleSiteOperation extends IOperation {
 }

update/org.eclipse.update.core/src/org/eclipse/update/operations/IUnconfigFeatureOperation.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IUnconfigFeatureOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IUnconfigFeatureOperation.java
index 828a325..e32bea6 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IUnconfigFeatureOperation.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IUnconfigFeatureOperation.java
@@ -21,8 +21,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IUnconfigFeatureOperation  extends IFeatureOperation {
 }

update/org.eclipse.update.core/src/org/eclipse/update/operations/IUninstallFeatureOperation.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IUninstallFeatureOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IUninstallFeatureOperation.java
index aba6598..de0a18b 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IUninstallFeatureOperation.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IUninstallFeatureOperation.java
@@ -21,8 +21,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IUninstallFeatureOperation extends IFeatureOperation {
 	public final static String UNINSTALL = "uninstall"; //$NON-NLS-1$

update/org.eclipse.update.core/src/org/eclipse/update/operations/IUpdateModelChangedListener.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IUpdateModelChangedListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IUpdateModelChangedListener.java
index 9176b37..15991fb 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IUpdateModelChangedListener.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IUpdateModelChangedListener.java
@@ -22,8 +22,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IUpdateModelChangedListener {
 	/**

update/org.eclipse.update.core/src/org/eclipse/update/operations/OperationsManager.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/OperationsManager.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/OperationsManager.java
index 71d15d1..b85f8bd 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/OperationsManager.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/operations/OperationsManager.java
@@ -28,8 +28,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class OperationsManager {
 	private static IOperationValidator validator;

update/org.eclipse.update.core/src/org/eclipse/update/operations/package.html

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/package.html b/update/org.eclipse.update.core/src/org/eclipse/update/operations/package.html
index 277f616..0588f6e 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/package.html
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/operations/package.html
@@ -13,10 +13,8 @@
 This package contains interfaces for performing update/install operations 
 without using the Update Manager user interface. 
 <p>
-<b>Note:</b> This package is part of an interim API that is still under development and expected to
-change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-(repeatedly) as the API evolves.
+<b>Note:</b> This package has been deprecated and will be deleted in a future
+release.  See bug 311590 for details.
 </p>
 </body>
 </html>

update/org.eclipse.update.core/src/org/eclipse/update/search/BackLevelFilter.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/BackLevelFilter.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/BackLevelFilter.java
index 6f0baa4..b078a2e 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/BackLevelFilter.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/search/BackLevelFilter.java
@@ -28,8 +28,8 @@
  * @see UpdateSearchRequest
  * @see IUpdateSearchFilter
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class BackLevelFilter extends BaseFilter {
 	

update/org.eclipse.update.core/src/org/eclipse/update/search/BaseFilter.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/BaseFilter.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/BaseFilter.java
index c364f57..09df4ab 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/BaseFilter.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/search/BaseFilter.java
@@ -24,8 +24,8 @@
  * @see UpdateSearchRequest
  * @see IUpdateSearchFilter
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class BaseFilter implements IUpdateSearchFilter {
     /**

update/org.eclipse.update.core/src/org/eclipse/update/search/EnvironmentFilter.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/EnvironmentFilter.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/EnvironmentFilter.java
index e77e014..872881e 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/EnvironmentFilter.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/search/EnvironmentFilter.java
@@ -27,8 +27,8 @@
  * @see UpdateSearchRequest
  * @see IUpdateSearchFilter
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class EnvironmentFilter extends BaseFilter {
 	

update/org.eclipse.update.core/src/org/eclipse/update/search/IQueryUpdateSiteAdapter.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/IQueryUpdateSiteAdapter.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/IQueryUpdateSiteAdapter.java
index b76d1a5..340e036 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/IQueryUpdateSiteAdapter.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/search/IQueryUpdateSiteAdapter.java
@@ -24,8 +24,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IQueryUpdateSiteAdapter extends IUpdateSiteAdapter {
 /**

update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchCategory.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchCategory.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchCategory.java
index b206666..82f9dd2 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchCategory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchCategory.java
@@ -24,8 +24,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IUpdateSearchCategory {
 /**

update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchFilter.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchFilter.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchFilter.java
index f6b0724..e903893 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchFilter.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchFilter.java
@@ -22,8 +22,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IUpdateSearchFilter {
 	/**

update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java
index ebd6025..cd94133 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java
@@ -22,8 +22,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IUpdateSearchQuery {
 /**

update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchResultCollector.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchResultCollector.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchResultCollector.java
index 7d31f42..4b6aa91 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchResultCollector.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchResultCollector.java
@@ -25,8 +25,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IUpdateSearchResultCollector {
 /**

update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchResultCollectorFromMirror.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchResultCollectorFromMirror.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchResultCollectorFromMirror.java
index fea4134..9661132 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchResultCollectorFromMirror.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchResultCollectorFromMirror.java
@@ -30,8 +30,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.1
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IUpdateSearchResultCollectorFromMirror extends
 		IUpdateSearchResultCollector {

update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchSite.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchSite.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchSite.java
index 9cda395..8e68ba8 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchSite.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchSite.java
@@ -24,8 +24,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IUpdateSearchSite extends IUpdateSiteAdapter {
 /**

update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSiteAdapter.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSiteAdapter.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSiteAdapter.java
index 2e456c2..3e49cd0 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSiteAdapter.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSiteAdapter.java
@@ -23,8 +23,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public interface IUpdateSiteAdapter {
 	/**

update/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java
index c658f59..8345562 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java
@@ -59,8 +59,8 @@
  * @see UpdateSearchScope
  * @see IUpdateSearchCategory
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class UpdateSearchRequest {
 	private IUpdateSearchCategory category;

update/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchScope.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchScope.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchScope.java
index e7a797a..7c99e7e 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchScope.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchScope.java
@@ -29,8 +29,8 @@
  * </p>
  * @see UpdateSearchRequest
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class UpdateSearchScope {
 	private Vector sites;

update/org.eclipse.update.core/src/org/eclipse/update/search/VersionedIdentifiersFilter.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/VersionedIdentifiersFilter.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/VersionedIdentifiersFilter.java
index cd87938..4408c8a 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/VersionedIdentifiersFilter.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/search/VersionedIdentifiersFilter.java
@@ -29,8 +29,8 @@
  * @see UpdateSearchRequest
  * @see IUpdateSearchFilter
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class VersionedIdentifiersFilter extends BaseFilter {
 	private ArrayList vids;

update/org.eclipse.update.core/src/org/eclipse/update/search/package.html

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/package.html b/update/org.eclipse.update.core/src/org/eclipse/update/search/package.html
index 62e8f20..350db90 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/package.html
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/search/package.html
@@ -10,12 +10,9 @@
 <h2>
 Package Specification</h2>
 This package contains interfaces and helper classes for creating and executing search operations. 
-
 <p>
-<b>Note:</b> This package is part of an interim API that is still under development and expected to
-change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-(repeatedly) as the API evolves.
+<b>Note:</b> This package has been deprecated and will be deleted in a future
+release.  See bug 311590 for details.
 </p>
 </body>
 </html>

update/org.eclipse.update.core/src/org/eclipse/update/standalone/AddSiteCommand.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/AddSiteCommand.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/AddSiteCommand.java
index 01a7f8d..8f7a851 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/AddSiteCommand.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/AddSiteCommand.java
@@ -27,8 +27,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class AddSiteCommand extends ScriptedCommand {
 	private ISite site;

update/org.eclipse.update.core/src/org/eclipse/update/standalone/CmdLineArgs.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/CmdLineArgs.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/CmdLineArgs.java
index f1aebc6..a63694b 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/CmdLineArgs.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/CmdLineArgs.java
@@ -28,8 +28,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class CmdLineArgs {
 	private HashMap options = new HashMap();

update/org.eclipse.update.core/src/org/eclipse/update/standalone/DisableCommand.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/DisableCommand.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/DisableCommand.java
index eb941d3..596d4ec 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/DisableCommand.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/DisableCommand.java
@@ -30,8 +30,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class DisableCommand extends ScriptedCommand {
 

update/org.eclipse.update.core/src/org/eclipse/update/standalone/EnableCommand.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/EnableCommand.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/EnableCommand.java
index a5fa684..196f380 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/EnableCommand.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/EnableCommand.java
@@ -30,8 +30,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class EnableCommand extends ScriptedCommand {
 

update/org.eclipse.update.core/src/org/eclipse/update/standalone/InstallCommand.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/InstallCommand.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/InstallCommand.java
index 2cb134e..37f5419 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/InstallCommand.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/InstallCommand.java
@@ -53,8 +53,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class InstallCommand extends ScriptedCommand {
 

update/org.eclipse.update.core/src/org/eclipse/update/standalone/ListFeaturesCommand.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/ListFeaturesCommand.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/ListFeaturesCommand.java
index c34b9d2..143f459 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/ListFeaturesCommand.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/ListFeaturesCommand.java
@@ -27,8 +27,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class ListFeaturesCommand extends ScriptedCommand {
 	private IConfiguredSite[] sites = getConfiguration().getConfiguredSites();

update/org.eclipse.update.core/src/org/eclipse/update/standalone/RemoveSiteCommand.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/RemoveSiteCommand.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/RemoveSiteCommand.java
index b920762..e89bcfa 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/RemoveSiteCommand.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/RemoveSiteCommand.java
@@ -27,8 +27,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class RemoveSiteCommand extends ScriptedCommand {
 	private IConfiguredSite csite;

update/org.eclipse.update.core/src/org/eclipse/update/standalone/ScriptedCommand.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/ScriptedCommand.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/ScriptedCommand.java
index 839347b..6b5f15b 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/ScriptedCommand.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/ScriptedCommand.java
@@ -25,8 +25,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public abstract class ScriptedCommand implements IOperationListener {
 

update/org.eclipse.update.core/src/org/eclipse/update/standalone/SearchCommand.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/SearchCommand.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/SearchCommand.java
index 272cfc7..f6096df 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/SearchCommand.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/SearchCommand.java
@@ -28,8 +28,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class SearchCommand extends ScriptedCommand {
 

update/org.eclipse.update.core/src/org/eclipse/update/standalone/StandaloneUpdateApplication.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/StandaloneUpdateApplication.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/StandaloneUpdateApplication.java
index 5b712d0..90a078f 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/StandaloneUpdateApplication.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/StandaloneUpdateApplication.java
@@ -23,8 +23,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class StandaloneUpdateApplication implements IPlatformRunnable {
 

update/org.eclipse.update.core/src/org/eclipse/update/standalone/UninstallCommand.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/UninstallCommand.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/UninstallCommand.java
index ae3d826..0ee38dd 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/UninstallCommand.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/UninstallCommand.java
@@ -30,8 +30,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class UninstallCommand extends ScriptedCommand {
 

update/org.eclipse.update.core/src/org/eclipse/update/standalone/UpdateCommand.java

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/UpdateCommand.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/UpdateCommand.java
index 1f64c55..8c09ded 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/UpdateCommand.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/UpdateCommand.java
@@ -31,8 +31,8 @@
  * (repeatedly) as the API evolves.
  * </p>
  * @since 3.0
- * @deprecated The org.eclipse.update component has been replaced by Equinox p2. This
- * provisional API was never promoted to stable API, and may be removed from a future release of the platform.
+ * @deprecated The org.eclipse.update component has been replaced by Equinox p2.
+ * This API will be deleted in a future release. See bug 311590 for details.
  */
 public class UpdateCommand extends ScriptedCommand {
 

update/org.eclipse.update.core/src/org/eclipse/update/standalone/package.html

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/package.html b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/package.html
index 7aa8db2..7044920 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/package.html
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/package.html
@@ -14,10 +14,8 @@
 without using the Update Manager user interface. In general, it is best to use these
 classes for command line invocation, but it is possible to also use them programmatically.
 <p>
-<b>Note:</b> This package is part of an interim API that is still under development and expected to
-change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-(repeatedly) as the API evolves.
+<b>Note:</b> This package has been deprecated and will be deleted in a future
+release.  See bug 311590 for details.
 </p>
 </body>
 </html>