diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ILanguage.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ILanguage.java
index 35d0131cf83..f186372e107 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ILanguage.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ILanguage.java
@@ -44,7 +44,7 @@ public interface ILanguage extends IAdaptable {
public final static int OPTION_SKIP_FUNCTION_BODIES = 0x1;
/**
- * @deprecated, Has no effect.
+ * @deprecated Has no effect.
* @noreference This field is not intended to be referenced by clients.
*/
@Deprecated
@@ -58,7 +58,7 @@ public interface ILanguage extends IAdaptable {
public final static int OPTION_NO_IMAGE_LOCATIONS = 0x4;
/**
- * @deprecated, Has no effect.
+ * @deprecated Has no effect.
*/
@Deprecated
public final static int OPTION_IS_SOURCE_UNIT = 0x8;
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IPathEntryContainerExtension.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IPathEntryContainerExtension.java
index 8ade9f05ecb..bc096b89283 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IPathEntryContainerExtension.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IPathEntryContainerExtension.java
@@ -27,11 +27,11 @@ public interface IPathEntryContainerExtension extends IPathEntryContainer {
* and empty array if none.
*
* @param path Workspace relative path.
- * @param typeMask type of path entries:
+ * @param typesMask type of path entries:
*
IPathEntry.CDT_INCLUDE
*
IPathEntry.CDT_INCLUDE_FILE
*
IPathEntry.CDT_MACRO_FILE
- *
IPathEntry.CDT_MACRO
+ *
IPathEntry.CDT_MACRO
* @return IPathEntry[] - the entries or empty set if none
* @see IPathEntry
*/
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ITranslationUnit.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ITranslationUnit.java
index e10e053ec14..e36825a75c0 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ITranslationUnit.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ITranslationUnit.java
@@ -169,7 +169,7 @@ public interface ITranslationUnit extends ICElement, IParent, IOpenable, ISource
/**
* Creates and returns a namespace in this translation unit
*
- * @param name the name of the namespace
+ * @param namespace the name of the namespace
* @param monitor the progress monitor to notify
* @return the newly inserted namespace declaration (or the previously existing one in case
* attempting to create a duplicate)
@@ -189,8 +189,6 @@ public interface ITranslationUnit extends ICElement, IParent, IOpenable, ISource
*
* Users of this method must not destroy the resulting working copy.
*
- * @param bufferFactory
- * the given {@code IBuffer} factory
* @return the found shared working copy for this element, or {@code null} if none
* @see IBufferFactory
* @since 5.1
@@ -225,7 +223,7 @@ public interface ITranslationUnit extends ICElement, IParent, IOpenable, ISource
* unit itself at the given position, or if the given position is not
* within the source range of this translation unit.
*
- * @param position a source position inside the translation unit
+ * @param offset a source position inside the translation unit
* @return the innermost C element enclosing a given source position or {@code null}
* if none (excluding the translation unit).
* @exception CModelException if the translation unit does not exist or if an
@@ -241,7 +239,7 @@ public interface ITranslationUnit extends ICElement, IParent, IOpenable, ISource
* within the source range of this translation unit.
* You have this behavior when at expansion of a macro.
*
- * @param position a source position inside the translation unit
+ * @param offset a source position inside the translation unit
* @return the innermost C element enclosing a given source position or {@code null}
* if none (excluding the translation unit).
* @exception CModelException if the translation unit does not exist or if an
@@ -254,7 +252,7 @@ public interface ITranslationUnit extends ICElement, IParent, IOpenable, ISource
/**
* Returns the include declaration in this translation unit with the given name.
*
- * @param the name of the include to find (For example: {@code "stdio.h"}
+ * @param name the name of the include to find (For example: {@code "stdio.h"}
* or {@code "sys/types.h"})
* @return a handle onto the corresponding include declaration. The include declaration may or
* may not exist.
@@ -519,7 +517,7 @@ public interface ITranslationUnit extends ICElement, IParent, IOpenable, ISource
Map, ?> parse();
/**
- * @deprecated, use {@link FileContent#create(ITranslationUnit)}, instead.
+ * @deprecated Use {@link FileContent#create(ITranslationUnit)}, instead.
* @noreference This method is not intended to be referenced by clients.
*/
@Deprecated
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IWorkingCopy.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IWorkingCopy.java
index 25bdeae4e86..e58fac9fc6b 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IWorkingCopy.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IWorkingCopy.java
@@ -130,7 +130,7 @@ public interface IWorkingCopy extends ITranslationUnit {
* @param forceProblemDetection The boolean argument allows to force problem
* detection even if the working copy is already consistent.
* @param monitor a progress monitor
- * @throw CModelException if the contents of the original element
+ * @throws CModelException if the contents of the original element
* cannot be accessed
*/
void reconcile(boolean forceProblemDetection, IProgressMonitor monitor) throws CModelException;
@@ -157,7 +157,7 @@ public interface IWorkingCopy extends ITranslationUnit {
* detection even if the working copy is already consistent.
* @param monitor a progress monitor
* @return the AST or null
- * @throw CModelException if the contents of the original element
+ * @throws CModelException if the contents of the original element
* cannot be accessed
*
* @since 4.0
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICConfigurationDescription.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICConfigurationDescription.java
index 8b874b914be..9bdc0a3ff55 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICConfigurationDescription.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICConfigurationDescription.java
@@ -234,10 +234,10 @@ public interface ICConfigurationDescription extends ICSettingContainer, ICSettin
* If the current configuration does not reference any other configurations,
* an empty map is returned.
*
- * @return Map of referenced Project -> Configuration ID
- * @see {@link #setReferenceInfo(Map)}
- * {@link #getExternalSettings()}
- * {@link #createExternalSetting(String[], String[], String[], ICSettingEntry[])}
+ * @return Map of referenced Project -> Configuration ID
+ * @see #setReferenceInfo(Map)
+ * @see #getExternalSettings()
+ * @see #createExternalSetting(String[], String[], String[], ICSettingEntry[])
*/
Map getReferenceInfo();
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICSettingsStorage.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICSettingsStorage.java
index d95c9e48ba0..6726e19b209 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICSettingsStorage.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICSettingsStorage.java
@@ -56,7 +56,7 @@ public interface ICSettingsStorage {
* the specified id an empty storage is created and returned
* @throws CoreException
*
- * @see {@link ICStorageElement}
+ * @see ICStorageElement
*/
ICStorageElement getStorage(String id, boolean create) throws CoreException;
diff --git a/core/org.eclipse.cdt.core/options/org/eclipse/cdt/core/options/OptionStorage.java b/core/org.eclipse.cdt.core/options/org/eclipse/cdt/core/options/OptionStorage.java
index b724d4d5394..c76211130bc 100644
--- a/core/org.eclipse.cdt.core/options/org/eclipse/cdt/core/options/OptionStorage.java
+++ b/core/org.eclipse.cdt.core/options/org/eclipse/cdt/core/options/OptionStorage.java
@@ -51,7 +51,6 @@ public interface OptionStorage {
* @param value to be saved, must not be null.
* @param option the option metadata, must not be null.
*
- * @return the option value or default value if option is unknown
* @throws UnsupportedOperationException for unsupported option value types
*
* @see #consumable(Class)
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansion.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansion.java
index 8b4daaa8978..20b9d93bfb6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansion.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansion.java
@@ -15,7 +15,7 @@
package org.eclipse.cdt.core.dom.ast;
/**
- * @deprecated, use IASTMacroExpansionLocation instead
+ * @deprecated Use IASTMacroExpansionLocation instead
* @noreference This interface is not intended to be referenced by clients.
*/
@Deprecated
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IProblemBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IProblemBinding.java
index f73170e3200..a1a7bb73c55 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IProblemBinding.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IProblemBinding.java
@@ -67,7 +67,7 @@ public interface IProblemBinding extends IBinding, IScope, IType, ISemanticProbl
public static final int SEMANTIC_INVALID_TEMPLATE_ARGUMENTS = BINDING_INVALID_TEMPLATE_ARGUMENTS;
/**
- * @deprecated, there may be additional problems.
+ * @deprecated There may be additional problems.
* @noreference This field is not intended to be referenced by clients.
*/
@Deprecated
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionTryBlockDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionTryBlockDeclarator.java
index 9d811ee6acb..5d19877dd9f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionTryBlockDeclarator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionTryBlockDeclarator.java
@@ -17,7 +17,7 @@ package org.eclipse.cdt.core.dom.ast.cpp;
import org.eclipse.cdt.core.dom.ast.ASTNodeProperty;
/**
- * @deprecated, use {@link ICPPASTFunctionWithTryBlock}, instead.
+ * @deprecated Use {@link ICPPASTFunctionWithTryBlock}, instead.
* @noreference This interface is not intended to be referenced by clients.
*/
@Deprecated
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPBasicType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPBasicType.java
index 79756f413ed..861c04f5247 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPBasicType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPBasicType.java
@@ -22,7 +22,7 @@ import org.eclipse.cdt.core.dom.ast.IBasicType;
*/
public interface ICPPBasicType extends IBasicType {
/**
- * @deprecated, don't use the constant, more flags may be added for supporting future c++ standards.
+ * @deprecated Don't use the constant, more flags may be added for supporting future c++ standards.
* @noreference This field is not intended to be referenced by clients.
*/
@Deprecated
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNodeFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNodeFactory.java
index 11af18db9fb..49fecf38bf6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNodeFactory.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNodeFactory.java
@@ -391,7 +391,7 @@ public interface ICPPNodeFactory extends INodeFactory {
/**
* Creates a new translation unit that cooperates with the given scanner in order
* to track macro-expansions and location information.
- * @scanner the preprocessor the translation unit interacts with.
+ * @param scanner the preprocessor the translation unit interacts with.
* @since 5.2
*/
@Override
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateNonTypeParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateNonTypeParameter.java
index e2dc3b2ef56..dfd3d65c7e0 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateNonTypeParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateNonTypeParameter.java
@@ -24,7 +24,7 @@ import org.eclipse.cdt.core.dom.ast.IASTExpression;
*/
public interface ICPPTemplateNonTypeParameter extends ICPPTemplateParameter, ICPPVariable {
/**
- * @deprecated, use {@link ICPPTemplateParameter#getDefaultValue()}.
+ * @deprecated Use {@link ICPPTemplateParameter#getDefaultValue()}.
* @noreference This method is not intended to be referenced by clients.
*/
@Deprecated
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/AbstractCLikeLanguage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/AbstractCLikeLanguage.java
index 38de308e655..04790878a4a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/AbstractCLikeLanguage.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/AbstractCLikeLanguage.java
@@ -102,13 +102,13 @@ public abstract class AbstractCLikeLanguage extends AbstractLanguage implements
}
/**
- * @returns the actual parser object.
+ * @return the actual parser object.
*/
protected abstract ISourceCodeParser createParser(IScanner scanner, ParserMode parserMode,
IParserLogService logService, IIndex index);
/**
- * @returns the actual parser object, configured with additional settings.
+ * @return the actual parser object, configured with additional settings.
* @since 5.6
*/
protected ISourceCodeParser createParser(IScanner scanner, ParserMode parserMode, IParserLogService logService,
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndex.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndex.java
index fe0bf47e65f..04c23672c1a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndex.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndex.java
@@ -155,7 +155,7 @@ public interface IIndex {
*
* @param linkageID the id of the linkage in which the file has been parsed.
* @param location the IIndexFileLocation representing the location of the file
- * @param macroDictionary The names and definitions of the macros used to disambiguate between
+ * @param significantMacros The names and definitions of the macros used to disambiguate between
* variants of the file contents corresponding to different inclusion points.
* @return the file for the location, or {@code null} if the file is not present in
* the index
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/IContentAssistMatcher.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/IContentAssistMatcher.java
index 9833d1623bb..5b671489a8b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/IContentAssistMatcher.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/IContentAssistMatcher.java
@@ -36,9 +36,9 @@ public interface IContentAssistMatcher {
char[] getPrefixForBinarySearch();
/**
- * @return If false, calling @{@link #match(char[])} can be skipped if a
+ * @return If false, calling {@link #match(char[])} can be skipped if a
* name survived a binary search using the prefix returned by
- * @{@link #getPrefixForBinarySearch()} as key.
+ * {@link #getPrefixForBinarySearch()} as key.
*/
boolean matchRequiredAfterBinarySearch();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/SegmentMatcher.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/SegmentMatcher.java
index 7e88ce1882d..557c25cb6eb 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/SegmentMatcher.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/SegmentMatcher.java
@@ -229,9 +229,9 @@ public class SegmentMatcher {
}
/**
- * @return If false, calling @{@link #match(char[])} can be skipped if a
+ * @return If false, calling {@link #match(char[])} can be skipped if a
* name survived a binary search using the prefix returned by
- * @{@link #getPrefixForBinarySearch()} as key.
+ * {@link #getPrefixForBinarySearch()} as key.
*/
public boolean matchRequiredAfterBinarySearch() {
return !singleSegment;
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/IAddress.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/IAddress.java
index ef031946df6..a9247815c24 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/IAddress.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/IAddress.java
@@ -65,7 +65,7 @@ public interface IAddress extends Comparable