http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fd52f877/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCacheKey.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCacheKey.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCacheKey.html
index 4f412f2..7448db3 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCacheKey.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCacheKey.html
@@ -173,16 +173,16 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">LruBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#cacheBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-">cacheBlock</a></span>(<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="typeNameLabel">BlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#cacheBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-">cacheBlock</a></span>(<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">Cache the block with the specified name and buffer.</div>
+<div class="block">Add block to cache (defaults to not in-memory).</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">BlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#cacheBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-">cacheBlock</a></span>(<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="typeNameLabel">LruBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#cacheBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-">cacheBlock</a></span>(<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>
+<div class="block">Cache the block with the specified name and buffer.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -192,17 +192,19 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">InclusiveCombinedBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#cacheBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-boolean-boolean-">cacheBlock</a></span>(<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="typeNameLabel">CombinedBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#cacheBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-boolean-boolean-">cacheBlock</a></span>(<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>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">CombinedBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#cacheBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-boolean-boolean-">cacheBlock</a></span>(<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="typeNameLabel">BlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#cacheBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-boolean-boolean-">cacheBlock</a></span>(<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>
@@ -215,12 +217,10 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">BlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#cacheBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-boolean-boolean-">cacheBlock</a></span>(<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="typeNameLabel">InclusiveCombinedBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#cacheBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-boolean-boolean-">cacheBlock</a></span>(<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="altColor">
 <td class="colFirst"><code>void</code></td>
@@ -241,31 +241,33 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span 
class="typeNameLabel">LruBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#evictBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-">evictBlock</a></span>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span class="typeNameLabel">BlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#evictBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-">evictBlock</a></span>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey)</code>
 <div class="block">Evict block from cache.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span 
class="typeNameLabel">LruBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#evictBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-">evictBlock</a></span>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey)</code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span 
class="typeNameLabel">MemcachedBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/MemcachedBlockCache.html#evictBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-">evictBlock</a></span>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey)</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="typeNameLabel">InclusiveCombinedBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#getBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-boolean-boolean-boolean-">getBlock</a></span>(<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="typeNameLabel">CombinedBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#getBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-boolean-boolean-boolean-">getBlock</a></span>(<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>
 </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="typeNameLabel">CombinedBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#getBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-boolean-boolean-boolean-">getBlock</a></span>(<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="typeNameLabel">BlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-boolean-boolean-boolean-">getBlock</a></span>(<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>
@@ -278,12 +280,10 @@
 </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="typeNameLabel">BlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-boolean-boolean-boolean-">getBlock</a></span>(<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="typeNameLabel">InclusiveCombinedBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#getBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-boolean-boolean-boolean-">getBlock</a></span>(<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="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>
@@ -315,17 +315,17 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">LruBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#returnBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-">returnBlock</a></span>(<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="typeNameLabel">BlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#returnBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-">returnBlock</a></span>(<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="typeNameLabel">LruBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#returnBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-">returnBlock</a></span>(<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="typeNameLabel">MemcachedBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/MemcachedBlockCache.html#returnBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-">returnBlock</a></span>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fd52f877/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 36104b4..4cd5b10 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
@@ -194,25 +194,25 @@
 <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="typeNameLabel">Cacheable.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html#getBlockType--">getBlockType</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">BlockCacheKey.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html#getBlockType--">getBlockType</a></span>()</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="typeNameLabel">BlockCacheKey.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html#getBlockType--">getBlockType</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">Cacheable.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html#getBlockType--">getBlockType</a></span>()</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="typeNameLabel">HFileBlock.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html#getBlockType--">getBlockType</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">CachedBlock.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CachedBlock.html#getBlockType--">getBlockType</a></span>()</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="typeNameLabel">HFileBlock.BlockWritable.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.BlockWritable.html#getBlockType--">getBlockType</a></span>()</code>
-<div class="block">The type of block this data should use.</div>
-</td>
+<td class="colLast"><span class="typeNameLabel">HFileBlock.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html#getBlockType--">getBlockType</a></span>()</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="typeNameLabel">CachedBlock.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CachedBlock.html#getBlockType--">getBlockType</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">HFileBlock.BlockWritable.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.BlockWritable.html#getBlockType--">getBlockType</a></span>()</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>
@@ -220,14 +220,14 @@
 </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="typeNameLabel">HFileBlockIndex.BlockIndexWriter.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexWriter.html#getInlineBlockType--">getInlineBlockType</a></span>()</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="typeNameLabel">InlineBlockWriter.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InlineBlockWriter.html#getInlineBlockType--">getInlineBlockType</a></span>()</code>
 <div class="block">The type of blocks this block writer produces.</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="typeNameLabel">HFileBlockIndex.BlockIndexWriter.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexWriter.html#getInlineBlockType--">getInlineBlockType</a></span>()</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>
 <td class="colLast"><span class="typeNameLabel">BlockType.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html#parse-byte:A-int-int-">parse</a></span>(byte[]&nbsp;buf,
@@ -284,26 +284,26 @@ the order they are declared.</div>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">NoOpDataBlockEncoder.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/NoOpDataBlockEncoder.html#endBlockEncoding-org.apache.hadoop.hbase.io.encoding.HFileBlockEncodingContext-java.io.DataOutputStream-byte:A-org.apache.hadoop.hbase.io.hfile.BlockType-">endBlockEncoding</a></span>(<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="typeNameLabel">HFileDataBlockEncoder.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoder.html#endBlockEncoding-org.apache.hadoop.hbase.io.encoding.HFileBlockEncodingContext-java.io.DataOutputStream-byte:A-org.apache.hadoop.hbase.io.hfile.BlockType-">endBlockEncoding</a></span>(<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/8/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="typeNameLabel">HFileDataBlockEncoderImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoderImpl.html#endBlockEncoding-org.apache.hadoop.hbase.io.encoding.HFileBlockEncodingContext-java.io.DataOutputStream-byte:A-org.apache.hadoop.hbase.io.hfile.BlockType-">endBlockEncoding</a></span>(<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="typeNameLabel">NoOpDataBlockEncoder.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/NoOpDataBlockEncoder.html#endBlockEncoding-org.apache.hadoop.hbase.io.encoding.HFileBlockEncodingContext-java.io.DataOutputStream-byte:A-org.apache.hadoop.hbase.io.hfile.BlockType-">endBlockEncoding</a></span>(<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/8/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="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">HFileDataBlockEncoder.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoder.html#endBlockEncoding-org.apache.hadoop.hbase.io.encoding.HFileBlockEncodingContext-java.io.DataOutputStream-byte:A-org.apache.hadoop.hbase.io.hfile.BlockType-">endBlockEncoding</a></span>(<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="typeNameLabel">HFileDataBlockEncoderImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoderImpl.html#endBlockEncoding-org.apache.hadoop.hbase.io.encoding.HFileBlockEncodingContext-java.io.DataOutputStream-byte:A-org.apache.hadoop.hbase.io.hfile.BlockType-">endBlockEncoding</a></span>(<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/8/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/8/docs/api/java/io/DataInput.html?is-external=true";
 title="class or interface in java.io">DataInput</a></code></td>
@@ -355,27 +355,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="typeNameLabel">HFile.CachingBlockReader.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.CachingBlockReader.html#readBlock-long-long-boolean-boolean-boolean-boolean-org.apache.hadoop.hbase.io.hfile.BlockType-org.apache.hadoop.hbase.io.encoding.DataBlockEncoding-">readBlock</a></span>(long&nbsp;offset,
+<td class="colLast"><span 
class="typeNameLabel">HFileReaderImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#readBlock-long-long-boolean-boolean-boolean-boolean-org.apache.hadoop.hbase.io.hfile.BlockType-org.apache.hadoop.hbase.io.encoding.DataBlockEncoding-">readBlock</a></span>(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="typeNameLabel">HFileReaderImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#readBlock-long-long-boolean-boolean-boolean-boolean-org.apache.hadoop.hbase.io.hfile.BlockType-org.apache.hadoop.hbase.io.encoding.DataBlockEncoding-">readBlock</a></span>(long&nbsp;dataBlockOffset,
+<td class="colLast"><span 
class="typeNameLabel">HFile.CachingBlockReader.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.CachingBlockReader.html#readBlock-long-long-boolean-boolean-boolean-boolean-org.apache.hadoop.hbase.io.hfile.BlockType-org.apache.hadoop.hbase.io.encoding.DataBlockEncoding-">readBlock</a></span>(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/fd52f877/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 4174c53..a5d9806 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
@@ -245,21 +245,21 @@
 </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="typeNameLabel">HFileReaderImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#cacheConf">cacheConf</a></span></code>
+<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="typeNameLabel">HFile.WriterFactory.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.WriterFactory.html#cacheConf">cacheConf</a></span></code>&nbsp;</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="typeNameLabel">HFileBlockIndex.BlockIndexWriter.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexWriter.html#cacheConf">cacheConf</a></span></code>
 <div class="block">CacheConfig, or null if cache-on-write is disabled</div>
 </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="typeNameLabel">HFileReaderImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#cacheConf">cacheConf</a></span></code>
-<div class="block">Block cache configuration.</div>
-</td>
-</tr>
 </tbody>
 </table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Use table, listing methods, and an explanation">
@@ -413,13 +413,6 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static <a 
href="../../../../../../../org/apache/hadoop/hbase/mob/CachedMobFile.html" 
title="class in org.apache.hadoop.hbase.mob">CachedMobFile</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">CachedMobFile.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/CachedMobFile.html#create-org.apache.hadoop.fs.FileSystem-org.apache.hadoop.fs.Path-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.io.hfile.CacheConfig-">create</a></span>(org.apache.hadoop.fs.FileSystem&nbsp;fs,
-      org.apache.hadoop.fs.Path&nbsp;path,
-      org.apache.hadoop.conf.Configuration&nbsp;conf,
-      <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">CacheConfig</a>&nbsp;cacheConf)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>static <a 
href="../../../../../../../org/apache/hadoop/hbase/mob/MobFile.html" 
title="class in org.apache.hadoop.hbase.mob">MobFile</a></code></td>
 <td class="colLast"><span class="typeNameLabel">MobFile.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/MobFile.html#create-org.apache.hadoop.fs.FileSystem-org.apache.hadoop.fs.Path-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.io.hfile.CacheConfig-">create</a></span>(org.apache.hadoop.fs.FileSystem&nbsp;fs,
       org.apache.hadoop.fs.Path&nbsp;path,
@@ -428,6 +421,13 @@
 <div class="block">Creates an instance of the MobFile.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a 
href="../../../../../../../org/apache/hadoop/hbase/mob/CachedMobFile.html" 
title="class in org.apache.hadoop.hbase.mob">CachedMobFile</a></code></td>
+<td class="colLast"><span 
class="typeNameLabel">CachedMobFile.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/CachedMobFile.html#create-org.apache.hadoop.fs.FileSystem-org.apache.hadoop.fs.Path-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.io.hfile.CacheConfig-">create</a></span>(org.apache.hadoop.fs.FileSystem&nbsp;fs,
+      org.apache.hadoop.fs.Path&nbsp;path,
+      org.apache.hadoop.conf.Configuration&nbsp;conf,
+      <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">CacheConfig</a>&nbsp;cacheConf)</code>&nbsp;</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileWriter.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">StoreFileWriter</a></code></td>
 <td class="colLast"><span class="typeNameLabel">MobUtils.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/MobUtils.html#createDelFileWriter-org.apache.hadoop.conf.Configuration-org.apache.hadoop.fs.FileSystem-org.apache.hadoop.hbase.HColumnDescriptor-java.lang.String-org.apache.hadoop.fs.Path-long-org.apache.hadoop.hbase.io.compress.Compression.Algorithm-byte:A-org.apache.hadoop.hbase.io.hfile.CacheConfig-org.apache.hadoop.hbase.io.crypto.Encryption.Context-">createDelFileWriter</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
@@ -613,14 +613,14 @@
 </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="typeNameLabel">HRegionServer.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html#getCacheConfig--">getCacheConfig</a></span>()</code>&nbsp;</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="typeNameLabel">Store.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getCacheConfig--">getCacheConfig</a></span>()</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="typeNameLabel">HRegionServer.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html#getCacheConfig--">getCacheConfig</a></span>()</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="typeNameLabel">HStore.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#getCacheConfig--">getCacheConfig</a></span>()</code>&nbsp;</td>
@@ -749,11 +749,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="typeNameLabel">BlockCacheViewTmplImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmplImpl.html#cacheConfig">cacheConfig</a></span></code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">BlockCacheTmplImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmplImpl.html#cacheConfig">cacheConfig</a></span></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="typeNameLabel">BlockCacheTmplImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmplImpl.html#cacheConfig">cacheConfig</a></span></code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">BlockCacheViewTmplImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmplImpl.html#cacheConfig">cacheConfig</a></span></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/fd52f877/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 53c6379..4cf5499 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
@@ -162,14 +162,14 @@
 </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="typeNameLabel">LruBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getStats--">getStats</a></span>()</code>
-<div class="block">Get counter statistics for this cache.</div>
+<td class="colLast"><span class="typeNameLabel">BlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getStats--">getStats</a></span>()</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>
-<td class="colLast"><span class="typeNameLabel">BlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getStats--">getStats</a></span>()</code>
-<div class="block">Get the statistics for this block cache.</div>
+<td class="colLast"><span 
class="typeNameLabel">LruBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getStats--">getStats</a></span>()</code>
+<div class="block">Get counter statistics for this cache.</div>
 </td>
 </tr>
 <tr class="rowColor">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fd52f877/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 f482b23..b876ba9 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
@@ -176,17 +176,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="typeNameLabel">InclusiveCombinedBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#getBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-boolean-boolean-boolean-">getBlock</a></span>(<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="typeNameLabel">CombinedBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#getBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-boolean-boolean-boolean-">getBlock</a></span>(<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>
 </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="typeNameLabel">CombinedBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#getBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-boolean-boolean-boolean-">getBlock</a></span>(<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="typeNameLabel">BlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-boolean-boolean-boolean-">getBlock</a></span>(<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>
@@ -199,12 +201,10 @@
 </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="typeNameLabel">BlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-boolean-boolean-boolean-">getBlock</a></span>(<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="typeNameLabel">InclusiveCombinedBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#getBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-boolean-boolean-boolean-">getBlock</a></span>(<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="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>
@@ -258,16 +258,16 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">LruBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#cacheBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-">cacheBlock</a></span>(<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="typeNameLabel">BlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#cacheBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-">cacheBlock</a></span>(<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">Cache the block with the specified name and buffer.</div>
+<div class="block">Add block to cache (defaults to not in-memory).</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">BlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#cacheBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-">cacheBlock</a></span>(<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="typeNameLabel">LruBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#cacheBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-">cacheBlock</a></span>(<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>
+<div class="block">Cache the block with the specified name and buffer.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -277,17 +277,19 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">InclusiveCombinedBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#cacheBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-boolean-boolean-">cacheBlock</a></span>(<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="typeNameLabel">CombinedBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#cacheBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-boolean-boolean-">cacheBlock</a></span>(<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>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">CombinedBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#cacheBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-boolean-boolean-">cacheBlock</a></span>(<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="typeNameLabel">BlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#cacheBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-boolean-boolean-">cacheBlock</a></span>(<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>
@@ -300,12 +302,10 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">BlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#cacheBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-boolean-boolean-">cacheBlock</a></span>(<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="typeNameLabel">InclusiveCombinedBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#cacheBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-boolean-boolean-">cacheBlock</a></span>(<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="altColor">
 <td class="colFirst"><code>void</code></td>
@@ -326,17 +326,17 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">LruBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#returnBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-">returnBlock</a></span>(<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="typeNameLabel">BlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#returnBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-">returnBlock</a></span>(<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="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span 
class="typeNameLabel">LruBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#returnBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-">returnBlock</a></span>(<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="typeNameLabel">MemcachedBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/MemcachedBlockCache.html#returnBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-org.apache.hadoop.hbase.io.hfile.Cacheable-">returnBlock</a></span>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
@@ -419,9 +419,11 @@
 </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="typeNameLabel">ByteBufferIOEngine.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/ByteBufferIOEngine.html#read-long-int-org.apache.hadoop.hbase.io.hfile.CacheableDeserializer-">read</a></span>(long&nbsp;offset,
+<td class="colLast"><span class="typeNameLabel">IOEngine.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/IOEngine.html#read-long-int-org.apache.hadoop.hbase.io.hfile.CacheableDeserializer-">read</a></span>(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 IOEngine to a Cacheable object.</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>
@@ -431,18 +433,16 @@
 </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="typeNameLabel">FileIOEngine.</span><code><span class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#read-long-int-org.apache.hadoop.hbase.io.hfile.CacheableDeserializer-">read</a></span>(long&nbsp;offset,
+<td class="colLast"><span 
class="typeNameLabel">ByteBufferIOEngine.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/ByteBufferIOEngine.html#read-long-int-org.apache.hadoop.hbase.io.hfile.CacheableDeserializer-">read</a></span>(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>
-</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="typeNameLabel">IOEngine.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/IOEngine.html#read-long-int-org.apache.hadoop.hbase.io.hfile.CacheableDeserializer-">read</a></span>(long&nbsp;offset,
+<td class="colLast"><span 
class="typeNameLabel">FileIOEngine.</span><code><span class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#read-long-int-org.apache.hadoop.hbase.io.hfile.CacheableDeserializer-">read</a></span>(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>
+<div class="block">Transfers data from file to the given byte buffer</div>
 </td>
 </tr>
 </tbody>
@@ -508,9 +508,11 @@
 <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="typeNameLabel">ByteBufferIOEngine.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/ByteBufferIOEngine.html#read-long-int-org.apache.hadoop.hbase.io.hfile.CacheableDeserializer-">read</a></span>(long&nbsp;offset,
+<td class="colLast"><span class="typeNameLabel">IOEngine.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/IOEngine.html#read-long-int-org.apache.hadoop.hbase.io.hfile.CacheableDeserializer-">read</a></span>(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 IOEngine to a Cacheable object.</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>
@@ -520,18 +522,16 @@
 </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="typeNameLabel">FileIOEngine.</span><code><span class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#read-long-int-org.apache.hadoop.hbase.io.hfile.CacheableDeserializer-">read</a></span>(long&nbsp;offset,
+<td class="colLast"><span 
class="typeNameLabel">ByteBufferIOEngine.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/ByteBufferIOEngine.html#read-long-int-org.apache.hadoop.hbase.io.hfile.CacheableDeserializer-">read</a></span>(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>
-</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="typeNameLabel">IOEngine.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/IOEngine.html#read-long-int-org.apache.hadoop.hbase.io.hfile.CacheableDeserializer-">read</a></span>(long&nbsp;offset,
+<td class="colLast"><span 
class="typeNameLabel">FileIOEngine.</span><code><span class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#read-long-int-org.apache.hadoop.hbase.io.hfile.CacheableDeserializer-">read</a></span>(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>
+<div class="block">Transfers data from file to the given byte buffer</div>
 </td>
 </tr>
 <tr class="altColor">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fd52f877/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 e5b40f0..57c4172 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
@@ -201,9 +201,11 @@
 <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="typeNameLabel">ByteBufferIOEngine.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/ByteBufferIOEngine.html#read-long-int-org.apache.hadoop.hbase.io.hfile.CacheableDeserializer-">read</a></span>(long&nbsp;offset,
+<td class="colLast"><span class="typeNameLabel">IOEngine.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/IOEngine.html#read-long-int-org.apache.hadoop.hbase.io.hfile.CacheableDeserializer-">read</a></span>(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 IOEngine to a Cacheable object.</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>
@@ -213,18 +215,16 @@
 </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="typeNameLabel">FileIOEngine.</span><code><span class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#read-long-int-org.apache.hadoop.hbase.io.hfile.CacheableDeserializer-">read</a></span>(long&nbsp;offset,
+<td class="colLast"><span 
class="typeNameLabel">ByteBufferIOEngine.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/ByteBufferIOEngine.html#read-long-int-org.apache.hadoop.hbase.io.hfile.CacheableDeserializer-">read</a></span>(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>
-</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="typeNameLabel">IOEngine.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/IOEngine.html#read-long-int-org.apache.hadoop.hbase.io.hfile.CacheableDeserializer-">read</a></span>(long&nbsp;offset,
+<td class="colLast"><span 
class="typeNameLabel">FileIOEngine.</span><code><span class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#read-long-int-org.apache.hadoop.hbase.io.hfile.CacheableDeserializer-">read</a></span>(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>
+<div class="block">Transfers data from file to the given byte buffer</div>
 </td>
 </tr>
 <tr class="altColor">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fd52f877/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 d072739..41d538e 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
@@ -154,11 +154,11 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/8/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="typeNameLabel">LruBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#iterator--">iterator</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">BlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#iterator--">iterator</a></span>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/8/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="typeNameLabel">BlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#iterator--">iterator</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">LruBlockCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#iterator--">iterator</a></span>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/8/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/fd52f877/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 574e895..c8e453c 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
@@ -120,11 +120,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="typeNameLabel">HFile.Reader.</span><code><span class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.Reader.html#getTrailer--">getTrailer</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">HFileReaderImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#getTrailer--">getTrailer</a></span>()</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="typeNameLabel">HFileReaderImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#getTrailer--">getTrailer</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">HFile.Reader.</span><code><span class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.Reader.html#getTrailer--">getTrailer</a></span>()</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/fd52f877/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 4af49bb..14f47dd 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
@@ -143,17 +143,17 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">NoOpDataBlockEncoder.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/NoOpDataBlockEncoder.html#saveMetadata-org.apache.hadoop.hbase.io.hfile.HFile.Writer-">saveMetadata</a></span>(<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>
+<td class="colLast"><span 
class="typeNameLabel">HFileDataBlockEncoder.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoder.html#saveMetadata-org.apache.hadoop.hbase.io.hfile.HFile.Writer-">saveMetadata</a></span>(<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="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">HFileDataBlockEncoderImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoderImpl.html#saveMetadata-org.apache.hadoop.hbase.io.hfile.HFile.Writer-">saveMetadata</a></span>(<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>
+<td class="colLast"><span 
class="typeNameLabel">NoOpDataBlockEncoder.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/NoOpDataBlockEncoder.html#saveMetadata-org.apache.hadoop.hbase.io.hfile.HFile.Writer-">saveMetadata</a></span>(<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="typeNameLabel">HFileDataBlockEncoder.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoder.html#saveMetadata-org.apache.hadoop.hbase.io.hfile.HFile.Writer-">saveMetadata</a></span>(<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>
+<td class="colLast"><span 
class="typeNameLabel">HFileDataBlockEncoderImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoderImpl.html#saveMetadata-org.apache.hadoop.hbase.io.hfile.HFile.Writer-">saveMetadata</a></span>(<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>
@@ -203,18 +203,18 @@
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span 
class="typeNameLabel">RowColBloomContext.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/util/RowColBloomContext.html#addLastBloomKey-org.apache.hadoop.hbase.io.hfile.HFile.Writer-">addLastBloomKey</a></span>(<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>abstract void</code></td>
 <td class="colLast"><span 
class="typeNameLabel">BloomContext.</span><code><span class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/util/BloomContext.html#addLastBloomKey-org.apache.hadoop.hbase.io.hfile.HFile.Writer-">addLastBloomKey</a></span>(<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">Adds the last bloom key to the HFile Writer as part of 
StorefileWriter close.</div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">RowBloomContext.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/util/RowBloomContext.html#addLastBloomKey-org.apache.hadoop.hbase.io.hfile.HFile.Writer-">addLastBloomKey</a></span>(<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="typeNameLabel">RowColBloomContext.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/util/RowColBloomContext.html#addLastBloomKey-org.apache.hadoop.hbase.io.hfile.HFile.Writer-">addLastBloomKey</a></span>(<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>
+<td class="colLast"><span 
class="typeNameLabel">RowBloomContext.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../../org/apache/hadoop/hbase/util/RowBloomContext.html#addLastBloomKey-org.apache.hadoop.hbase.io.hfile.HFile.Writer-">addLastBloomKey</a></span>(<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>static <a 
href="../../../../../../../org/apache/hadoop/hbase/util/BloomFilterWriter.html" 
title="interface in 
org.apache.hadoop.hbase.util">BloomFilterWriter</a></code></td>

Reply via email to