diff --git a/CHANGES.txt b/CHANGES.txt
index 67063169491..2c0368a172e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -171,6 +171,8 @@ Release 0.21.0 - Unreleased
    HBASE-2134  Ivy nit regarding checking with latest snapshots (Kay Kay via
                Andrew Purtell)
    HBASE-2138  unknown metrics type (Stack via JD)
+   HBASE-2137  javadoc warnings from 'javadoc' target (Kay Kay via Stack)
+   HBASE-2135  ant javadoc complains about missing classe (Kay Kay via Stack)
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable
diff --git a/src/java/org/apache/hadoop/hbase/mapreduce/IndexConfiguration.java b/src/java/org/apache/hadoop/hbase/mapreduce/IndexConfiguration.java
index 900be2ff857..8dbabdc77d2 100644
--- a/src/java/org/apache/hadoop/hbase/mapreduce/IndexConfiguration.java
+++ b/src/java/org/apache/hadoop/hbase/mapreduce/IndexConfiguration.java
@@ -142,9 +142,9 @@ public class IndexConfiguration extends Configuration {
 
   /**
    * @deprecated 
-   * @see Use #isAnalyze(String) for replacement.
+   * See {@link #isAnalyze(String)} for replacement.
    * @param columnName
-   * @return
+   * @return true, if column needs to be tokenized
    */
   public boolean isTokenize(String columnName) {
     return getColumn(columnName).getBoolean(HBASE_COLUMN_TOKENIZE, true);
@@ -152,7 +152,7 @@ public class IndexConfiguration extends Configuration {
 
   /**
    * @deprecated
-   * @see Use #setAnalyze(String, boolean) for replacement.
+   * See {@link #setAnalyze(String, boolean)} for replacement.
    * @param columnName
    * @param tokenize
    */
diff --git a/src/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java b/src/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
index 99cf3732bae..9a9989aca9d 100644
--- a/src/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
+++ b/src/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
@@ -98,7 +98,7 @@ import org.apache.hadoop.hbase.util.Threads;
  * separate reentrant lock is used.
  * 
  * <p>To read an HLog, call {@link #getReader(org.apache.hadoop.fs.FileSystem,
- * org.apache.hadoop.fs.Path, org.apache.hadoop.hbase.HBaseConfiguration)}.
+ * org.apache.hadoop.fs.Path, org.apache.hadoop.conf.Configuration)}.
  *
  */
 public class HLog implements HConstants, Syncable {