diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index 24c276baff6..c4d52d5e42a 100644
--- a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -1350,7 +1350,7 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
 
   /**
    * Return a reference to the metrics instance used for counting RPC calls.
-   * @return
+   * @return Metrics instance.
    */
   public HBaseRpcMetrics getRpcMetrics() {
     return server.getRpcMetrics();
diff --git a/src/main/java/org/apache/hadoop/hbase/security/User.java b/src/main/java/org/apache/hadoop/hbase/security/User.java
index 90dc28c405c..8002c89516d 100644
--- a/src/main/java/org/apache/hadoop/hbase/security/User.java
+++ b/src/main/java/org/apache/hadoop/hbase/security/User.java
@@ -125,7 +125,7 @@ public abstract class User {
    *
    * <p><strong>This is only applicable when
    * running on secure Hadoop</strong> -- see
-   * {@link org.apache.hadoop.security.SecurityUtil#login(Configuration,String,String,String)}.
+   * org.apache.hadoop.security.SecurityUtil#login(Configuration,String,String,String).
    * On regular Hadoop (without security features), this will safely be ignored.
    * </p>
    *
diff --git a/src/main/xslt/configuration_to_docbook_section.xsl b/src/main/xslt/configuration_to_docbook_section.xsl
index ad7143dfe45..95f7fd5d8c3 100644
--- a/src/main/xslt/configuration_to_docbook_section.xsl
+++ b/src/main/xslt/configuration_to_docbook_section.xsl
@@ -40,7 +40,7 @@ version="5.0" xmlns="http://docbook.org/ns/docbook"
 <glossary xmlns='http://docbook.org/ns/docbook' xml:id="hbase.default.configuration">
 <title>HBase Default Configuration</title>
 <para>
-This documentation is generated using the default hbase configuration file,
+The documentation below is generated using the default hbase configuration file,
 <filename>hbase-default.xml</filename>, as source.
 </para>