diff --git a/CHANGES.txt b/CHANGES.txt
index a0cf21f8027..c398e1b0564 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -258,6 +258,7 @@ Release 0.21.0 - Unreleased
    HBASE-2062  Metrics documentation outdated (Lars George via JD)
    HBASE-2045  Update trunk and branch zk to just-release 3.2.2.
    HBASE-2074  Improvements to the hadoop-config script (Bassam Tabbara via Stack)
+   HBASE-2076  Many javadoc warnings
 
   NEW FEATURES
    HBASE-1901  "General" partitioner for "hbase-48" bulk (behind the api, write
diff --git a/src/java/org/apache/hadoop/hbase/client/Scan.java b/src/java/org/apache/hadoop/hbase/client/Scan.java
index e1b94a525ae..e4ba4ed41c3 100644
--- a/src/java/org/apache/hadoop/hbase/client/Scan.java
+++ b/src/java/org/apache/hadoop/hbase/client/Scan.java
@@ -186,8 +186,8 @@ public class Scan implements Writable {
    * @param minStamp minimum timestamp value, inclusive
    * @param maxStamp maximum timestamp value, exclusive
    * @throws IOException if invalid time range
-   * @see {@link #setMaxVersions()}
-   * @see {@link #setMaxVersions(int)}
+   * @see #setMaxVersions()
+   * @see #setMaxVersions(int)
    */
   public Scan setTimeRange(long minStamp, long maxStamp)
   throws IOException {
@@ -201,8 +201,8 @@ public class Scan implements Writable {
    * and you want all versions returned, up the number of versions beyond the
    * defaut.
    * @param timestamp version timestamp
-   * @see {@link #setMaxVersions()}
-   * @see {@link #setMaxVersions(int)}
+   * @see #setMaxVersions()
+   * @see #setMaxVersions(int)
    */
   public Scan setTimeStamp(long timestamp) {
     try {
diff --git a/src/java/org/apache/hadoop/hbase/mapreduce/MultiTableOutputFormat.java b/src/java/org/apache/hadoop/hbase/mapreduce/MultiTableOutputFormat.java
index 75794820b0b..effa0a602c3 100644
--- a/src/java/org/apache/hadoop/hbase/mapreduce/MultiTableOutputFormat.java
+++ b/src/java/org/apache/hadoop/hbase/mapreduce/MultiTableOutputFormat.java
@@ -54,10 +54,6 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext;
  * loss of data due to region server failure can be tolerated (for example,
  * because it is easy to rerun a bulk import).
  * </p>
- * 
- * <p>
- * See also the {@link IndexBuilder} example.
- * </p>
  */
 public class MultiTableOutputFormat extends OutputFormat<ImmutableBytesWritable, Writable> {
   /** Set this to {@link #WAL_OFF} to turn off write-ahead logging (HLog) */
diff --git a/src/java/org/apache/hadoop/hbase/mapreduce/package-info.java b/src/java/org/apache/hadoop/hbase/mapreduce/package-info.java
index 1cfda39573d..ef4e64d106e 100644
--- a/src/java/org/apache/hadoop/hbase/mapreduce/package-info.java
+++ b/src/java/org/apache/hadoop/hbase/mapreduce/package-info.java
@@ -138,12 +138,13 @@ To achieve total ordering, you will likely need to write a Partitioner
 that is intimate with your tables key namespace and that knows how
 to distribute keys among the reducers so a total order is maintained.  If your
 keys are distributed with some regularity across a defined key space -- i.e.
-you know the start and end keys -- then the {@link SimpleTotalOrderPartitioner} 
+you know the start and end keys -- then the
+ {@link org.apache.hadoop.hbase.mapreduce.SimpleTotalOrderPartitioner} 
 may be all you need.
 </p>
 <p>See org.apache.hadoop.hbase.mapreduce.TestHFileOutputFormat for an example
 that puts together {@link org.apache.hadoop.hbase.mapreduce.KeyValueSortReducer},
-{@link SimpleTotalOrderPartitioner}, and
+{@link org.apache.hadoop.hbase.mapreduce.SimpleTotalOrderPartitioner}, and
 {@link org.apache.hadoop.hbase.mapreduce.HFileOutputFormat}.</p>
 
 <p>HFileOutputFormat writes HFiles.  When your MapReduce file finishes, in your
diff --git a/src/java/org/apache/hadoop/hbase/regionserver/InternalScanner.java b/src/java/org/apache/hadoop/hbase/regionserver/InternalScanner.java
index e66ef60059a..d58a8a37c2d 100644
--- a/src/java/org/apache/hadoop/hbase/regionserver/InternalScanner.java
+++ b/src/java/org/apache/hadoop/hbase/regionserver/InternalScanner.java
@@ -51,7 +51,7 @@ public interface InternalScanner extends Closeable {
   /**
    * Grab the next row's worth of values with a limit on the number of values
    * to return. 
-   * @param results
+   * @param result
    * @param limit
    * @return true if more rows exist after this one, false if scanner is done
    * @throws IOException
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 9ea5bb7e50b..e868c3f4aab 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.conf.Configuration)}.
+ * org.apache.hadoop.fs.Path, org.apache.hadoop.hbase.HBaseConfiguration)}.
  *
  */
 public class HLog implements HConstants, Syncable {
@@ -352,8 +352,7 @@ public class HLog implements HConstants, Syncable {
    * Get a reader for the WAL.
    * @param fs
    * @param path
-   * @param keyClass
-   * @param valueClass
+   * @param conf
    * @return A WAL reader.  Close when done with it.
    * @throws IOException
    */
@@ -377,8 +376,7 @@ public class HLog implements HConstants, Syncable {
   /**
    * Get a writer for the WAL.
    * @param path
-   * @param keyClass
-   * @param valueClass
+   * @param conf
    * @return A WAL writer.  Close when done with it.
    * @throws IOException
    */