diff --git a/debug/org.eclipse.debug.tests/META-INF/MANIFEST.MF b/debug/org.eclipse.debug.tests/META-INF/MANIFEST.MF
index 9ec58f99085..ad77986e16c 100644
--- a/debug/org.eclipse.debug.tests/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.debug.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.debug.tests;singleton:=true
-Bundle-Version: 3.15.200.qualifier
+Bundle-Version: 3.15.300.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java
index 90d6fe0a736..8210d24d98a 100644
--- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java
+++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java
@@ -953,9 +953,6 @@ public void testPersistIndex() throws CoreException {
 	}
 
 
-	/**
-	 * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationAdded(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
 	@Override
 	public void launchConfigurationAdded(ILaunchConfiguration configuration) {
 		fFrom = getLaunchManager().getMovedFrom(configuration);
@@ -965,16 +962,10 @@ public void launchConfigurationAdded(ILaunchConfiguration configuration) {
 		}
 	}
 
-	/**
-	 * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationChanged(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
 	@Override
 	public void launchConfigurationChanged(ILaunchConfiguration configuration) {
 	}
 
-	/**
-	 * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationRemoved(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
 	@Override
 	public void launchConfigurationRemoved(ILaunchConfiguration configuration) {
 		fTo = getLaunchManager().getMovedTo(configuration);
@@ -1337,7 +1328,9 @@ public void launchesTerminated(ILaunch[] launches) {
 	/**
 	 * Do not return null or throw on cancel
 	 *
-	 * @see https://github.com/eclipse-platform/eclipse.platform/issues/2009
+	 * @see <a href=
+	 *      "https://github.com/eclipse-platform/eclipse.platform/issues/2009">Issue
+	 *      2009</a>
 	 * @see org.eclipse.debug.core.ILaunchConfiguration#launch(String,
 	 *      IProgressMonitor)
 	 */
diff --git a/terminal/bundles/org.eclipse.terminal.view.core/META-INF/MANIFEST.MF b/terminal/bundles/org.eclipse.terminal.view.core/META-INF/MANIFEST.MF
index 8528c05401a..0451eb54fce 100644
--- a/terminal/bundles/org.eclipse.terminal.view.core/META-INF/MANIFEST.MF
+++ b/terminal/bundles/org.eclipse.terminal.view.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.terminal.view.core;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
 Bundle-Activator: org.eclipse.terminal.view.core.internal.CoreBundleActivator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.0,4.0.0)",
diff --git a/terminal/bundles/org.eclipse.terminal.view.core/src/org/eclipse/terminal/view/core/ITerminalsConnectorConstants.java b/terminal/bundles/org.eclipse.terminal.view.core/src/org/eclipse/terminal/view/core/ITerminalsConnectorConstants.java
index f19784733cb..e9339ac29ad 100644
--- a/terminal/bundles/org.eclipse.terminal.view.core/src/org/eclipse/terminal/view/core/ITerminalsConnectorConstants.java
+++ b/terminal/bundles/org.eclipse.terminal.view.core/src/org/eclipse/terminal/view/core/ITerminalsConnectorConstants.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2018 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2025 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 2.0 which accompanies this distribution, and is
  * available at https://www.eclipse.org/legal/epl-2.0/
@@ -27,6 +27,7 @@ public interface ITerminalsConnectorConstants {
 	 * Property: The unique id of the terminals view to open.
 	 * <p>
 	 * Property Type: {@link String}
+	 * </p>
 	 */
 	public static final String PROP_ID = "id"; //$NON-NLS-1$
 
@@ -34,6 +35,7 @@ public interface ITerminalsConnectorConstants {
 	 * Property: The unique secondary id of the terminals view to open.
 	 * <p>
 	 * Special values:
+	 * </p>
 	 * <ul>
 	 * <li>
 	 * not present in properties table or {@link #LAST_ACTIVE_SECONDARY_ID} means open on most recent terminal view
@@ -44,9 +46,10 @@ public interface ITerminalsConnectorConstants {
 	 * <li>
 	 * <code>null</code> means open on the first primary terminal (the one with no secondary id)
 	 * </li>
-	 * <ul>
+	 * </ul>
 	 * <p>
 	 * Property Type: {@link String}
+	 * </p>
 	 */
 	public static final String PROP_SECONDARY_ID = "secondaryId"; //$NON-NLS-1$
 
@@ -94,7 +97,7 @@ public interface ITerminalsConnectorConstants {
 	/**
 	 * Property: External selection to associate with the terminal tab.
 	 * <p>
-	 * Property Type: {@link org.eclipse.jface.viewers.ISelection}
+	 * Property Type: org.eclipse.jface.viewers.ISelection
 	 */
 	public static final String PROP_SELECTION = "selection"; //$NON-NLS-1$
 
@@ -261,7 +264,7 @@ public interface ITerminalsConnectorConstants {
 	 * Property: Runtime process PTY instance.
 	 *           <p>Typical for process terminals.
 	 * <p>
-	 * Property Type: {@link org.eclipse.cdt.utils.pty.PTY}
+	 * Property Type: org.eclipse.cdt.utils.pty.PTY
 	 */
 	public static final String PROP_PTY_OBJ = "pty"; //$NON-NLS-1$
 
diff --git a/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/LauncherDelegateManager.java b/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/LauncherDelegateManager.java
index d72c4eb1ecd..d13c013f2da 100644
--- a/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/LauncherDelegateManager.java
+++ b/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/LauncherDelegateManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 - 2025 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2025 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 2.0 which accompanies this distribution, and is
  * available at https://www.eclipse.org/legal/epl-2.0/
@@ -39,8 +39,8 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.osgi.util.NLS;
-import org.eclipse.terminal.view.ui.launcher.ILauncherDelegateManager;
 import org.eclipse.terminal.view.ui.launcher.ILauncherDelegate;
+import org.eclipse.terminal.view.ui.launcher.ILauncherDelegateManager;
 import org.eclipse.ui.ISources;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.handlers.IHandlerService;
@@ -317,10 +317,9 @@ protected Map<String, Proxy> getExtensions() {
 	}
 
 	/**
-	 * Returns the extension point comparator instance. If not available,
-	 * {@link #doCreateExtensionPointComparator()} is called to create a new instance.
+	 * Returns the extension point comparator instance.
 	 *
-	 * @return The extension point comparator or <code>null</code> if the instance creation fails.
+	 * @return The extension point comparator.
 	 */
 	protected final ExtensionPointComparator getExtensionPointComparator() {
 		if (comparator == null) {
diff --git a/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/preferences/NoteCompositeHelper.java b/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/preferences/NoteCompositeHelper.java
index 7898150085d..d7d3e7c26bc 100644
--- a/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/preferences/NoteCompositeHelper.java
+++ b/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/preferences/NoteCompositeHelper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2018 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2025 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 2.0 which accompanies this distribution, and is
  * available at https://www.eclipse.org/legal/epl-2.0/
@@ -54,7 +54,8 @@ public void setEnabled(boolean enabled) {
 	 * Creates a composite with a highlighted Note entry and a message text.
 	 * This is designed to take up the full width of the page.
 	 *
-	 * @see PreferencePage#createNoteComposite, this is a plain copy of that!
+	 * @see PreferencePage#createNoteComposite
+	 *
 	 * @param font
 	 *            the font to use
 	 * @param composite
@@ -74,7 +75,7 @@ public static Composite createNoteComposite(Font font, Composite composite, Stri
 	 * Creates a composite with a highlighted Note entry and a message text.
 	 * This is designed to take up the full width of the page.
 	 *
-	 * @see PreferencePage#createNoteComposite, this is a plain copy of that!
+	 * @see PreferencePage#createNoteComposite
 	 * @param font
 	 *            the font to use
 	 * @param composite
diff --git a/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/tabs/TabTerminalListener.java b/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/tabs/TabTerminalListener.java
index 980a88cfc1a..c4c5d010e15 100644
--- a/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/tabs/TabTerminalListener.java
+++ b/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/tabs/TabTerminalListener.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2018 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2025 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 2.0 which accompanies this distribution, and is
  * available at https://www.eclipse.org/legal/epl-2.0/
@@ -201,10 +201,6 @@ public void setTerminalTitle(final String title, final TerminalTitleRequestor re
 		updateTitle(title, requestor);
 	}
 
-	/**
-	 * @see org.eclipse.internal.terminal.control.ITerminalListener2#setTerminalSelectionChanged()
-	 * @since 4.1
-	 */
 	@Override
 	public void setTerminalSelectionChanged() {
 		tabFolderManager.fireTerminalSelectionChanged();
diff --git a/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/launcher/ITerminalConsoleViewManager.java b/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/launcher/ITerminalConsoleViewManager.java
index ba02f5305ee..74b0a55f346 100644
--- a/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/launcher/ITerminalConsoleViewManager.java
+++ b/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/launcher/ITerminalConsoleViewManager.java
@@ -31,6 +31,7 @@ public interface ITerminalConsoleViewManager {
 	 * Returns the console view if available within the active workbench window page.
 	 * <p>
 	 * <b>Note:</b> The method must be called within the UI thread.
+	 * </p>
 	 *
 	 * @param tvid The terminals console view id. To specify reuse of most recent terminal view use special value of
 	 *        {@link ITerminalsConnectorConstants#LAST_ACTIVE_SECONDARY_ID} for its secondary part.
@@ -79,7 +80,7 @@ Widget openConsole(TerminalViewId tvid, String title, String encoding, ITerminal
 	 * @param connector The terminal connector. Must not be <code>null</code>.
 	 * @param data The custom terminal data node or <code>null</code>.
 	 *
-	 * @return An {@link Optional} describing the corresponding console tab item or <an empty optional if not found.
+	 * @return An {@link Optional} describing the corresponding console tab item or an empty optional if not found.
 	 */
 	Optional<Widget> findConsole(TerminalViewId tvid, String title, ITerminalConnector connector, Object data);
 
@@ -89,7 +90,7 @@ Widget openConsole(TerminalViewId tvid, String title, String encoding, ITerminal
 	 * <b>Note:</b> The method must be called within the UI thread.
 	 *
 	 * @param control The terminal control. Must not be <code>null</code>.
-	 * @return An {@link Optional} describing the corresponding console tab item or <an empty optional if not found.
+	 * @return An {@link Optional} describing the corresponding console tab item or an empty optional if not found.
 	 */
 	Optional<Widget> findConsole(ITerminalControl control);
 
diff --git a/terminal/tests/org.eclipse.terminal.test/src/org/eclipse/terminal/internal/test/terminalcanvas/VirtualCanvas.java b/terminal/tests/org.eclipse.terminal.test/src/org/eclipse/terminal/internal/test/terminalcanvas/VirtualCanvas.java
index ecd278f5891..dec6767caf1 100644
--- a/terminal/tests/org.eclipse.terminal.test/src/org/eclipse/terminal/internal/test/terminalcanvas/VirtualCanvas.java
+++ b/terminal/tests/org.eclipse.terminal.test/src/org/eclipse/terminal/internal/test/terminalcanvas/VirtualCanvas.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2018 Wind River Systems, Inc. and others.
+ * Copyright (c) 2007, 2025 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 2.0
  * which accompanies this distribution, and is available at
@@ -180,9 +180,6 @@ protected void paintUnoccupiedSpace(GC gc, Rectangle clipping) {
 		}
 	}
 
-	/**
-	 * @private
-	 */
 	protected boolean inClipping(Rectangle clipping, Rectangle r) {
 		// TODO check if this is OK in all cases (the <=!)
 		//
diff --git a/terminal/tests/org.eclipse.terminal.test/src/org/eclipse/terminal/model/TerminalColorUITest.java b/terminal/tests/org.eclipse.terminal.test/src/org/eclipse/terminal/model/TerminalColorUITest.java
index 509cfd5c5cb..af540adc8d9 100644
--- a/terminal/tests/org.eclipse.terminal.test/src/org/eclipse/terminal/model/TerminalColorUITest.java
+++ b/terminal/tests/org.eclipse.terminal.test/src/org/eclipse/terminal/model/TerminalColorUITest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Kichwa Coders Canada Inc. and others.
+ * Copyright (c) 2020, 2025 Kichwa Coders Canada Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -25,7 +25,7 @@
 import org.junit.Test;
 
 /**
- * This is a UI test because {@link TerminalColor#convertColor(boolean, boolean)
+ * This is a UI test because {@link TerminalColor#convertColor(boolean, boolean)}
  * requires a Display to operate the ColorRegistry.
  */
 public class TerminalColorUITest {