http://git-wip-us.apache.org/repos/asf/hbase-site/blob/0d22bc0c/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockType.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockType.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockType.html
index 4bc6e8f..a5ec80c 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockType.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockType.html
@@ -120,11 +120,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
-<td class="colLast"><span 
class="strong">HFileBlockEncodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">HFileBlockDefaultEncodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
-<td class="colLast"><span 
class="strong">HFileBlockDefaultEncodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">HFileBlockEncodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -137,13 +137,13 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">HFileBlockEncodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html#postEncoding(org.apache.hadoop.hbase.io.hfile.BlockType)">postEncoding</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in 
org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;blockType)</code>
-<div class="block">Do any action that needs to be performed after the 
encoding.</div>
-</td>
+<td class="colLast"><span 
class="strong">HFileBlockDefaultEncodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.html#postEncoding(org.apache.hadoop.hbase.io.hfile.BlockType)">postEncoding</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in 
org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;blockType)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">HFileBlockDefaultEncodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.html#postEncoding(org.apache.hadoop.hbase.io.hfile.BlockType)">postEncoding</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in 
org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;blockType)</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">HFileBlockEncodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html#postEncoding(org.apache.hadoop.hbase.io.hfile.BlockType)">postEncoding</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in 
org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;blockType)</code>
+<div class="block">Do any action that needs to be performed after the 
encoding.</div>
+</td>
 </tr>
 </tbody>
 </table>
@@ -186,15 +186,15 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
-<td class="colLast"><span class="strong">CachedBlock.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CachedBlock.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">BlockCacheKey.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
-<td class="colLast"><span class="strong">BlockCacheKey.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">Cacheable.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
-<td class="colLast"><span class="strong">Cacheable.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">CachedBlock.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CachedBlock.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
@@ -208,7 +208,9 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
-<td class="colLast"><span 
class="strong">HFileBlockIndex.BlockIndexWriter.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexWriter.html#getInlineBlockType()">getInlineBlockType</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">InlineBlockWriter.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InlineBlockWriter.html#getInlineBlockType()">getInlineBlockType</a></strong>()</code>
+<div class="block">The type of blocks this block writer produces.</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
@@ -216,9 +218,7 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
-<td class="colLast"><span 
class="strong">InlineBlockWriter.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InlineBlockWriter.html#getInlineBlockType()">getInlineBlockType</a></strong>()</code>
-<div class="block">The type of blocks this block writer produces.</div>
-</td>
+<td class="colLast"><span 
class="strong">HFileBlockIndex.BlockIndexWriter.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexWriter.html#getInlineBlockType()">getInlineBlockType</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
@@ -276,26 +276,26 @@ the order they are declared.</div>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">HFileDataBlockEncoderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoderImpl.html#endBlockEncoding(org.apache.hadoop.hbase.io.encoding.HFileBlockEncodingContext,%20java.io.DataOutputStream,%20byte[],%20org.apache.hadoop.hbase.io.hfile.BlockType)">endBlockEncoding</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html"
 title="interface in 
org.apache.hadoop.hbase.io.encoding">HFileBlockEncodingContext</a>&nbsp;encodingCtx,
+<td class="colLast"><span 
class="strong">NoOpDataBlockEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/NoOpDataBlockEncoder.html#endBlockEncoding(org.apache.hadoop.hbase.io.encoding.HFileBlockEncodingContext,%20java.io.DataOutputStream,%20byte[],%20org.apache.hadoop.hbase.io.hfile.BlockType)">endBlockEncoding</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html"
 title="interface in 
org.apache.hadoop.hbase.io.encoding">HFileBlockEncodingContext</a>&nbsp;encodingCtx,
                                 <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataOutputStream.html?is-external=true";
 title="class or interface in java.io">DataOutputStream</a>&nbsp;out,
                                 byte[]&nbsp;uncompressedBytesWithHeader,
                                 <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in 
org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;blockType)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">NoOpDataBlockEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/NoOpDataBlockEncoder.html#endBlockEncoding(org.apache.hadoop.hbase.io.encoding.HFileBlockEncodingContext,%20java.io.DataOutputStream,%20byte[],%20org.apache.hadoop.hbase.io.hfile.BlockType)">endBlockEncoding</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html"
 title="interface in 
org.apache.hadoop.hbase.io.encoding">HFileBlockEncodingContext</a>&nbsp;encodingCtx,
+<td class="colLast"><span 
class="strong">HFileDataBlockEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoder.html#endBlockEncoding(org.apache.hadoop.hbase.io.encoding.HFileBlockEncodingContext,%20java.io.DataOutputStream,%20byte[],%20org.apache.hadoop.hbase.io.hfile.BlockType)">endBlockEncoding</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html"
 title="interface in 
org.apache.hadoop.hbase.io.encoding">HFileBlockEncodingContext</a>&nbsp;encodingCtx,
                                 <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataOutputStream.html?is-external=true";
 title="class or interface in java.io">DataOutputStream</a>&nbsp;out,
                                 byte[]&nbsp;uncompressedBytesWithHeader,
-                                <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in 
org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;blockType)</code>&nbsp;</td>
+                                <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in 
org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;blockType)</code>
+<div class="block">Ends encoding for a block of KeyValues.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">HFileDataBlockEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoder.html#endBlockEncoding(org.apache.hadoop.hbase.io.encoding.HFileBlockEncodingContext,%20java.io.DataOutputStream,%20byte[],%20org.apache.hadoop.hbase.io.hfile.BlockType)">endBlockEncoding</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html"
 title="interface in 
org.apache.hadoop.hbase.io.encoding">HFileBlockEncodingContext</a>&nbsp;encodingCtx,
+<td class="colLast"><span 
class="strong">HFileDataBlockEncoderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoderImpl.html#endBlockEncoding(org.apache.hadoop.hbase.io.encoding.HFileBlockEncodingContext,%20java.io.DataOutputStream,%20byte[],%20org.apache.hadoop.hbase.io.hfile.BlockType)">endBlockEncoding</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html"
 title="interface in 
org.apache.hadoop.hbase.io.encoding">HFileBlockEncodingContext</a>&nbsp;encodingCtx,
                                 <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataOutputStream.html?is-external=true";
 title="class or interface in java.io">DataOutputStream</a>&nbsp;out,
                                 byte[]&nbsp;uncompressedBytesWithHeader,
-                                <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in 
org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;blockType)</code>
-<div class="block">Ends encoding for a block of KeyValues.</div>
-</td>
+                                <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in 
org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;blockType)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInput.html?is-external=true";
 title="class or interface in java.io">DataInput</a></code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/0d22bc0c/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheConfig.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheConfig.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheConfig.html
index 58f8c31..17f16ad 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheConfig.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheConfig.html
@@ -231,23 +231,23 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span 
class="strong">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#cacheConf">cacheConf</a></strong></code>
-<div class="block">Block cache configuration.</div>
-</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>protected <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
 <td class="colLast"><span 
class="strong">HFileWriterImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileWriterImpl.html#cacheConf">cacheConf</a></strong></code>
 <div class="block">Cache configuration for caching data on write.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
 <td class="colLast"><span 
class="strong">HFileBlockIndex.BlockIndexWriter.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexWriter.html#cacheConf">cacheConf</a></strong></code>
 <div class="block">CacheConfig, or null if cache-on-write is disabled</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
+<td class="colLast"><span 
class="strong">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#cacheConf">cacheConf</a></strong></code>
+<div class="block">Block cache configuration.</div>
+</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>protected <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
 <td class="colLast"><span 
class="strong">HFile.WriterFactory.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.WriterFactory.html#cacheConf">cacheConf</a></strong></code>&nbsp;</td>
@@ -534,7 +534,7 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span class="strong">SweepJob.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/mapreduce/SweepJob.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">MemStoreWrapper.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/mapreduce/MemStoreWrapper.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
@@ -542,7 +542,7 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span 
class="strong">MemStoreWrapper.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/mapreduce/MemStoreWrapper.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
+<td class="colLast"><span class="strong">SweepJob.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/mapreduce/SweepJob.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -575,13 +575,13 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>protected <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span class="strong">HStore.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#cacheConf">cacheConf</a></strong></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
 <td class="colLast"><span class="strong">StoreFile.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html#cacheConf">cacheConf</a></strong></code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
+<td class="colLast"><span class="strong">HStore.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#cacheConf">cacheConf</a></strong></code>&nbsp;</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
 <td class="colLast"><span 
class="strong">StoreFileWriter.Builder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileWriter.Builder.html#cacheConf">cacheConf</a></strong></code>&nbsp;</td>
@@ -609,13 +609,13 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span class="strong">Store.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getCacheConfig()">getCacheConfig</a></strong>()</code>
-<div class="block">Used for tests.</div>
-</td>
+<td class="colLast"><span class="strong">HRegionServer.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html#getCacheConfig()">getCacheConfig</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span class="strong">HRegionServer.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html#getCacheConfig()">getCacheConfig</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">Store.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getCacheConfig()">getCacheConfig</a></strong>()</code>
+<div class="block">Used for tests.</div>
+</td>
 </tr>
 </tbody>
 </table>
@@ -735,11 +735,11 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span 
class="strong">BlockCacheViewTmpl.ImplData.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.ImplData.html#m_cacheConfig">m_cacheConfig</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">BlockCacheTmpl.ImplData.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.ImplData.html#m_cacheConfig">m_cacheConfig</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span 
class="strong">BlockCacheTmpl.ImplData.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.ImplData.html#m_cacheConfig">m_cacheConfig</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">BlockCacheViewTmpl.ImplData.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.ImplData.html#m_cacheConfig">m_cacheConfig</a></strong></code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -752,11 +752,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span 
class="strong">BlockCacheViewTmpl.ImplData.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.ImplData.html#getCacheConfig()">getCacheConfig</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">BlockCacheTmpl.ImplData.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.ImplData.html#getCacheConfig()">getCacheConfig</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span 
class="strong">BlockCacheTmpl.ImplData.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.ImplData.html#getCacheConfig()">getCacheConfig</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">BlockCacheViewTmpl.ImplData.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.ImplData.html#getCacheConfig()">getCacheConfig</a></strong>()</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -826,11 +826,11 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">BlockCacheViewTmpl.ImplData.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.ImplData.html#setCacheConfig(org.apache.hadoop.hbase.io.hfile.CacheConfig)">setCacheConfig</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">CacheConfig</a>&nbsp;cacheConfig)</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">BlockCacheTmpl.ImplData.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.ImplData.html#setCacheConfig(org.apache.hadoop.hbase.io.hfile.CacheConfig)">setCacheConfig</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">CacheConfig</a>&nbsp;cacheConfig)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">BlockCacheTmpl.ImplData.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.ImplData.html#setCacheConfig(org.apache.hadoop.hbase.io.hfile.CacheConfig)">setCacheConfig</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">CacheConfig</a>&nbsp;cacheConfig)</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">BlockCacheViewTmpl.ImplData.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.ImplData.html#setCacheConfig(org.apache.hadoop.hbase.io.hfile.CacheConfig)">setCacheConfig</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">CacheConfig</a>&nbsp;cacheConfig)</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/0d22bc0c/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheStats.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheStats.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheStats.html
index 7dfafa9..dc61c71 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheStats.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheStats.html
@@ -150,9 +150,7 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheStats.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheStats</a></code></td>
-<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getStats()">getStats</a></strong>()</code>
-<div class="block">Get the statistics for this block cache.</div>
-</td>
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#getStats()">getStats</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheStats.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheStats</a></code></td>
@@ -162,7 +160,9 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheStats.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheStats</a></code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#getStats()">getStats</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getStats()">getStats</a></strong>()</code>
+<div class="block">Get the statistics for this block cache.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheStats.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheStats</a></code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/0d22bc0c/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.html
index 42b48f5..73c0712 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.html
@@ -168,35 +168,35 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                 boolean&nbsp;caching,
                 boolean&nbsp;repeat,
-                boolean&nbsp;updateCacheMetrics)</code>
-<div class="block">Fetch block from cache.</div>
-</td>
+                boolean&nbsp;updateCacheMetrics)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span 
class="strong">InclusiveCombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                 boolean&nbsp;caching,
                 boolean&nbsp;repeat,
-                boolean&nbsp;updateCacheMetrics)</code>
-<div class="block">Get the buffer of the block with the specified name.</div>
-</td>
+                boolean&nbsp;updateCacheMetrics)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                 boolean&nbsp;caching,
                 boolean&nbsp;repeat,
-                boolean&nbsp;updateCacheMetrics)</code>&nbsp;</td>
+                boolean&nbsp;updateCacheMetrics)</code>
+<div class="block">Get the buffer of the block with the specified name.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span 
class="strong">InclusiveCombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                 boolean&nbsp;caching,
                 boolean&nbsp;repeat,
-                boolean&nbsp;updateCacheMetrics)</code>&nbsp;</td>
+                boolean&nbsp;updateCacheMetrics)</code>
+<div class="block">Fetch block from cache.</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
@@ -245,10 +245,8 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
-                    <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf)</code>
-<div class="block">Add block to cache (defaults to not in-memory).</div>
-</td>
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+                    <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
@@ -259,8 +257,10 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
-                    <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+                    <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf)</code>
+<div class="block">Add block to cache (defaults to not in-memory).</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
@@ -269,35 +269,35 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                     <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf,
                     boolean&nbsp;inMemory,
-                    boolean&nbsp;cacheDataInL1)</code>
-<div class="block">Add block to cache.</div>
-</td>
+                    boolean&nbsp;cacheDataInL1)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span 
class="strong">InclusiveCombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                     <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf,
                     boolean&nbsp;inMemory,
-                    boolean&nbsp;cacheDataInL1)</code>
-<div class="block">Cache the block with the specified name and buffer.</div>
-</td>
+                    boolean&nbsp;cacheDataInL1)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                     <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf,
                     boolean&nbsp;inMemory,
-                    boolean&nbsp;cacheDataInL1)</code>&nbsp;</td>
+                    boolean&nbsp;cacheDataInL1)</code>
+<div class="block">Cache the block with the specified name and buffer.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">InclusiveCombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                     <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf,
                     boolean&nbsp;inMemory,
-                    boolean&nbsp;cacheDataInL1)</code>&nbsp;</td>
+                    boolean&nbsp;cacheDataInL1)</code>
+<div class="block">Add block to cache.</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
@@ -313,11 +313,8 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#returnBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">returnBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
-                      <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;block)</code>
-<div class="block">Called when the scanner using the block decides to return 
the block once its usage
- is over.</div>
-</td>
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#returnBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">returnBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+                      <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;block)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
@@ -326,8 +323,11 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#returnBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">returnBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
-                      <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;block)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#returnBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">returnBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+                      <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;block)</code>
+<div class="block">Called when the scanner using the block decides to return 
the block once its usage
+ is over.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
@@ -417,25 +417,25 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span class="strong">FileIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
+<td class="colLast"><span class="strong">IOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/IOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
         int&nbsp;length,
         <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>
-<div class="block">Transfers data from file to the given byte buffer</div>
+<div class="block">Transfers data from IOEngine to a Cacheable object.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span 
class="strong">ByteBufferIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/ByteBufferIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
+<td class="colLast"><span class="strong">FileIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
         int&nbsp;length,
-        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>&nbsp;</td>
+        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>
+<div class="block">Transfers data from file to the given byte buffer</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span class="strong">IOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/IOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
+<td class="colLast"><span 
class="strong">ByteBufferIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/ByteBufferIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
         int&nbsp;length,
-        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>
-<div class="block">Transfers data from IOEngine to a Cacheable object.</div>
-</td>
+        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -506,25 +506,25 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span class="strong">FileIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
+<td class="colLast"><span class="strong">IOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/IOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
         int&nbsp;length,
         <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>
-<div class="block">Transfers data from file to the given byte buffer</div>
+<div class="block">Transfers data from IOEngine to a Cacheable object.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span 
class="strong">ByteBufferIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/ByteBufferIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
+<td class="colLast"><span class="strong">FileIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
         int&nbsp;length,
-        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>&nbsp;</td>
+        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>
+<div class="block">Transfers data from file to the given byte buffer</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span class="strong">IOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/IOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
+<td class="colLast"><span 
class="strong">ByteBufferIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/ByteBufferIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
         int&nbsp;length,
-        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>
-<div class="block">Transfers data from IOEngine to a Cacheable object.</div>
-</td>
+        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected void</code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/0d22bc0c/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheableDeserializer.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheableDeserializer.html
 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheableDeserializer.html
index d71e022..dbd36d5 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheableDeserializer.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheableDeserializer.html
@@ -199,25 +199,25 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span class="strong">FileIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
+<td class="colLast"><span class="strong">IOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/IOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
         int&nbsp;length,
         <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>
-<div class="block">Transfers data from file to the given byte buffer</div>
+<div class="block">Transfers data from IOEngine to a Cacheable object.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span 
class="strong">ByteBufferIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/ByteBufferIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
+<td class="colLast"><span class="strong">FileIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
         int&nbsp;length,
-        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>&nbsp;</td>
+        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>
+<div class="block">Transfers data from file to the given byte buffer</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span class="strong">IOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/IOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
+<td class="colLast"><span 
class="strong">ByteBufferIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/ByteBufferIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
         int&nbsp;length,
-        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>
-<div class="block">Transfers data from IOEngine to a Cacheable object.</div>
-</td>
+        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected void</code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/0d22bc0c/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CachedBlock.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CachedBlock.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CachedBlock.html
index 8c3c8ed..914cdeb 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CachedBlock.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CachedBlock.html
@@ -142,7 +142,7 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Iterator.html?is-external=true";
 title="class or interface in java.util">Iterator</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CachedBlock.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">CachedBlock</a>&gt;</code></td>
-<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#iterator()">iterator</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#iterator()">iterator</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Iterator.html?is-external=true";
 title="class or interface in java.util">Iterator</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CachedBlock.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">CachedBlock</a>&gt;</code></td>
@@ -150,7 +150,7 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Iterator.html?is-external=true";
 title="class or interface in java.util">Iterator</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CachedBlock.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">CachedBlock</a>&gt;</code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#iterator()">iterator</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#iterator()">iterator</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Iterator.html?is-external=true";
 title="class or interface in java.util">Iterator</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CachedBlock.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">CachedBlock</a>&gt;</code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/0d22bc0c/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFile.FileInfo.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFile.FileInfo.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFile.FileInfo.html
index ab906fc..6c88fef 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFile.FileInfo.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFile.FileInfo.html
@@ -98,15 +98,15 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.FileInfo.html"
 title="class in 
org.apache.hadoop.hbase.io.hfile">HFile.FileInfo</a></code></td>
-<td class="colLast"><span 
class="strong">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#fileInfo">fileInfo</a></strong></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>protected <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.FileInfo.html"
 title="class in 
org.apache.hadoop.hbase.io.hfile">HFile.FileInfo</a></code></td>
 <td class="colLast"><span 
class="strong">HFileWriterImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileWriterImpl.html#fileInfo">fileInfo</a></strong></code>
 <div class="block">A "file info" block: a key-value map of file-wide 
metadata.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.FileInfo.html"
 title="class in 
org.apache.hadoop.hbase.io.hfile">HFile.FileInfo</a></code></td>
+<td class="colLast"><span 
class="strong">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#fileInfo">fileInfo</a></strong></code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 <table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing 
methods, and an explanation">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/0d22bc0c/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFile.Reader.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFile.Reader.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFile.Reader.html
index 72147c0..67883f7 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFile.Reader.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFile.Reader.html
@@ -121,15 +121,15 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>protected <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.Reader.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">HFile.Reader</a></code></td>
-<td class="colLast"><span 
class="strong">HFileReaderImpl.HFileScannerImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.HFileScannerImpl.html#reader">reader</a></strong></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.Reader.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">HFile.Reader</a></code></td>
 <td class="colLast"><span 
class="strong">CompoundBloomFilter.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CompoundBloomFilter.html#reader">reader</a></strong></code>
 <div class="block">Used to load chunks on demand</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.Reader.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">HFile.Reader</a></code></td>
+<td class="colLast"><span 
class="strong">HFileReaderImpl.HFileScannerImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.HFileScannerImpl.html#reader">reader</a></strong></code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 <table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing 
methods, and an explanation">
@@ -167,11 +167,11 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.Reader.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">HFile.Reader</a></code></td>
-<td class="colLast"><span class="strong">HFileScanner.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileScanner.html#getReader()">getReader</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">HFileReaderImpl.HFileScannerImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.HFileScannerImpl.html#getReader()">getReader</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.Reader.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">HFile.Reader</a></code></td>
-<td class="colLast"><span 
class="strong">HFileReaderImpl.HFileScannerImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.HFileScannerImpl.html#getReader()">getReader</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">HFileScanner.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileScanner.html#getReader()">getReader</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private static <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.Reader.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">HFile.Reader</a></code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/0d22bc0c/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFile.Writer.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFile.Writer.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFile.Writer.html
index 6ae2569..8ebc8ef 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFile.Writer.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFile.Writer.html
@@ -135,18 +135,18 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">HFileDataBlockEncoderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoderImpl.html#saveMetadata(org.apache.hadoop.hbase.io.hfile.HFile.Writer)">saveMetadata</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.Writer.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">HFile.Writer</a>&nbsp;writer)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
 <td class="colLast"><span 
class="strong">NoOpDataBlockEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/NoOpDataBlockEncoder.html#saveMetadata(org.apache.hadoop.hbase.io.hfile.HFile.Writer)">saveMetadata</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.Writer.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">HFile.Writer</a>&nbsp;writer)</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span 
class="strong">HFileDataBlockEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoder.html#saveMetadata(org.apache.hadoop.hbase.io.hfile.HFile.Writer)">saveMetadata</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.Writer.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">HFile.Writer</a>&nbsp;writer)</code>
 <div class="block">Save metadata in HFile which will be written to disk</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span 
class="strong">HFileDataBlockEncoderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoderImpl.html#saveMetadata(org.apache.hadoop.hbase.io.hfile.HFile.Writer)">saveMetadata</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.Writer.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">HFile.Writer</a>&nbsp;writer)</code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/0d22bc0c/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileContext.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileContext.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileContext.html
index 3887e33..b8bb822 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileContext.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileContext.html
@@ -156,19 +156,19 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileContext.html" 
title="class in org.apache.hadoop.hbase.io.hfile">HFileContext</a></code></td>
-<td class="colLast"><span 
class="strong">HFileBlockDecodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDecodingContext.html#getHFileContext()">getHFileContext</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">HFileBlockDefaultDecodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultDecodingContext.html#getHFileContext()">getHFileContext</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileContext.html" 
title="class in org.apache.hadoop.hbase.io.hfile">HFileContext</a></code></td>
-<td class="colLast"><span 
class="strong">HFileBlockDefaultDecodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultDecodingContext.html#getHFileContext()">getHFileContext</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">HFileBlockDefaultEncodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.html#getHFileContext()">getHFileContext</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileContext.html" 
title="class in org.apache.hadoop.hbase.io.hfile">HFileContext</a></code></td>
-<td class="colLast"><span 
class="strong">HFileBlockEncodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html#getHFileContext()">getHFileContext</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">HFileBlockDecodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDecodingContext.html#getHFileContext()">getHFileContext</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileContext.html" 
title="class in org.apache.hadoop.hbase.io.hfile">HFileContext</a></code></td>
-<td class="colLast"><span 
class="strong">HFileBlockDefaultEncodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.html#getHFileContext()">getHFileContext</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">HFileBlockEncodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html#getHFileContext()">getHFileContext</a></strong>()</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -297,11 +297,11 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileContext.html" 
title="class in org.apache.hadoop.hbase.io.hfile">HFileContext</a></code></td>
-<td class="colLast"><span 
class="strong">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#getFileContext()">getFileContext</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">HFileWriterImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileWriterImpl.html#getFileContext()">getFileContext</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileContext.html" 
title="class in org.apache.hadoop.hbase.io.hfile">HFileContext</a></code></td>
-<td class="colLast"><span 
class="strong">HFileWriterImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileWriterImpl.html#getFileContext()">getFileContext</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#getFileContext()">getFileContext</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileContext.html" 
title="class in org.apache.hadoop.hbase.io.hfile">HFileContext</a></code></td>
@@ -343,35 +343,35 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDecodingContext.html"
 title="interface in 
org.apache.hadoop.hbase.io.encoding">HFileBlockDecodingContext</a></code></td>
-<td class="colLast"><span 
class="strong">HFileDataBlockEncoderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoderImpl.html#newDataBlockDecodingContext(org.apache.hadoop.hbase.io.hfile.HFileContext)">newDataBlockDecodingContext</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileContext.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">HFileContext</a>&nbsp;fileContext)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDecodingContext.html"
 title="interface in 
org.apache.hadoop.hbase.io.encoding">HFileBlockDecodingContext</a></code></td>
 <td class="colLast"><span 
class="strong">NoOpDataBlockEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/NoOpDataBlockEncoder.html#newDataBlockDecodingContext(org.apache.hadoop.hbase.io.hfile.HFileContext)">newDataBlockDecodingContext</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileContext.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">HFileContext</a>&nbsp;meta)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDecodingContext.html"
 title="interface in 
org.apache.hadoop.hbase.io.encoding">HFileBlockDecodingContext</a></code></td>
 <td class="colLast"><span 
class="strong">HFileDataBlockEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoder.html#newDataBlockDecodingContext(org.apache.hadoop.hbase.io.hfile.HFileContext)">newDataBlockDecodingContext</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileContext.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">HFileContext</a>&nbsp;fileContext)</code>
 <div class="block">create a encoder specific decoding context for 
reading.</div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html"
 title="interface in 
org.apache.hadoop.hbase.io.encoding">HFileBlockEncodingContext</a></code></td>
-<td class="colLast"><span 
class="strong">HFileDataBlockEncoderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoderImpl.html#newDataBlockEncodingContext(byte[],%20org.apache.hadoop.hbase.io.hfile.HFileContext)">newDataBlockEncodingContext</a></strong>(byte[]&nbsp;dummyHeader,
-                                                      <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileContext.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">HFileContext</a>&nbsp;fileContext)</code>&nbsp;</td>
-</tr>
 <tr class="rowColor">
+<td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDecodingContext.html"
 title="interface in 
org.apache.hadoop.hbase.io.encoding">HFileBlockDecodingContext</a></code></td>
+<td class="colLast"><span 
class="strong">HFileDataBlockEncoderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoderImpl.html#newDataBlockDecodingContext(org.apache.hadoop.hbase.io.hfile.HFileContext)">newDataBlockDecodingContext</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileContext.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">HFileContext</a>&nbsp;fileContext)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html"
 title="interface in 
org.apache.hadoop.hbase.io.encoding">HFileBlockEncodingContext</a></code></td>
 <td class="colLast"><span 
class="strong">NoOpDataBlockEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/NoOpDataBlockEncoder.html#newDataBlockEncodingContext(byte[],%20org.apache.hadoop.hbase.io.hfile.HFileContext)">newDataBlockEncodingContext</a></strong>(byte[]&nbsp;dummyHeader,
                                                       <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileContext.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">HFileContext</a>&nbsp;meta)</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html"
 title="interface in 
org.apache.hadoop.hbase.io.encoding">HFileBlockEncodingContext</a></code></td>
 <td class="colLast"><span 
class="strong">HFileDataBlockEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoder.html#newDataBlockEncodingContext(byte[],%20org.apache.hadoop.hbase.io.hfile.HFileContext)">newDataBlockEncodingContext</a></strong>(byte[]&nbsp;headerBytes,
                                                       <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileContext.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">HFileContext</a>&nbsp;fileContext)</code>
 <div class="block">Create an encoder specific encoding context object for 
writing.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html"
 title="interface in 
org.apache.hadoop.hbase.io.encoding">HFileBlockEncodingContext</a></code></td>
+<td class="colLast"><span 
class="strong">HFileDataBlockEncoderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoderImpl.html#newDataBlockEncodingContext(byte[],%20org.apache.hadoop.hbase.io.hfile.HFileContext)">newDataBlockEncodingContext</a></strong>(byte[]&nbsp;dummyHeader,
+                                                      <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileContext.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">HFileContext</a>&nbsp;fileContext)</code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>(package private) <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html" 
title="class in org.apache.hadoop.hbase.io.hfile">HFileBlock</a></code></td>
 <td class="colLast"><span class="strong">HFileBlock.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html#unpack(org.apache.hadoop.hbase.io.hfile.HFileContext,%20org.apache.hadoop.hbase.io.hfile.HFileBlock.FSReader)">unpack</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileContext.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">HFileContext</a>&nbsp;fileContext,

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/0d22bc0c/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/LruCachedBlock.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/LruCachedBlock.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/LruCachedBlock.html
index 3c39891..65ec455 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/LruCachedBlock.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/LruCachedBlock.html
@@ -148,13 +148,13 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">LruCachedBlockQueue.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruCachedBlockQueue.html#add(org.apache.hadoop.hbase.io.hfile.LruCachedBlock)">add</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruCachedBlock.html"
 title="class in 
org.apache.hadoop.hbase.io.hfile">LruCachedBlock</a>&nbsp;cb)</code>
-<div class="block">Attempt to add the specified cached block to this 
queue.</div>
-</td>
+<td class="colLast"><span 
class="strong">LruBlockCache.BlockBucket.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#add(org.apache.hadoop.hbase.io.hfile.LruCachedBlock)">add</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruCachedBlock.html"
 title="class in 
org.apache.hadoop.hbase.io.hfile">LruCachedBlock</a>&nbsp;block)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">LruBlockCache.BlockBucket.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#add(org.apache.hadoop.hbase.io.hfile.LruCachedBlock)">add</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruCachedBlock.html"
 title="class in 
org.apache.hadoop.hbase.io.hfile">LruCachedBlock</a>&nbsp;block)</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">LruCachedBlockQueue.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruCachedBlockQueue.html#add(org.apache.hadoop.hbase.io.hfile.LruCachedBlock)">add</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruCachedBlock.html"
 title="class in 
org.apache.hadoop.hbase.io.hfile">LruCachedBlock</a>&nbsp;cb)</code>
+<div class="block">Attempt to add the specified cached block to this 
queue.</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>int</code></td>

Reply via email to