diff --git a/base/src/main/java/org/apache/commons/chain2/impl/ChainBase.java b/base/src/main/java/org/apache/commons/chain2/impl/ChainBase.java
index 77baf61..6af47a4 100644
--- a/base/src/main/java/org/apache/commons/chain2/impl/ChainBase.java
+++ b/base/src/main/java/org/apache/commons/chain2/impl/ChainBase.java
@@ -116,7 +116,7 @@
     // ---------------------------------------------------------- Chain Methods
 
     /**
-     * See the {@link Chain} JavaDoc.
+     * See the {@link Chain} Javadoc.
      *
      * @param <CMD> the {@link Command} type to be added in the {@link Chain}
      * @param command The {@link Command} to be added
@@ -136,7 +136,7 @@
     }
 
     /**
-     * See the {@link Chain} JavaDoc.
+     * See the {@link Chain} Javadoc.
      *
      * @param context The {@link Context} to be processed by this
      *  {@link Chain}
diff --git a/sdocbook/chapter-chain.xml b/sdocbook/chapter-chain.xml
index d0e0d3b..e7303b2 100644
--- a/sdocbook/chapter-chain.xml
+++ b/sdocbook/chapter-chain.xml
@@ -808,7 +808,7 @@
 
     <para>The default attribute name can be changed, if needed, You can also
     configure ChainListener to read files from a system path or from a JAR.
-    See the JavaDoc for all the configuration details. There is also a
+    See the Javadoc for all the configuration details. There is also a
     <classname>ChainServlet</classname> if you are using the Servlet 2.2
     platform.</para>
 
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 83ef2b8..c58a5bf 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -168,7 +168,7 @@
          PathInfoMapper command can not obtain the current catalog instance.
       </action>
       <action dev="niallp" type="fix" issue="CHAIN-34" due-to="Mark Vedder">
-         Unbalanced tags in JavaDoc for ContextBase class.
+         Unbalanced tags in Javadoc for ContextBase class.
       </action>
       <action dev="niallp" type="fix" issue="CHAIN-33">
          Upgrade to Commons Digester 1.8 to fix bug loading webapp resources.
@@ -269,7 +269,7 @@
          build.properties.sample should add commons-logging.
       </action>
       <action dev="husted" type="update" issue="CHAIN-22" due-to="Matthew Sgarlata">
-         Added JavaDoc and a toString() method to CatalogBase.
+         Added Javadoc and a toString() method to CatalogBase.
       </action>
     </release>
   </body>
diff --git a/src/site/xdoc/cookbook.xml b/src/site/xdoc/cookbook.xml
index 6b103a4..2e4766e 100644
--- a/src/site/xdoc/cookbook.xml
+++ b/src/site/xdoc/cookbook.xml
@@ -807,7 +807,7 @@
       </example></p>
 
     <p>You can also configure ChainListener to read files from a system path
-    or from a JAR. See the JavaDoc for all the configuration details. There
+    or from a JAR. See the Javadoc for all the configuration details. There
     is also a <code>ChainServlet</code> if you are using the Servlet 2.2
     platform.</p>