diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/search/LocalSearchHandler.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/search/LocalSearchHandler.java
index e0ee80aa974..38631f68200 100644
--- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/search/LocalSearchHandler.java
+++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/search/LocalSearchHandler.java
@@ -81,10 +81,8 @@ public class LocalSearchHandler implements ISearchHandler
 	/**
 	 * Constructor for local search handler.
 	 * 
-	 * @param shell
-	 *            a shell.
-	 * @param searchConfig
-	 *            a search configuration.
+	 * @param searchConfig a search configuration.
+	 * @param fileService the file service to search.
 	 */
 	public LocalSearchHandler(IHostSearchResultConfiguration searchConfig, IFileService fileService)
 	{
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemWidgetHelpers.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemWidgetHelpers.java
index fdf3e80f03a..97ae70c7c1c 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemWidgetHelpers.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemWidgetHelpers.java
@@ -739,8 +739,7 @@ public class SystemWidgetHelpers {
 	 * Assign the listener to the passed in implementer of Listener.
 	 * @param group composite to put the button into.
 	 * @param listener object to listen for events. Can be null.               
-	 * @param bundle ResourceBundle of tooltip text
-	 * @param id bundle key for tooltip text 
+	 * @param tooltip the tooltip text 
 	 * @deprecated
 	 */
 	public static Button createBrowseButton(Composite group, Listener listener, String tooltip) {
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseWizardAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseWizardAction.java
index 4ca9186f2a7..0b4fcede9fd 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseWizardAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseWizardAction.java
@@ -36,18 +36,18 @@ import org.eclipse.swt.widgets.Shell;
  * The advantages to using this class over the base action class are:
  * <ul>
  *  <li>Supports setting the label, description, image and tooltip text for this action, via constructors.
- *  <li>Sets {@link org.eclipse.rse.ui.SystemBaseAction#allowOnMultipleSelection(boolean)} to false, since most wizard actions are not permitted on multiple selection.
- *  <li>Supports setting whether the wizard requires a {@link org.eclipse.rse.ui.actions.SystemBaseDialogAction#setNeedsProgressMonitor() progress-monitor} or not, which is propogated to the wizard.
+ *  <li>Sets {@link org.eclipse.rse.ui.actions.SystemBaseAction#allowOnMultipleSelection(boolean)} to false, since most wizard actions are not permitted on multiple selection.
+ *  <li>Supports setting whether the wizard requires a {@link org.eclipse.rse.ui.actions.SystemBaseDialogAction#setNeedsProgressMonitor(boolean) progress-monitor} or not, which is propogated to the wizard.
  *  <li>Supports setting the overall wizard {@link #setWizardTitle(String) title}, which is propogated to the wizard.
  *  <li>Supports setting the overall wizard {@link #setWizardImage(ImageDescriptor) image}, which is propogated to the wizard.
  *  <li>Supports setting the default wizard {@link #setWizardPageTitle(String) page-title}, which is propogated to the wizard and the wizard pages.
  *  <li>Supports setting the wizard;s default {@link #setHelp(String) contextual-help}, which is propogated to the wizard and the wizard pages.
  *  <li>Supports setting the wizard's {@link #setMinimumPageSize(int,int) minimum-size}, which is propogated and applied to the wizard.
- *  <li>Supports setting an {@link org.eclipse.rse.ui.SystemBaseAction#setInputObject(Object) input-object}, which is propogated to the wizard and wizard pages. By default, this 
+ *  <li>Supports setting an {@link org.eclipse.rse.ui.actions.SystemBaseAction#setInputObject(Object) input-object}, which is propogated to the wizard and wizard pages. By default, this 
  *       is set the current StructuredSelection.
- *  <li>Supports querying a {@link org.eclipse.rse.ui.SystemBaseAction#getOutputObject() output-object} which is set by the wizard class.
+ *  <li>Supports querying a {@link org.eclipse.rse.ui.actions.SystemBaseAction#getOutputObject() output-object} which is set by the wizard class.
  *  <li>Supports a {@link #wasCancelled()} method so the caller can easily determine if the wizard was dismissed or cancelled by the user.
- *  <li>Supports propogation of the {@link org.eclipse.rse.ui.SystemBaseAction#getViewer() current-viewer}.
+ *  <li>Supports propogation of the {@link org.eclipse.rse.ui.actions.SystemBaseAction#getViewer() current-viewer}.
  * </ul>
  * 
  * <p>To use this class:</p>
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemChangePasswordDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemChangePasswordDialog.java
index 3660dbd8674..578253f6fce 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemChangePasswordDialog.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemChangePasswordDialog.java
@@ -43,7 +43,7 @@ public class SystemChangePasswordDialog extends SystemPromptDialog
 {
 	private String _hostname;
 	private String _user;
-	private String _oldPassword = ""; // $NON_NLS-1$
+	private String _oldPassword = ""; //$NON-NLS-1$
 	private String _newPassword = ""; //$NON-NLS-1$
 		
 	private Text _txtOldPassword;
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameTableProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameTableProvider.java
index 5a405717fb0..c83257e4215 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameTableProvider.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameTableProvider.java
@@ -120,14 +120,14 @@ public class SystemRenameTableProvider implements ITableLabelProvider, IStructur
 	}
 
 	/**
-	 * @see IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
 	 */
 	public void addListener(ILabelProviderListener listener) 
 	{
 	}
 
 	/**
-	 * @see IBaseLabelProvider#dispose()
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
 	 */
 	public void dispose() 
 	{
@@ -147,7 +147,7 @@ public class SystemRenameTableProvider implements ITableLabelProvider, IStructur
 	}
 
 	/**
-	 * @see IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
 	 */
 	public boolean isLabelProperty(Object element, String property) 
 	{
@@ -155,7 +155,7 @@ public class SystemRenameTableProvider implements ITableLabelProvider, IStructur
 	}
 
 	/**
-	 * @see IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
 	 */
 	public void removeListener(ILabelProviderListener listener) 
 	{
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectFileTypesDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectFileTypesDialog.java
index 24e66b09031..cd0f75e1c6e 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectFileTypesDialog.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectFileTypesDialog.java
@@ -186,7 +186,7 @@ public class SystemSelectFileTypesDialog
 	 * will appear on the screen.
 	 * </p>
 	 *
-	 * @param parent the parent composite
+	 * @param composite the parent composite
 	 * @return the message label
 	 */
 	protected Label createInstructionArea(Composite composite) 
@@ -384,7 +384,7 @@ public class SystemSelectFileTypesDialog
 	 * Set the selections made by the user, or <code>null</code> if
 	 * the selection was canceled.
 	 *
-	 * @param the list of selected elements, or <code>null</code> if Cancel was
+	 * @param newResult list of selected elements, or <code>null</code> if Cancel was
 	 *   pressed
 	 */
 	protected void setResult(java.util.List newResult)