diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/Mnemonics.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/Mnemonics.java
index 819f33bde1c..c979f10b0a7 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/Mnemonics.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/Mnemonics.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 IBM Corporation 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
@@ -12,6 +12,7 @@
  *
  * Contributors:
  * Martin Oberhuber (Wind River) - [187860] review for adding foreign lang support
+ * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
  ********************************************************************************/
 
 package org.eclipse.rse.ui;
@@ -75,6 +76,7 @@ import com.ibm.icu.util.ULocale;
  * <p>
  * Mnemonics on menus are allowed to have duplicates. Attempts are made to find the
  * least used mnemonic when finding a duplicate.
+ * @noextend This class is not intended to be subclassed by clients.
  */
 public class Mnemonics {
 
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/InheritButton.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/InheritButton.java
index 30fd3cc0b0e..2083d9ea8ff 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/InheritButton.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/InheritButton.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2006 IBM Corporation. All rights reserved.
+ * Copyright (c) 2006, 2008 IBM Corporation. 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
@@ -11,7 +11,7 @@
  * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
  * 
  * Contributors:
- * {Name} (company) - description of contribution.
+ * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
  ********************************************************************************/
 
 package org.eclipse.rse.ui.widgets;
@@ -50,6 +50,7 @@ import org.eclipse.swt.widgets.Group;
  * <p>
  * Although this control extends Composite, it does not make sense to 
  * add children to this control or to set a layout on it.
+ * @noextend This class is not intended to be subclassed by clients.
  */
 public class InheritButton extends Composite {
 
@@ -71,7 +72,7 @@ public class InheritButton extends Composite {
 	
 	/**
 	 * Create a new InheritButton.
-	 * @param parent
+	 * @param parent the composite owning this button
 	 */
 	public InheritButton(Composite parent) {
 		super(parent, SWT.NONE);
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemHistoryCombo.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemHistoryCombo.java
index 590fc79af73..f63ef0c9743 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemHistoryCombo.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemHistoryCombo.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation. All rights reserved.
+ * Copyright (c) 2000, 2008 IBM Corporation. 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
@@ -12,6 +12,7 @@
  * 
  * Contributors:
  * David Dykstal (IBM) - moved SystemPreferencesManager to a new package
+ * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
  ********************************************************************************/
 
 package org.eclipse.rse.ui.widgets;
@@ -45,13 +46,14 @@ import org.eclipse.swt.widgets.Group;
 
 /**
  * This re-usable widget is for a combox box that persists its history and
- *  allows the user to manipulate that history.
+ * allows the user to manipulate that history.
  * <p>
  * The composite is layed as follows:</p>
  * <pre><code>
  *   ______________v...
  * </code></pre>
  * @see #updateHistory()
+ * @noextend This class is not intended to be subclassed by clients.
  */
 public class SystemHistoryCombo extends Composite implements ISystemCombo, TraverseListener, KeyListener
 {