diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFileLocation.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFileLocation.java
index ef76745892c..440be3149c3 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFileLocation.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFileLocation.java
@@ -37,25 +37,25 @@ public interface IASTFileLocation extends IASTNodeLocation {
 	public int getNodeLength();
 
     /**
-     * Get the starting line number. Locations obtained via the index do not have line numbers
-     * and return <code>0</code>.
+     * Returns the starting line number. Locations obtained via the index do not have line numbers
+     * and return {@code 0}.
      * 
-     * @return int representing line number or <code>0</code> if not applicable
+     * @return the 1-based line number, or {@code 0} if not applicable
      */
     public int getStartingLineNumber();
     
     /**
-     * Get the ending line number. Locations obtained via the index do not have line numbers
-     * and return <code>0</code>.
+     * Returns the ending line number. Locations obtained via the index do not have line numbers
+     * and return {@code 0}.
      * 
-     * @return int representing line number or <code>0</code> if not applicable
+     * @return the 1-based line number, or {@code 0} if not applicable
      */
     public int getEndingLineNumber();
 
 	/**
 	 * Returns the inclusion statement that included this file, or <code>null</code> for
 	 * a top-level file.
-	 * Also <code>null</code> when the file location does not belong to an AST node, e.g.
+	 * Also {@code null} when the file location does not belong to an AST node, e.g.
 	 * if it is obtained from a name in the index.
 	 * @since 5.4
 	 */
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTForStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTForStatement.java
index e6bcf447a89..c0020387e7a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTForStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTForStatement.java
@@ -11,8 +11,8 @@
 package org.eclipse.cdt.core.dom.ast;
 
 /**
- * The for statement. The initialization clause can be an expression or a
- * declaration but not both.
+ * The 'for' statement. The initialization clause can be an expression
+ * or a declaration but not both.
  * 
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
@@ -57,8 +57,7 @@ public interface IASTForStatement extends IASTStatement {
      * @param statement
      */
     public void setInitializerStatement( IASTStatement statement );
-    
-    
+
 	/**
 	 * Get the condition expression for the loop.
 	 * 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTIdExpression.java
index 9d7934fc4aa..de2a6c26ad4 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTIdExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTIdExpression.java
@@ -32,7 +32,7 @@ public interface IASTIdExpression extends IASTExpression, IASTNameOwner {
 	public IASTName getName();
 
 	/**
-	 * Set the name to be used inthe expression.
+	 * Sets the name to be used in the expression.
 	 * 
 	 * @param name
 	 */
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTForStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTForStatement.java
index ae47d0d8b67..1b81285abbc 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTForStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTForStatement.java
@@ -15,14 +15,16 @@ import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
 import org.eclipse.cdt.core.dom.ast.IASTForStatement;
 
 /**
- * 
+ * The C++ 'for' statement.
+ *
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ICPPASTForStatement extends IASTForStatement {
-    
-    public static final ASTNodeProperty CONDITION_DECLARATION = new ASTNodeProperty( "org.eclipse.cdt.core.dom.ast.cpp.ICPPASTForStatement"); //$NON-NLS-1$
-    public void setConditionDeclaration( IASTDeclaration d );
+    public static final ASTNodeProperty CONDITION_DECLARATION =
+    		new ASTNodeProperty("org.eclipse.cdt.core.dom.ast.cpp.ICPPASTForStatement"); //$NON-NLS-1$
+
+    public void setConditionDeclaration(IASTDeclaration d);
     public IASTDeclaration getConditionDeclaration();
 
     /**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPEnumeration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPEnumeration.java
index 22225a116aa..b3bff980948 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPEnumeration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPEnumeration.java
@@ -28,7 +28,7 @@ public interface ICPPEnumeration extends IEnumeration, ICPPBinding {
     boolean isScoped();
     
     /**
-     * Returns the underlying type of the enumeration if it is fixed, or <code>null</code> otherwise.
+     * Returns the underlying type of the enumeration if it is fixed, or {@code null} otherwise.
      * The underlying type can only be fixed in C++.
      */
     IType getFixedType();