diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java
index 8c925a35ffc..c5de7ce5a43 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java
@@ -458,11 +458,13 @@ public abstract class SubSystemConfiguration  implements ISubSystemConfiguration
 	// ---------------------------------
 
 	/**
-	 * Return vendor of this subsystem configuration.
-	 * This comes from the xml "vendor" attribute of the extension point.
+	 * Return vendor of this subsystem configuration. This comes from the xml
+	 * "vendor" attribute of the extension point.
 	 *
-	 * <b>Do not override this method</b>, it will likely be declared
-	 * <tt>final</tt> in the next release.
+	 * @noextend This method is not intended to be extended by clients. It will
+	 *           likely be declared <tt>final</tt> in the next release in
+	 *           order to ensure consistency with static xml markup in the
+	 *           extension.
 	 */
 	public String getVendor()
 	{
@@ -470,11 +472,13 @@ public abstract class SubSystemConfiguration  implements ISubSystemConfiguration
 	}
 
 	/**
-	 * Return name of this subsystem configuration.
-	 * This comes from the xml "name" attribute of the extension point.
+	 * Return name of this subsystem configuration. This comes from the xml
+	 * "name" attribute of the extension point.
 	 *
-	 * <b>Do not override this method</b>, it will likely be declared
-	 * <tt>final</tt> in the next release.
+	 * @noextend This method is not intended to be extended by clients. It will
+	 *           likely be declared <tt>final</tt> in the next release in
+	 *           order to ensure consistency with static xml markup in the
+	 *           extension.
 	 */
 	public String getName()
 	{
@@ -482,11 +486,13 @@ public abstract class SubSystemConfiguration  implements ISubSystemConfiguration
 	}
 
 	/**
-	 * Return name of this subsystem configuration.
-	 * This comes from the xml "description" attribute of the extension point.
+	 * Return name of this subsystem configuration. This comes from the xml
+	 * "description" attribute of the extension point.
 	 *
-	 * <b>Do not override this method</b>, it will likely be declared
-	 * <tt>final</tt> in the next release.
+	 * @noextend This method is not intended to be extended by clients. It will
+	 *           likely be declared <tt>final</tt> in the next release in
+	 *           order to ensure consistency with static xml markup in the
+	 *           extension.
 	 */
 	public String getDescription()
 	{
@@ -494,11 +500,13 @@ public abstract class SubSystemConfiguration  implements ISubSystemConfiguration
 	}
 
 	/**
-	 * Return unique id of this subsystem configuration.
-	 * This comes from the xml "id" attribute of the extension point.
+	 * Return unique id of this subsystem configuration. This comes from the xml
+	 * "id" attribute of the extension point.
 	 *
-	 * <b>Do not override this method</b>, it will likely be declared
-	 * <tt>final</tt> in the next release.
+	 * @noextend This method is not intended to be extended by clients. It will
+	 *           likely be declared <tt>final</tt> in the next release in
+	 *           order to ensure consistency with static xml markup in the
+	 *           extension.
 	 */
 	public String getId()
 	{
@@ -506,12 +514,15 @@ public abstract class SubSystemConfiguration  implements ISubSystemConfiguration
 	}
 
 	/**
-	 * Return the category this subsystem configuration subscribes to.
-	 * This comes from the xml "category" attribute of the extension point.
+	 * Return the category this subsystem configuration subscribes to. This
+	 * comes from the xml "category" attribute of the extension point.
+	 *
 	 * @see org.eclipse.rse.core.model.ISubSystemConfigurationCategories
 	 *
-	 * <b>Do not override this method</b>, it will likely be declared
-	 * <tt>final</tt> in the next release.
+	 * @noextend This method is not intended to be extended by clients. It will
+	 *           likely be declared <tt>final</tt> in the next release in
+	 *           order to ensure consistency with static xml markup in the
+	 *           extension.
 	 */
 	public String getCategory()
 	{
@@ -519,13 +530,15 @@ public abstract class SubSystemConfiguration  implements ISubSystemConfiguration
 	}
 
 	/**
-	 * Return the system types this subsystem configuration supports.
-	 * These come from static declaration in the
+	 * Return the system types this subsystem configuration supports. These come
+	 * from static declaration in the
 	 * <tt>org.eclipse.rse.core.subsystemConfigurations</tt> and
 	 * <tt>org.eclipse.rse.core.systemTypes</tt> extension points.
-	 *
-	 * <b>Do not override this method</b>, it will likely be declared
-	 * <tt>final</tt> in the next release.
+	 * 
+	 * @noextend This method is not intended to be extended by clients. It will
+	 *           likely be declared <tt>final</tt> in the next release in
+	 *           order to ensure consistency with static xml markup in the
+	 *           extension.
 	 */
 	public IRSESystemType[] getSystemTypes()
 	{