diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java
index f829dd45acc..425a5b942cf 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java
@@ -83,7 +83,7 @@ import com.google.protobuf.InvalidProtocolBufferException;
  * group,family,qualifier   column qualifier level permissions for a group
  * </pre>
  * All values are encoded as byte arrays containing the codes from the
- * {@link org.apache.hadoop.hbase.security.access.TablePermission.Action} enum.
+ * org.apache.hadoop.hbase.security.access.TablePermission.Action enum.
  * </p>
  */
 public class AccessControlLists {
@@ -320,7 +320,7 @@ public class AccessControlLists {
 
     Map<byte[],ListMultimap<String,TablePermission>> allPerms =
         new TreeMap<byte[],ListMultimap<String,TablePermission>>(Bytes.BYTES_COMPARATOR);
-    
+
     // do a full scan of _acl_ table
 
     Scan scan = new Scan();
diff --git a/hbase-server/src/main/javadoc/org/apache/hadoop/hbase/thrift/package.html b/hbase-server/src/main/javadoc/org/apache/hadoop/hbase/thrift/package.html
index 19ea8e8a59c..e4b4d406252 100644
--- a/hbase-server/src/main/javadoc/org/apache/hadoop/hbase/thrift/package.html
+++ b/hbase-server/src/main/javadoc/org/apache/hadoop/hbase/thrift/package.html
@@ -42,12 +42,12 @@ takes command and drives this package out of existence replacing it w/ an Interf
 better matches the hbase API (this package was modelled on old HBase API long since dropped).
 </p>
 
-<p>The {@link org.apache.hadoop.hbase.thrift.generated.Hbase.Iface HBase API} is defined in the
+<p>The org.apache.hadoop.hbase.thrift.generated.Hbase.Iface HBase API is defined in the
 file <a href="doc-files/index.html">Hbase.thrift</a> (Click the former to see the
 thrift generated documentation of thrift interface). A server-side implementation of the API is in
 {@link org.apache.hadoop.hbase.thrift.ThriftServer}. The generated interfaces,
 types, and RPC utility files reside in the
-{@link org.apache.hadoop.hbase.thrift.generated} package.
+org.apache.hadoop.hbase.thrift.generated package.
 </p>
 
 <p>To start ThriftServer, use: