http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/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 63808f8..d0ff062 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
@@ -161,20 +161,20 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>private <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#blockType">blockType</a></strong></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>private <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">HFileBlock.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html#blockType">blockType</a></strong></code>
 <div class="block">Type of block.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private <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">HFileBlock.Writer.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.Writer.html#blockType">blockType</a></strong></code>
 <div class="block">Current block type.</div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colFirst"><code>private <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#blockType">blockType</a></strong></code>&nbsp;</td>
-</tr>
 </tbody>
 </table>
 <table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing 
methods, and an explanation">
@@ -186,29 +186,29 @@
 <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">HFileBlock.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.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">HFileBlock.BlockWritable.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.BlockWritable.html#getBlockType()">getBlockType</a></strong>()</code>
-<div class="block">The type of block this data should use.</div>
-</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>
-<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">HFileBlock.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.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">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">HFileBlock.BlockWritable.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.BlockWritable.html#getBlockType()">getBlockType</a></strong>()</code>
+<div class="block">The type of block this data should use.</div>
+</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">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">CompoundBloomFilterWriter.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#getInlineBlockType()">getInlineBlockType</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>
@@ -218,7 +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">CompoundBloomFilterWriter.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#getInlineBlockType()">getInlineBlockType</a></strong>()</code>&nbsp;</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,23 +276,23 @@ 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">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="altColor">
 <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">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>
-<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="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#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>&nbsp;</td>
@@ -347,27 +347,27 @@ the order they are declared.</div>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><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">HFile.CachingBlockReader.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.CachingBlockReader.html#readBlock(long,%20long,%20boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.io.hfile.BlockType,%20org.apache.hadoop.hbase.io.encoding.DataBlockEncoding)">readBlock</a></strong>(long&nbsp;offset,
+<td class="colLast"><span 
class="strong">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#readBlock(long,%20long,%20boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.io.hfile.BlockType,%20org.apache.hadoop.hbase.io.encoding.DataBlockEncoding)">readBlock</a></strong>(long&nbsp;dataBlockOffset,
                   long&nbsp;onDiskBlockSize,
                   boolean&nbsp;cacheBlock,
                   boolean&nbsp;pread,
                   boolean&nbsp;isCompaction,
                   boolean&nbsp;updateCacheMetrics,
                   <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in 
org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;expectedBlockType,
-                  <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.html"
 title="enum in 
org.apache.hadoop.hbase.io.encoding">DataBlockEncoding</a>&nbsp;expectedDataBlockEncoding)</code>
-<div class="block">Read in a file block.</div>
-</td>
+                  <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.html"
 title="enum in 
org.apache.hadoop.hbase.io.encoding">DataBlockEncoding</a>&nbsp;expectedDataBlockEncoding)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><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">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#readBlock(long,%20long,%20boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.io.hfile.BlockType,%20org.apache.hadoop.hbase.io.encoding.DataBlockEncoding)">readBlock</a></strong>(long&nbsp;dataBlockOffset,
+<td class="colLast"><span 
class="strong">HFile.CachingBlockReader.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.CachingBlockReader.html#readBlock(long,%20long,%20boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.io.hfile.BlockType,%20org.apache.hadoop.hbase.io.encoding.DataBlockEncoding)">readBlock</a></strong>(long&nbsp;offset,
                   long&nbsp;onDiskBlockSize,
                   boolean&nbsp;cacheBlock,
                   boolean&nbsp;pread,
                   boolean&nbsp;isCompaction,
                   boolean&nbsp;updateCacheMetrics,
                   <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in 
org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;expectedBlockType,
-                  <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.html"
 title="enum in 
org.apache.hadoop.hbase.io.encoding">DataBlockEncoding</a>&nbsp;expectedDataBlockEncoding)</code>&nbsp;</td>
+                  <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.html"
 title="enum in 
org.apache.hadoop.hbase.io.encoding">DataBlockEncoding</a>&nbsp;expectedDataBlockEncoding)</code>
+<div class="block">Read in a file block.</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private void</code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/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 90745ed..98fc741 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,16 +231,6 @@
 </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">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="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>
-</tr>
-<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">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>
@@ -252,6 +242,16 @@
 <div class="block">Block cache configuration.</div>
 </td>
 </tr>
+<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">HFile.WriterFactory.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.WriterFactory.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">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>
 </tbody>
 </table>
 <table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing 
methods, and an explanation">
@@ -534,11 +534,11 @@
 <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>
-<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>
 <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>
@@ -605,17 +605,17 @@
 </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>
 <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">HStore.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#getCacheConfig()">getCacheConfig</a></strong>()</code>&nbsp;</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">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">HStore.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#getCacheConfig()">getCacheConfig</a></strong>()</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -741,11 +741,11 @@
 <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">BlockCacheViewTmplImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmplImpl.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">BlockCacheTmplImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmplImpl.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>
-<td class="colLast"><span 
class="strong">BlockCacheTmplImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmplImpl.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">BlockCacheViewTmplImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmplImpl.html#cacheConfig">cacheConfig</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>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/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 b0b221b..4143193 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,13 +150,13 @@
 <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>
-<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="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>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.MemoryType.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.MemoryType.html
 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.MemoryType.html
index 0016eec..29cfaa9 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.MemoryType.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.MemoryType.html
@@ -112,11 +112,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html"
 title="enum in 
org.apache.hadoop.hbase.io.hfile">Cacheable.MemoryType</a></code></td>
-<td class="colLast"><span class="strong">HFileBlock.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html#getMemoryType()">getMemoryType</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#getMemoryType()">getMemoryType</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html"
 title="enum in 
org.apache.hadoop.hbase.io.hfile">Cacheable.MemoryType</a></code></td>
-<td class="colLast"><span class="strong">Cacheable.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html#getMemoryType()">getMemoryType</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">HFileBlock.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html#getMemoryType()">getMemoryType</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html"
 title="enum in 
org.apache.hadoop.hbase.io.hfile">Cacheable.MemoryType</a></code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/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 c6a691f..2d95e9f 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,19 +168,19 @@
 <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">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">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>
@@ -220,14 +220,14 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><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;</code></td>
-<td class="colLast"><span class="strong">HFileBlock.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html#getDeserializer()">getDeserializer</a></strong>()</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><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;</code></td>
 <td class="colLast"><span class="strong">Cacheable.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html#getDeserializer()">getDeserializer</a></strong>()</code>
 <div class="block">Returns CacheableDeserializer instance which reconstructs 
original object from ByteBuffer.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code><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;</code></td>
+<td class="colLast"><span class="strong">HFileBlock.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html#getDeserializer()">getDeserializer</a></strong>()</code>&nbsp;</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <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;</code></td>
 <td class="colLast"><span 
class="strong">CacheableDeserializerIdManager.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializerIdManager.html#getDeserializer(int)">getDeserializer</a></strong>(int&nbsp;id)</code>
@@ -245,16 +245,16 @@
 <tbody>
 <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>
+</tr>
+<tr class="rowColor">
+<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>
 </tr>
-<tr class="rowColor">
-<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>
-</tr>
 <tr class="altColor">
 <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)">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,
@@ -269,19 +269,19 @@
 </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">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">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,17 +313,17 @@
 </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>
+</tr>
+<tr class="rowColor">
+<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>
 </tr>
-<tr class="rowColor">
-<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>
-</tr>
 <tr class="altColor">
 <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#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,
@@ -411,10 +411,10 @@
 </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">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="rowColor">
@@ -425,17 +425,17 @@
 </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">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="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">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>
 </tbody>
 </table>
@@ -500,10 +500,10 @@
 <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">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="rowColor">
@@ -514,17 +514,17 @@
 </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">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="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">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="altColor">
 <td class="colFirst"><code>protected void</code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/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 4f48d53..fafc6b2 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
@@ -134,14 +134,14 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><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;</code></td>
-<td class="colLast"><span class="strong">HFileBlock.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html#getDeserializer()">getDeserializer</a></strong>()</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><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;</code></td>
 <td class="colLast"><span class="strong">Cacheable.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html#getDeserializer()">getDeserializer</a></strong>()</code>
 <div class="block">Returns CacheableDeserializer instance which reconstructs 
original object from ByteBuffer.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code><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;</code></td>
+<td class="colLast"><span class="strong">HFileBlock.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html#getDeserializer()">getDeserializer</a></strong>()</code>&nbsp;</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <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;</code></td>
 <td class="colLast"><span 
class="strong">CacheableDeserializerIdManager.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializerIdManager.html#getDeserializer(int)">getDeserializer</a></strong>(int&nbsp;id)</code>
@@ -193,10 +193,10 @@
 <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">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="rowColor">
@@ -207,17 +207,17 @@
 </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">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="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">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="altColor">
 <td class="colFirst"><code>protected void</code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/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 0f079c2..d4089e0 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,11 +142,11 @@
 </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>
-<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="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>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/FixedFileTrailer.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/FixedFileTrailer.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/FixedFileTrailer.html
index d11a033..d93549c 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/FixedFileTrailer.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/FixedFileTrailer.html
@@ -112,11 +112,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.html"
 title="class in 
org.apache.hadoop.hbase.io.hfile">FixedFileTrailer</a></code></td>
-<td class="colLast"><span class="strong">HFile.Reader.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.Reader.html#getTrailer()">getTrailer</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#getTrailer()">getTrailer</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.html"
 title="class in 
org.apache.hadoop.hbase.io.hfile">FixedFileTrailer</a></code></td>
-<td class="colLast"><span 
class="strong">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#getTrailer()">getTrailer</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">HFile.Reader.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.Reader.html#getTrailer()">getTrailer</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.html"
 title="class in 
org.apache.hadoop.hbase.io.hfile">FixedFileTrailer</a></code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/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 1fcdb97..6a30c77 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">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">
+<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">
+<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/5513910e/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.FSReader.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.FSReader.html
 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.FSReader.html
index 9e71685..3b45fc0 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.FSReader.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.FSReader.html
@@ -129,14 +129,14 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.FSReader.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">HFileBlock.FSReader</a></code></td>
-<td class="colLast"><span class="strong">HFile.Reader.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.Reader.html#getUncachedBlockReader()">getUncachedBlockReader</a></strong>()</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.FSReader.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">HFileBlock.FSReader</a></code></td>
 <td class="colLast"><span 
class="strong">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#getUncachedBlockReader()">getUncachedBlockReader</a></strong>()</code>
 <div class="block">For testing</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.FSReader.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">HFileBlock.FSReader</a></code></td>
+<td class="colLast"><span class="strong">HFile.Reader.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.Reader.html#getUncachedBlockReader()">getUncachedBlockReader</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/5513910e/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.Writer.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.Writer.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.Writer.html
index 799958b..ea68e41 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.Writer.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.Writer.html
@@ -98,15 +98,15 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.Writer.html"
 title="class in 
org.apache.hadoop.hbase.io.hfile">HFileBlock.Writer</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#blockWriter">blockWriter</a></strong></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>protected <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.Writer.html"
 title="class in 
org.apache.hadoop.hbase.io.hfile">HFileBlock.Writer</a></code></td>
 <td class="colLast"><span 
class="strong">HFileWriterImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileWriterImpl.html#blockWriter">blockWriter</a></strong></code>
 <div class="block">block writer</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.Writer.html"
 title="class in 
org.apache.hadoop.hbase.io.hfile">HFileBlock.Writer</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#blockWriter">blockWriter</a></strong></code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 <table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing 
constructors, and an explanation">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.html
index 5f33b9d..1cbe6c4 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.html
@@ -162,12 +162,12 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><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">HFile.Reader.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.Reader.html#getMetaBlock(java.lang.String,%20boolean)">getMetaBlock</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;metaBlockName,
+<td class="colLast"><span 
class="strong">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#getMetaBlock(java.lang.String,%20boolean)">getMetaBlock</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;metaBlockName,
                         boolean&nbsp;cacheBlock)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><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">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#getMetaBlock(java.lang.String,%20boolean)">getMetaBlock</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;metaBlockName,
+<td class="colLast"><span class="strong">HFile.Reader.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.Reader.html#getMetaBlock(java.lang.String,%20boolean)">getMetaBlock</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;metaBlockName,
                         boolean&nbsp;cacheBlock)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
@@ -185,27 +185,27 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><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">HFile.CachingBlockReader.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.CachingBlockReader.html#readBlock(long,%20long,%20boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.io.hfile.BlockType,%20org.apache.hadoop.hbase.io.encoding.DataBlockEncoding)">readBlock</a></strong>(long&nbsp;offset,
+<td class="colLast"><span 
class="strong">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#readBlock(long,%20long,%20boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.io.hfile.BlockType,%20org.apache.hadoop.hbase.io.encoding.DataBlockEncoding)">readBlock</a></strong>(long&nbsp;dataBlockOffset,
                   long&nbsp;onDiskBlockSize,
                   boolean&nbsp;cacheBlock,
                   boolean&nbsp;pread,
                   boolean&nbsp;isCompaction,
                   boolean&nbsp;updateCacheMetrics,
                   <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in 
org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;expectedBlockType,
-                  <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.html"
 title="enum in 
org.apache.hadoop.hbase.io.encoding">DataBlockEncoding</a>&nbsp;expectedDataBlockEncoding)</code>
-<div class="block">Read in a file block.</div>
-</td>
+                  <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.html"
 title="enum in 
org.apache.hadoop.hbase.io.encoding">DataBlockEncoding</a>&nbsp;expectedDataBlockEncoding)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><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">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#readBlock(long,%20long,%20boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.io.hfile.BlockType,%20org.apache.hadoop.hbase.io.encoding.DataBlockEncoding)">readBlock</a></strong>(long&nbsp;dataBlockOffset,
+<td class="colLast"><span 
class="strong">HFile.CachingBlockReader.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.CachingBlockReader.html#readBlock(long,%20long,%20boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.io.hfile.BlockType,%20org.apache.hadoop.hbase.io.encoding.DataBlockEncoding)">readBlock</a></strong>(long&nbsp;offset,
                   long&nbsp;onDiskBlockSize,
                   boolean&nbsp;cacheBlock,
                   boolean&nbsp;pread,
                   boolean&nbsp;isCompaction,
                   boolean&nbsp;updateCacheMetrics,
                   <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in 
org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;expectedBlockType,
-                  <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.html"
 title="enum in 
org.apache.hadoop.hbase.io.encoding">DataBlockEncoding</a>&nbsp;expectedDataBlockEncoding)</code>&nbsp;</td>
+                  <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.html"
 title="enum in 
org.apache.hadoop.hbase.io.encoding">DataBlockEncoding</a>&nbsp;expectedDataBlockEncoding)</code>
+<div class="block">Read in a file block.</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html" 
title="class in org.apache.hadoop.hbase.io.hfile">HFileBlock</a></code></td>
@@ -346,13 +346,13 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">HFile.CachingBlockReader.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.CachingBlockReader.html#returnBlock(org.apache.hadoop.hbase.io.hfile.HFileBlock)">returnBlock</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">HFileBlock</a>&nbsp;block)</code>
-<div class="block">Return the given block back to the cache, if it was 
obtained from cache.</div>
-</td>
+<td class="colLast"><span 
class="strong">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#returnBlock(org.apache.hadoop.hbase.io.hfile.HFileBlock)">returnBlock</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">HFileBlock</a>&nbsp;block)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#returnBlock(org.apache.hadoop.hbase.io.hfile.HFileBlock)">returnBlock</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">HFileBlock</a>&nbsp;block)</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">HFile.CachingBlockReader.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.CachingBlockReader.html#returnBlock(org.apache.hadoop.hbase.io.hfile.HFileBlock)">returnBlock</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">HFileBlock</a>&nbsp;block)</code>
+<div class="block">Return the given block back to the cache, if it was 
obtained from cache.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private void</code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlockIndex.BlockIndexReader.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlockIndex.BlockIndexReader.html
 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlockIndex.BlockIndexReader.html
index 19962b5..7fe5bdb 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlockIndex.BlockIndexReader.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlockIndex.BlockIndexReader.html
@@ -136,11 +136,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexReader.html"
 title="class in 
org.apache.hadoop.hbase.io.hfile">HFileBlockIndex.BlockIndexReader</a></code></td>
-<td class="colLast"><span class="strong">HFile.Reader.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.Reader.html#getDataBlockIndexReader()">getDataBlockIndexReader</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#getDataBlockIndexReader()">getDataBlockIndexReader</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexReader.html"
 title="class in 
org.apache.hadoop.hbase.io.hfile">HFileBlockIndex.BlockIndexReader</a></code></td>
-<td class="colLast"><span 
class="strong">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#getDataBlockIndexReader()">getDataBlockIndexReader</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">HFile.Reader.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.Reader.html#getDataBlockIndexReader()">getDataBlockIndexReader</a></strong>()</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>

Reply via email to