diff --git a/org.eclipse.tm.terminal.view-feature/feature.xml b/org.eclipse.tm.terminal.view-feature/feature.xml
index a39b95a1d3f..141f5638a86 100644
--- a/org.eclipse.tm.terminal.view-feature/feature.xml
+++ b/org.eclipse.tm.terminal.view-feature/feature.xml
@@ -25,7 +25,7 @@
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.tm.terminal" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.tm.terminal" version="2.0.1" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF b/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF
index 6a503c929fa..b883c2aefb1 100644
--- a/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF
+++ b/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.tm.internal.terminal.view.TerminalViewPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.tm.terminal;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.tm.terminal;bundle-version="[2.0.1,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/LayeredSettingsStore.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/LayeredSettingsStore.java
index bc6484c5c9a..193d19d8696 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/LayeredSettingsStore.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/LayeredSettingsStore.java
@@ -1,22 +1,26 @@
 /*******************************************************************************
  * Copyright (c) 2008 Wind River Systems, Inc. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
  * Michael Scharf (Wind River) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.tm.internal.terminal.provisional.api;
 
-
 /**
  * Uses an array of {@link ISettingsStore} to find a value.
- *
+ * <p>
+ * <strong>EXPERIMENTAL</strong>. This class or interface has been added as part
+ * of a work in progress. There is no guarantee that this API will work or that
+ * it will remain the same. Please do not use this API without consulting with
+ * the <a href="http://www.eclipse.org/dsdp/tm/">Target Management</a> team.
+ * </p>
  */
 public class LayeredSettingsStore implements ISettingsStore {
-	
+
 	private final ISettingsStore[] fStores;
 
 	/**
@@ -52,7 +56,7 @@ public class LayeredSettingsStore implements ISettingsStore {
 	}
 
 	public void put(String key, String value) {
-		fStores[0].put(key,value);		
+		fStores[0].put(key,value);
 	}
 
 }
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/PreferenceSettingStore.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/PreferenceSettingStore.java
index 55d5393a013..c0697ae0e8d 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/PreferenceSettingStore.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/PreferenceSettingStore.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Wind River Systems, Inc. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
  * Michael Scharf (Wind River) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.tm.internal.terminal.provisional.api;
@@ -14,7 +14,12 @@ import org.eclipse.core.runtime.Preferences;
 
 /**
  * A preference based settings store.
- *
+ * <p>
+ * <strong>EXPERIMENTAL</strong>. This class or interface has been added as part
+ * of a work in progress. There is no guarantee that this API will work or that
+ * it will remain the same. Please do not use this API without consulting with
+ * the <a href="http://www.eclipse.org/dsdp/tm/">Target Management</a> team.
+ * </p>
  */
 public class PreferenceSettingStore implements ISettingsStore {
 	private final String fPrefix;
@@ -22,7 +27,7 @@ public class PreferenceSettingStore implements ISettingsStore {
 
 	/**
 	 * Creates a ISettingStore that uses the preferences as backend.
-	 * 
+	 *
 	 * @param preferences the backed.
 	 * @param prefix a string that is prepended to the key
 	 */
@@ -42,7 +47,7 @@ public class PreferenceSettingStore implements ISettingsStore {
 	}
 
 	public void put(String key, String value) {
-		fPreferences.setValue(makeKey(key), value);		
+		fPreferences.setValue(makeKey(key), value);
 	}
 	/**
 	 * @param key