diff --git a/WHATSNEW b/WHATSNEW
index c670043c7..6fb87ff7a 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -51,8 +51,8 @@ Other changes:
 
  * simplifying Execute.getEnvironmentVariables since we are only running on Java 1.5 or higher now
 
- * Add conditional attributes
-   Bugzilla report 43362
+ * Added conditional attributes.
+   Bugzilla Report 43362
 
  * Recommending to upgrade jsch to 0.1.50, particularly if you are using Java 1.7.
    jsch is the library behind the sshexec and scp Ant tasks.
diff --git a/manual/Types/namespace.html b/manual/Types/namespace.html
index feacc8a03..3adfa80ce 100644
--- a/manual/Types/namespace.html
+++ b/manual/Types/namespace.html
@@ -152,8 +152,8 @@
       </li>
     </ul>
     <p>
-      In Ant 1.9.1 two attribute namespaces ant:if and ant:unless are added in order to allow to insert elements
-      conditionally
+      In Ant 1.9.1 two attribute namespaces <code>ant:if</code> and <code>ant:unless</code> were added
+      to allow you to insert elements conditionally.
     </p>
     <p>
       Other attributes are simply ignored.
diff --git a/src/main/org/apache/tools/ant/DefaultDefinitions.java b/src/main/org/apache/tools/ant/DefaultDefinitions.java
index 0de0e1a27..062018d02 100644
--- a/src/main/org/apache/tools/ant/DefaultDefinitions.java
+++ b/src/main/org/apache/tools/ant/DefaultDefinitions.java
@@ -20,6 +20,7 @@ package org.apache.tools.ant;
 
 /**
  * Default definitions.
+ * @since Ant 1.9.1
  */
 public final class DefaultDefinitions {
     private static final String IF_NAMESPACE = "ant:if";
@@ -37,7 +38,7 @@ public final class DefaultDefinitions {
     }
 
     /**
-     * Register the defintions.
+     * Register the definitions.
      */
     public void execute() {
         attributeNamespaceDef(IF_NAMESPACE);
diff --git a/src/main/org/apache/tools/ant/MagicNames.java b/src/main/org/apache/tools/ant/MagicNames.java
index 2871269cd..01668b11b 100644
--- a/src/main/org/apache/tools/ant/MagicNames.java
+++ b/src/main/org/apache/tools/ant/MagicNames.java
@@ -276,9 +276,11 @@ public final class MagicNames {
      * @since Ant 1.9.0
      */
     public static final String ANT_VM_LAUNCHER_REF_ID = "ant.vmLauncher";
-    /** Name of the namespace "type" (note: cannot be used as an element)
-     *  @since  Ant 1.9.1
-     * */
+    /**
+     * Name of the namespace "type".
+     * (Note: cannot be used as an element.)
+     * @since Ant 1.9.1
+     */
     public static final String ATTRIBUTE_NAMESPACE = "attribute namespace";
 }
 
diff --git a/src/main/org/apache/tools/ant/RuntimeConfigurable.java b/src/main/org/apache/tools/ant/RuntimeConfigurable.java
index 44e32edc2..5ab6b6d8c 100644
--- a/src/main/org/apache/tools/ant/RuntimeConfigurable.java
+++ b/src/main/org/apache/tools/ant/RuntimeConfigurable.java
@@ -132,6 +132,7 @@ public class RuntimeConfigurable implements Serializable {
      * @param owner the UE that owns this RC.
      * @return true if enabled, false if any of the ant attribures return
      *              false.
+     * @since 1.9.1
      */
     public boolean isEnabled(UnknownElement owner) {
         if (!namespacedAttribute) {
diff --git a/src/main/org/apache/tools/ant/attribute/AttributeNamespace.java b/src/main/org/apache/tools/ant/attribute/AttributeNamespace.java
index 60cb62aca..fba4c9920 100644
--- a/src/main/org/apache/tools/ant/attribute/AttributeNamespace.java
+++ b/src/main/org/apache/tools/ant/attribute/AttributeNamespace.java
@@ -19,8 +19,10 @@
 package org.apache.tools.ant.attribute;
 
 /**
- * This class is used to indicate that the xml namespace (uri)
+ * This class is used to indicate that the XML namespace (URI)
  * can be used to look for namespace attributes.
+ * @see org.apache.tools.ant.taskdefs.AttributeNamespaceDef
+ * @since Ant 1.9.1
  */
 public final class AttributeNamespace {
 }
diff --git a/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java b/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java
index df119bf73..c2ec08ab4 100644
--- a/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java
+++ b/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java
@@ -31,6 +31,7 @@ import org.apache.tools.ant.UnknownElement;
  * An abstract class for if/unless attributes.
  * This contains a boolean flag to specify whether this is an
  * if or unless attribute.
+ * @since Ant 1.9.1
  */
 public abstract class BaseIfAttribute
     extends ProjectComponent implements EnableAttribute {
diff --git a/src/main/org/apache/tools/ant/attribute/EnableAttribute.java b/src/main/org/apache/tools/ant/attribute/EnableAttribute.java
index d2f67fcb4..06c1186f7 100644
--- a/src/main/org/apache/tools/ant/attribute/EnableAttribute.java
+++ b/src/main/org/apache/tools/ant/attribute/EnableAttribute.java
@@ -21,7 +21,8 @@ package org.apache.tools.ant.attribute;
 import org.apache.tools.ant.UnknownElement;
 
 /**
- * This interface is used by ant attributes.
+ * This interface is used by Ant attributes.
+ * @since Ant 1.9.1
  */
 public interface EnableAttribute {
     /**
diff --git a/src/main/org/apache/tools/ant/attribute/IfBlankAttribute.java b/src/main/org/apache/tools/ant/attribute/IfBlankAttribute.java
index d0ff19c5a..384476c8d 100644
--- a/src/main/org/apache/tools/ant/attribute/IfBlankAttribute.java
+++ b/src/main/org/apache/tools/ant/attribute/IfBlankAttribute.java
@@ -22,6 +22,7 @@ import org.apache.tools.ant.UnknownElement;
 
 /**
  * Check if an attribute is blank or not.
+ * @since Ant 1.9.1
  */
 public class IfBlankAttribute extends BaseIfAttribute {
     /** The unless version */
diff --git a/src/main/org/apache/tools/ant/attribute/IfSetAttribute.java b/src/main/org/apache/tools/ant/attribute/IfSetAttribute.java
index 3502793a0..d4531c59d 100644
--- a/src/main/org/apache/tools/ant/attribute/IfSetAttribute.java
+++ b/src/main/org/apache/tools/ant/attribute/IfSetAttribute.java
@@ -22,6 +22,7 @@ import org.apache.tools.ant.UnknownElement;
 
 /**
  * Check if an attribute value as a property is set or not
+ * @since Ant 1.9.1
  */
 public class IfSetAttribute extends BaseIfAttribute {
     /** The unless version */
diff --git a/src/main/org/apache/tools/ant/attribute/IfTrueAttribute.java b/src/main/org/apache/tools/ant/attribute/IfTrueAttribute.java
index 43bc8944c..5c10ea2f2 100644
--- a/src/main/org/apache/tools/ant/attribute/IfTrueAttribute.java
+++ b/src/main/org/apache/tools/ant/attribute/IfTrueAttribute.java
@@ -23,6 +23,7 @@ import org.apache.tools.ant.UnknownElement;
 
 /**
  * Check if an attribute value is true or not.
+ * @since Ant 1.9.1
  */
 public class IfTrueAttribute extends BaseIfAttribute {
     /** The unless version */
diff --git a/src/main/org/apache/tools/ant/taskdefs/AttributeNamespaceDef.java b/src/main/org/apache/tools/ant/taskdefs/AttributeNamespaceDef.java
index ce49d412f..7ac233f49 100644
--- a/src/main/org/apache/tools/ant/taskdefs/AttributeNamespaceDef.java
+++ b/src/main/org/apache/tools/ant/taskdefs/AttributeNamespaceDef.java
@@ -24,16 +24,16 @@ import org.apache.tools.ant.AntTypeDefinition;
 import org.apache.tools.ant.attribute.AttributeNamespace;
 
 /**
- * Defintion to allow the uri to be considered for
- * ant attributes.
+ * Definition to allow the URI to be considered for
+ * Ant attributes.
  *
- * @since Ant 1.8.0
+ * @since Ant 1.9.1
  */
 public final class AttributeNamespaceDef  extends AntlibDefinition {
 
     /**
      * Run the definition.
-     * This registers the xml namespace (uri) as a namepace for
+     * This registers the XML namespace (URI) as a namepace for
      * attributes.
      */
     public void execute() {