diff --git a/src/main/docbkx/book.xml b/src/main/docbkx/book.xml
index ed26c1beb80..b0273b2be1e 100644
--- a/src/main/docbkx/book.xml
+++ b/src/main/docbkx/book.xml
@@ -1271,15 +1271,6 @@ connection.close();</programlisting>
            <para>Information on non-Java clients and custom protocols is covered in <xref linkend="external_apis" />
            </para>
 		</section>
-	   <section xml:id="client.rowlocks"><title>RowLocks</title>
-           <para><link xlink:href="http://hbase.apache.org/apidocs/org/apache/hadoop/hbase/client/HTable.html#lockRow%28byte[]%29">RowLocks</link> are still
-           in the client API <emphasis>however</emphasis> they are discouraged because if not managed properly these can
-           lock up the RegionServers.
-           </para>
-           <para>There is an oustanding ticket <link xlink:href="https://issues.apache.org/jira/browse/HBASE-2332">HBASE-2332</link> to
-           remove this feature from the client.
-           </para>
-		</section>
 	</section>
 
     <section xml:id="client.filter"><title>Client Request Filters</title>
diff --git a/src/main/docbkx/troubleshooting.xml b/src/main/docbkx/troubleshooting.xml
index 40f23d124f5..7aebedaa99b 100644
--- a/src/main/docbkx/troubleshooting.xml
+++ b/src/main/docbkx/troubleshooting.xml
@@ -851,9 +851,6 @@ java.lang.UnsatisfiedLinkError: no gplcompression in java.library.path
             Adding <code>-XX:+UseMembar</code> to the HBase <varname>HBASE_OPTS</varname> in <filename>conf/hbase-env.sh</filename>
             may fix it.
             </para>
-            <para>Also, are you using <xref linkend="client.rowlocks"/>?  These are discouraged because they can lock up the
-            RegionServers if not managed properly.
-            </para>
         </section>
         <section xml:id="trouble.rs.runtime.filehandles">
            <title>java.io.IOException...(Too many open files)</title>