You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2016/04/29 05:56:43 UTC

[4/4] accumulo git commit: Jekyll build from gh-pages:964cf81

Jekyll build from gh-pages:964cf81

Favor markdown over html

Use markdown tables whenever possible
Fix broken html tables with markdown in wikisearch example
Use markdown for glossary
Fix sections with markdown instead of html in bylaws
Other minor fixes using markdown over html


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e938fe2b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e938fe2b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e938fe2b

Branch: refs/heads/asf-site
Commit: e938fe2bd27017efa6784332ffb87fdf925cc608
Parents: 6db455f
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Apr 28 23:54:38 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Apr 28 23:56:07 2016 -0400

----------------------------------------------------------------------
 bylaws.html              | 229 ++++++-----
 css/accumulo.css         |   4 +-
 downloads/index.html     |  58 +--
 example/wikisearch.html  | 927 +++++++++++++++++++++++++-----------------
 feed.xml                 |   4 +-
 glossary.html            | 143 ++++---
 index.html               |  23 +-
 mailing_list.html        |  73 ++--
 notable_features.html    |  45 +-
 old_documentation.html   |  14 +-
 papers/index.html        | 144 ++++---
 release_notes/1.5.1.html | 103 ++---
 release_notes/1.5.2.html |  55 +--
 release_notes/1.5.3.html |  54 +--
 release_notes/1.5.4.html |  54 +--
 release_notes/1.6.0.html | 206 +++++-----
 release_notes/1.6.1.html |  55 +--
 release_notes/1.6.2.html |  87 ++--
 release_notes/1.6.3.html |  86 ++--
 release_notes/1.6.4.html |  38 +-
 release_notes/1.6.5.html |  86 ++--
 release_notes/1.7.0.html |  86 ++--
 release_notes/1.7.1.html |  86 ++--
 23 files changed, 1504 insertions(+), 1156 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e938fe2b/bylaws.html
----------------------------------------------------------------------
diff --git a/bylaws.html b/bylaws.html
index 016d9df..64eae08 100644
--- a/bylaws.html
+++ b/bylaws.html
@@ -337,34 +337,37 @@ See the <a href="https://www.apache.org/dev/pmc">PMC Guide</a> for more informat
 <p>Decisions regarding the project are made by votes on the primary project development mailing list: dev@accumulo.apache.org. Where necessary, PMC voting may take place on the private Accumulo PMC mailing list: private@accumulo.apache.org. Votes are clearly indicated by a subject line starting with [VOTE]. A vote message may only pertain to a single item’s approval; multiple items should be separated into multiple messages. Voting is carried out by replying to the vote mail. A vote may take on one of four forms, defined below.</p>
 
 <table class="table">
-  <tr>
-    <th>Vote</th>
-    <th>Meaning</th>
-  </tr>
-  <tr>
-    <td>+1</td>
-    <td>'Yes,' 'Agree,' or 'The action should be performed.' In general, this vote also indicates a willingness on the behalf of the voter to 'make it happen'.</td>
-  </tr>
-  <tr>
-    <td>+0</td>
-    <td>This vote indicates a willingness for the action under consideration to go ahead. The voter, however, will not be able to help.</td>
-  </tr>
-  <tr>
-    <td>-0</td>
-    <td>This vote indicates that the voter does not, in general, agree with the proposed action but is not concerned enough to prevent the action going ahead.</td>
-  </tr>
-  <tr>
-    <td>-1</td>
-    <td>'No', 'Disagree', or 'The action should not be performed.' On issues where consensus is required, this vote counts as a veto. All vetoes must contain an explanation of why the veto is appropriate. Vetoes with no explanation are void. It may also be appropriate for a -1 vote to include an alternative course of action.</td>
-  </tr>
+  <thead>
+    <tr>
+      <th>Vote</th>
+      <th>Meaning</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>+1</td>
+      <td><em>Yes</em>, <em>Agree</em>, or <em>The action should be performed</em>. In general, this vote also indicates a willingness on the behalf of the voter to <em>make it happen</em>.</td>
+    </tr>
+    <tr>
+      <td>+0</td>
+      <td>This vote indicates a willingness for the action under consideration to go ahead. The voter, however, will not be able to help.</td>
+    </tr>
+    <tr>
+      <td>-0</td>
+      <td>This vote indicates that the voter does not, in general, agree with the proposed action but is not concerned enough to prevent the action going ahead.</td>
+    </tr>
+    <tr>
+      <td>-1</td>
+      <td><em>No</em>, <em>Disagree</em>, or <em>The action should not be performed</em>. On issues where consensus is required, this vote counts as a veto. All vetoes must contain an explanation of why the veto is appropriate. Vetoes with no explanation are void. It may also be appropriate for a -1 vote to include an alternative course of action.</td>
+    </tr>
+  </tbody>
 </table>
 
 <p>All participants in the Accumulo project are encouraged to vote. For technical decisions, only the votes of active committers are binding. Non-binding votes are still useful for those with binding votes to understand the perception of an action across the wider Accumulo community. For PMC decisions, only the votes of active PMC members are binding.</p>
 
 <p>See the <a href="governance/voting">voting page</a> for more details on the mechanics of voting.</p>
 
-<p><a id="CTR"></a>
-## Commit Then Review (CTR)</p>
+<h2 id="commit-then-review-ctr">Commit Then Review (CTR)</h2>
 
 <p>Voting can also be applied to changes to the Accumulo codebase. Under the Commit Then Review policy, committers can make changes to the codebase without seeking approval beforehand, and the changes are assumed to be approved unless an objection is raised. Only if an objection is raised must a vote take place on the code change.</p>
 
@@ -375,22 +378,26 @@ See the <a href="https://www.apache.org/dev/pmc">PMC Guide</a> for more informat
 <p>These are the types of approvals that can be sought. Different actions require different types of approvals.</p>
 
 <table class="table">
-  <tr>
-    <th>Approval Type</th>
-    <th>Definition</th>
-  </tr>
-  <tr>
-    <td>Consensus Approval</td>
-    <td>A consensus approval vote passes with 3 binding +1 votes and no binding vetoes.</td>
-  </tr>
-  <tr>
-    <td>Majority Approval</td>
-    <td>A majority approval vote passes with 3 binding +1 votes and more binding +1 votes than -1 votes.</td>
-  </tr>
-  <tr>
-    <td>Lazy Approval (or Lazy Consensus)</td>
-    <td>An action with lazy approval is implicitly allowed unless a -1 vote is received, at which time, depending on the type of action, either majority approval or consensus approval must be obtained.  Lazy Approval can be either <em>stated</em> or <em>assumed</em>, as detailed on the <a href="governance/lazyConsensus">lazy consensus page</a>.</td>
-  </tr>
+  <thead>
+    <tr>
+      <th>Approval Type</th>
+      <th>Definition</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Consensus Approval</td>
+      <td>A consensus approval vote passes with 3 binding +1 votes and no binding vetoes.</td>
+    </tr>
+    <tr>
+      <td>Majority Approval</td>
+      <td>A majority approval vote passes with 3 binding +1 votes and more binding +1 votes than -1 votes.</td>
+    </tr>
+    <tr>
+      <td>Lazy Approval (or Lazy Consensus)</td>
+      <td>An action with lazy approval is implicitly allowed unless a -1 vote is received, at which time, depending on the type of action, either majority approval or consensus approval must be obtained.  Lazy Approval can be either <em>stated</em> or <em>assumed</em>, as detailed on the <a href="governance/lazyConsensus">lazy consensus page</a>.</td>
+    </tr>
+  </tbody>
 </table>
 
 <h2 id="vetoes">Vetoes</h2>
@@ -403,79 +410,83 @@ See the <a href="https://www.apache.org/dev/pmc">PMC Guide</a> for more informat
 
 <p>This section describes the various actions which are undertaken within the project, the corresponding approval required for that action and those who have binding votes over the action. It also specifies the minimum length of time that a vote must remain open, measured in days. In general, votes should not be called at times when it is known that interested members of the project will be unavailable.</p>
 
-<p>For Code Change actions, a committer may choose to employ assumed or stated Lazy Approval under the <a href="#CTR">CTR</a> policy. Assumed Lazy Approval has no minimum length of time before the change can be made.</p>
+<p>For Code Change actions, a committer may choose to employ assumed or stated Lazy Approval under the <a href="#commit-then-review-ctr">CTR</a> policy. Assumed Lazy Approval has no minimum length of time before the change can be made.</p>
 
 <table class="table">
-  <tr>
-    <th>Action</th>
-    <th>Description</th>
-    <th>Approval</th>
-    <th>Binding Votes</th>
-    <th>Min. Length (days)</th>
-  </tr>
-  <tr>
-    <td>Code Change</td>
-    <td>A change made to a codebase of the project. This includes source code, documentation, website content, etc.</td>
-    <td>Lazy approval, moving to consensus approval upon veto</td>
-    <td>Active committers</td>
-    <td>1</td>
-  </tr>
-  <tr>
-    <td>Release Plan</td>
-    <td>Defines the timetable and actions for an upcoming release. The plan also nominates a Release Manager.</td>
-    <td>Lazy approval, moving to majority approval upon veto</td>
-    <td>Active committers</td>
-    <td>3</td>
-  </tr>
-  <tr>
-    <td>Release Plan Cancellation</td>
-    <td>Cancels an active release plan, due to a need to re-plan (e.g., discovery of a major issue).</td>
-    <td>Majority approval</td>
-    <td>Active committers</td>
-    <td>3</td>
-  </tr>
-  <tr>
-    <td>Product Release</td>
-    <td>Accepts or rejects a release candidate as an official release of the project.</td>
-    <td>Majority approval</td>
-    <td>Active PMC members</td>
-    <td>3</td>
-  </tr>
-  <tr>
-    <td>Adoption of New Codebase</td>
-    <td>When the codebase for an existing, released product is to be replaced with an alternative codebase. If such a vote fails to gain approval, the existing code base will continue. This also covers the creation of new sub-projects within the project.</td>
-    <td>Consensus approval</td>
-    <td>Active PMC members</td>
-    <td>7</td>
-  </tr>
-  <tr>
-    <td>New Committer</td>
-    <td>When a new committer is proposed for the project.</td>
-    <td>Consensus approval</td>
-    <td>Active PMC members</td>
-    <td>3</td>
-  </tr>
-  <tr>
-    <td>New PMC Member</td>
-    <td>When a committer is proposed for the PMC.</td>
-    <td>Consensus approval</td>
-    <td>Active PMC members</td>
-    <td>3</td>
-  </tr>
-  <tr>
-    <td>New PMC Chair</td>
-    <td>When a new PMC chair is chosen to succeed an outgoing chair.</td>
-    <td>Consensus approval</td>
-    <td>Active PMC members</td>
-    <td>3</td>
-  </tr>
-  <tr>
-    <td>Modifying Bylaws</td>
-    <td>Modifying this document.</td>
-    <td>Consensus approval</td>
-    <td>Active PMC members</td>
-    <td>7</td>
-  </tr>
+  <thead>
+    <tr>
+      <th>Action</th>
+      <th>Description</th>
+      <th>Approval</th>
+      <th>Binding Votes</th>
+      <th>Min. Length (days)</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Code Change</td>
+      <td>A change made to a codebase of the project. This includes source code, documentation, website content, etc.</td>
+      <td>Lazy approval, moving to consensus approval upon veto</td>
+      <td>Active committers</td>
+      <td>1</td>
+    </tr>
+    <tr>
+      <td>Release Plan</td>
+      <td>Defines the timetable and actions for an upcoming release. The plan also nominates a Release Manager.</td>
+      <td>Lazy approval, moving to majority approval upon veto</td>
+      <td>Active committers</td>
+      <td>3</td>
+    </tr>
+    <tr>
+      <td>Release Plan Cancellation</td>
+      <td>Cancels an active release plan, due to a need to re-plan (e.g., discovery of a major issue).</td>
+      <td>Majority approval</td>
+      <td>Active committers</td>
+      <td>3</td>
+    </tr>
+    <tr>
+      <td>Product Release</td>
+      <td>Accepts or rejects a release candidate as an official release of the project.</td>
+      <td>Majority approval</td>
+      <td>Active PMC members</td>
+      <td>3</td>
+    </tr>
+    <tr>
+      <td>Adoption of New Codebase</td>
+      <td>When the codebase for an existing, released product is to be replaced with an alternative codebase. If such a vote fails to gain approval, the existing code base will continue. This also covers the creation of new sub-projects within the project.</td>
+      <td>Consensus approval</td>
+      <td>Active PMC members</td>
+      <td>7</td>
+    </tr>
+    <tr>
+      <td>New Committer</td>
+      <td>When a new committer is proposed for the project.</td>
+      <td>Consensus approval</td>
+      <td>Active PMC members</td>
+      <td>3</td>
+    </tr>
+    <tr>
+      <td>New PMC Member</td>
+      <td>When a committer is proposed for the PMC.</td>
+      <td>Consensus approval</td>
+      <td>Active PMC members</td>
+      <td>3</td>
+    </tr>
+    <tr>
+      <td>New PMC Chair</td>
+      <td>When a new PMC chair is chosen to succeed an outgoing chair.</td>
+      <td>Consensus approval</td>
+      <td>Active PMC members</td>
+      <td>3</td>
+    </tr>
+    <tr>
+      <td>Modifying Bylaws</td>
+      <td>Modifying this document.</td>
+      <td>Consensus approval</td>
+      <td>Active PMC members</td>
+      <td>7</td>
+    </tr>
+  </tbody>
 </table>
 
 <p>No other voting actions are defined; all other actions should presume Lazy Approval (defaulting to Consensus Approval upon veto). If an action is voted on multiple times, or if a different approval type is desired, these bylaws should be amended to include the action.</p>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e938fe2b/css/accumulo.css
----------------------------------------------------------------------
diff --git a/css/accumulo.css b/css/accumulo.css
index 5f1969c..a87a2c0 100644
--- a/css/accumulo.css
+++ b/css/accumulo.css
@@ -74,11 +74,11 @@ footer > p {
     border-collapse:collapse;
 }
 
-#release_notes_testing, #release_notes_testing tbody tr, #release_notes_testing tbody tr th, #release_notes_testing tbody tr td {
+#release_notes_testing, #release_notes_testing tr, #release_notes_testing th, #release_notes_testing td {
     border: 2px solid black;
 }
 
-#release_notes_testing tbody tr th, #release_notes_testing tbody tr td {
+#release_notes_testing th, #release_notes_testing td {
     padding: 5px;
 }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e938fe2b/downloads/index.html
----------------------------------------------------------------------
diff --git a/downloads/index.html b/downloads/index.html
index 1e7133e..043faef 100644
--- a/downloads/index.html
+++ b/downloads/index.html
@@ -314,7 +314,7 @@ var mirrorsCallback = function(json) {
 };
 
 // get mirrors when page is ready
-var mirrorURL = "/mirrors.cgi"; // http[s]://accumulo.apache.org/mirrors.cgi
+var mirrorURL = "http://accumulo.apache.org/mirrors.cgi"; // http[s]://accumulo.apache.org/mirrors.cgi
 $(function() { $.getJSON(mirrorURL + "?as_json", mirrorsCallback); });
 
 </script>
@@ -326,31 +326,33 @@ $(function() { $.getJSON(mirrorURL + "?as_json", mirrorsCallback); });
 
 <h2 id="current-releases">Current Releases</h2>
 
-<h3 id="span-classlabel-label-primarylatestspan">1.7.1 <span class="label label-primary">latest</span></h3>
+<h3 id="latest-label-label-primary-">1.7.1 <strong class="label label-primary">latest</strong></h3>
 
 <p>The most recent Apache Accumulo™ release is version 1.7.1. See the <a href="/release_notes/1.7.1" title="1.7.1 Release Notes">release notes</a> and <a href="https://issues.apache.org/jira/browse/ACCUMULO/fixforversion/12329940" title="1.7.1 CHANGES">CHANGES</a>.</p>
 
 <p>For convenience, <a href="https://www.apache.org/dist/accumulo/1.7.1/MD5SUM" title="1.7.1 MD5 file hashes">MD5</a> and <a href="https://www.apache.org/dist/accumulo/1.7.1/SHA1SUM" title="1.7.1 SHA1 file hashes">SHA1</a> hashes are also available.</p>
 
 <table class="table">
-<tr>
-<th>Generic Binaries</th>
-<td><a href="https://www.apache.org/dyn/closer.lua/accumulo/1.7.1/accumulo-1.7.1-bin.tar.gz" link-suffix="/accumulo/1.7.1/accumulo-1.7.1-bin.tar.gz" class="download_external" id="/downloads/accumulo-1.7.1-bin.tar.gz">accumulo-1.7.1-bin.tar.gz</a></td>
-<td><a href="https://www.apache.org/dist/accumulo/1.7.1/accumulo-1.7.1-bin.tar.gz.asc">ASC</a></td>
-</tr>
-<tr>
-<th>Source</th>
-<td><a href="https://www.apache.org/dyn/closer.lua/accumulo/1.7.1/accumulo-1.7.1-src.tar.gz" link-suffix="/accumulo/1.7.1/accumulo-1.7.1-src.tar.gz" class="download_external" id="/downloads/accumulo-1.7.1-src.tar.gz">accumulo-1.7.1-src.tar.gz</a></td>
-<td><a href="https://www.apache.org/dist/accumulo/1.7.1/accumulo-1.7.1-src.tar.gz.asc">ASC</a></td>
-</tr>
+  <tbody>
+    <tr>
+      <td><strong>Generic Binaries</strong></td>
+      <td><a class="download_external" link-suffix="/accumulo/1.7.1/accumulo-1.7.1-bin.tar.gz" id="/downloads/accumulo-1.7.1-bin.tar.gz" href="https://www.apache.org/dyn/closer.lua/accumulo/1.7.1/accumulo-1.7.1-bin.tar.gz">accumulo-1.7.1-bin.tar.gz</a></td>
+      <td><a href="https://www.apache.org/dist/accumulo/1.7.1/accumulo-1.7.1-bin.tar.gz.asc">ASC</a></td>
+    </tr>
+    <tr>
+      <td><strong>Source</strong></td>
+      <td><a class="download_external" link-suffix="/accumulo/1.7.1/accumulo-1.7.1-src.tar.gz" id="/downloads/accumulo-1.7.1-src.tar.gz" href="https://www.apache.org/dyn/closer.lua/accumulo/1.7.1/accumulo-1.7.1-src.tar.gz">accumulo-1.7.1-src.tar.gz</a></td>
+      <td><a href="https://www.apache.org/dist/accumulo/1.7.1/accumulo-1.7.1-src.tar.gz.asc">ASC</a></td>
+    </tr>
+  </tbody>
 </table>
 
 <h4 id="documentation">1.7 Documentation</h4>
 <ul>
-  <li><a href="https://github.com/apache/accumulo/blob/rel/1.7.1/README.md" class="download_external" id="/1.7/README">README</a></li>
+  <li><a class="download_external" id="/1.7/README" href="https://github.com/apache/accumulo/blob/rel/1.7.1/README.md">README</a></li>
   <li><a href="/1.7/accumulo_user_manual" title="1.7 user manual">HTML User Manual</a></li>
   <li><a href="/1.7/examples" title="1.7 examples">Examples</a></li>
-  <li><a href="/1.7/apidocs" class="download_external" id="/1.7/apidocs">Javadoc</a></li>
+  <li><a class="download_external" id="/1.7/apidocs" href="/1.7/apidocs">Javadoc</a></li>
 </ul>
 
 <h3 id="section">1.6.5</h3>
@@ -360,25 +362,27 @@ $(function() { $.getJSON(mirrorURL + "?as_json", mirrorsCallback); });
 <p>For convenience, <a href="https://www.apache.org/dist/accumulo/1.6.5/MD5SUM" title="1.6.5 MD5 file hashes">MD5</a> and <a href="https://www.apache.org/dist/accumulo/1.6.5/SHA1SUM" title="1.6.5 SHA1 file hashes">SHA1</a> hashes are also available.</p>
 
 <table class="table">
-<tr>
-<th>Generic Binaries</th>
-<td><a href="https://www.apache.org/dyn/closer.lua/accumulo/1.6.5/accumulo-1.6.5-bin.tar.gz" link-suffix="/accumulo/1.6.5/accumulo-1.6.5-bin.tar.gz" class="download_external" id="/downloads/accumulo-1.6.5-bin.tar.gz">accumulo-1.6.5-bin.tar.gz</a></td>
-<td><a href="https://www.apache.org/dist/accumulo/1.6.5/accumulo-1.6.5-bin.tar.gz.asc">ASC</a></td>
-</tr>
-<tr>
-<th>Source</th>
-<td><a href="https://www.apache.org/dyn/closer.lua/accumulo/1.6.5/accumulo-1.6.5-src.tar.gz" link-suffix="/accumulo/1.6.5/accumulo-1.6.5-src.tar.gz" class="download_external" id="/downloads/accumulo-1.6.5-src.tar.gz">accumulo-1.6.5-src.tar.gz</a></td>
-<td><a href="https://www.apache.org/dist/accumulo/1.6.5/accumulo-1.6.5-src.tar.gz.asc">ASC</a></td>
-</tr>
+  <tbody>
+    <tr>
+      <td><strong>Generic Binaries</strong></td>
+      <td><a class="download_external" link-suffix="/accumulo/1.6.5/accumulo-1.6.5-bin.tar.gz" id="/downloads/accumulo-1.6.5-bin.tar.gz" href="https://www.apache.org/dyn/closer.lua/accumulo/1.6.5/accumulo-1.6.5-bin.tar.gz">accumulo-1.6.5-bin.tar.gz</a></td>
+      <td><a href="https://www.apache.org/dist/accumulo/1.7.1/accumulo-1.7.1-bin.tar.gz.asc">ASC</a></td>
+    </tr>
+    <tr>
+      <td><strong>Source</strong></td>
+      <td><a class="download_external" link-suffix="/accumulo/1.6.5/accumulo-1.6.5-src.tar.gz" id="/downloads/accumulo-1.6.5-src.tar.gz" href="https://www.apache.org/dyn/closer.lua/accumulo/1.6.5/accumulo-1.6.5-src.tar.gz">accumulo-1.6.5-src.tar.gz</a></td>
+      <td><a href="https://www.apache.org/dist/accumulo/1.7.1/accumulo-1.7.1-src.tar.gz.asc">ASC</a></td>
+    </tr>
+  </tbody>
 </table>
 
 <h4 id="documentation-1">1.6 Documentation</h4>
 <ul>
-  <li><a href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=README;hb=rel/1.6.5" class="download_external" id="/1.6/README">README</a></li>
-  <li><a href="https://search.maven.org/remotecontent?filepath=org/apache/accumulo/accumulo-docs/1.6.5/accumulo-docs-1.6.5-user-manual.pdf" class="download_external" id="/1.6/accumulo_user_manual.pdf">PDF manual</a></li>
+  <li><a class="download_external" id="/1.6/README" href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=README;hb=rel/1.6.5">README</a></li>
+  <li><a class="download_external" id="/1.6/accumulo_user_manual.pdf" href="https://search.maven.org/remotecontent?filepath=org/apache/accumulo/accumulo-docs/1.6.5/accumulo-docs-1.6.5-user-manual.pdf">PDF manual</a></li>
   <li><a href="/1.6/accumulo_user_manual" title="1.6 user manual">html manual</a></li>
   <li><a href="/1.6/examples" title="1.6 examples">examples</a></li>
-  <li><a href="/1.6/apidocs" class="download_external" id="/1.6/apidocs">Javadoc</a></li>
+  <li><a class="download_external" id="/1.6/apidocs" href="/1.6/apidocs">Javadoc</a></li>
 </ul>
 
 <h2 id="older-releases">Older releases</h2>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e938fe2b/example/wikisearch.html
----------------------------------------------------------------------
diff --git a/example/wikisearch.html b/example/wikisearch.html
index aeba341..b51cc20 100644
--- a/example/wikisearch.html
+++ b/example/wikisearch.html
@@ -237,384 +237,587 @@
 
 <h2 id="sample-application">Sample Application</h2>
 
-<p>Starting with release 1.4, Accumulo includes an example web application that provides a flexible,  scalable search over the articles of Wikipedia, a widely available medium-sized corpus.</p>
+<p>Starting with release 1.4, Accumulo includes an example web application that
+provides a flexible, scalable search over the articles of Wikipedia, a widely
+available medium-sized corpus.</p>
 
-<p>The example uses an indexing technique helpful for doing multiple logical tests against content.  In this case, we can perform a word search on Wikipedia articles.   The sample application takes advantage of 3 unique capabilities of Accumulo:</p>
+<p>The example uses an indexing technique helpful for doing multiple logical tests
+against content. In this case, we can perform a word search on Wikipedia
+articles. The sample application takes advantage of 3 unique capabilities of
+Accumulo:</p>
 
 <ol>
-  <li>Extensible iterators that operate within the distributed tablet servers of the key-value store</li>
-  <li>Custom aggregators which can efficiently condense information during the various life-cycles of the log-structured merge tree</li>
-  <li>Custom load balancing, which ensures that a table is evenly distributed on all tablet servers</li>
+  <li>Extensible iterators that operate within the distributed tablet servers of
+the key-value store</li>
+  <li>Custom aggregators which can efficiently condense information during the
+various life-cycles of the log-structured merge tree</li>
+  <li>Custom load balancing, which ensures that a table is evenly distributed on
+all tablet servers</li>
 </ol>
 
-<p>In the example, Accumulo tracks the cardinality of all terms as elements are ingested.  If the cardinality is small enough, it will track the set of documents by term directly.  For example:</p>
+<p>In the example, Accumulo tracks the cardinality of all terms as elements are
+ingested. If the cardinality is small enough, it will track the set of
+documents by term directly. For example:</p>
 
 <style type="text/css">
-table, td, th {
+table.wiki, table.wiki td, table.wiki th {
   padding-right: 5px;
   padding-left: 5px;
   border: 1px solid black;
   border-collapse: collapse;
 }
-td {
+table.wiki td {
   text-align: right;
 }
-.lt {
-  text-align: left;
-}
 </style>
 
-<table>
-<tr>
-<th>Row (word)</th>
-<th colspan="2">Value (count, document list)</th>
-</tr><tr>
-<td>Octopus
-<td>2
-<td class="lt">[Document 57, Document 220]
-<tr>
-<td>Other
-<td>172,849
-<td class="lt">[]
-<tr>
-<td>Ostrich
-<td>1
-<td class="lt">[Document 901]
-
-
-
-Searches can be optimized to focus on low-cardinality terms.  To create these counts, the example installs “aggregators” which are used to combine inserted values.  The ingester just writes simple  “(Octopus, 1, Document 57)” tuples.  The tablet servers then used the installed aggregators to merge the cells as the data is re-written, or queried.  This reduces the in-memory locking required to update high-cardinality terms, and defers aggregation to a later time, where it can be done more efficiently.
-
-The example also creates a reverse word index to map each word to the document in which it appears. But it does this by choosing an arbitrary partition for the document.  The article, and the word index for the article are grouped together into the same partition.  For example:
-
-<table>
-<tr>
-<th>Row (partition)
-<th>Column Family
-<th>Column Qualifier
-<th>Value
-<tr>
-<td>1
-<td>D
-<td>Document 57
-<td>“smart Octopus”
-<tr>
-<td>1
-<td>Word, Octopus
-<td>Document 57
-<td>
-<tr>
-<td>1
-<td>Word, smart
-<td>Document 57
-<td>
-<tr>
-<td>...
-<td>
-<td>
-<td>
-<tr>
-<td>2
-<td>D
-<td>Document 220
-<td>“big Octopus”
-<tr>
-<td>2
-<td>Word, big
-<td>Document 220
-<td>
-<tr>
-<td>2
-<td>Word, Octopus
-<td>Document 220
-<td>
-
-
-Of course, there would be large numbers of documents in each partition, and the elements of those documents would be interlaced according to their sort order.
-
-By dividing the index space into partitions, the multi-word searches can be performed in parallel across all the nodes.  Also, by grouping the document together with its index, a document can be retrieved without a second request from the client.  The query “octopus” and “big” will be performed on all the servers, but only those partitions for which the low-cardinality term “octopus” can be found by using the aggregated reverse index information.  The query for a document is performed by extensions provided in the example.  These extensions become part of the tablet server's iterator stack.  By cloning the underlying iterators, the query extensions can seek to specific words within the index, and when it finds a matching document, it can then seek to the document location and retrieve the contents.
-
-We loaded the example on a  cluster of 10 servers, each with 12 cores, and 32G RAM, 6 500G drives.  Accumulo tablet servers were allowed a maximum of 3G of working memory, of which 2G was dedicated to caching file data.
-
-Following the instructions in the example, the Wikipedia XML data for articles was loaded for English, Spanish and German languages into 10 partitions.  The data is not partitioned by language: multiple languages were used to get a larger set of test data.  The data load took around 8 hours, and has not been optimized for scale.  Once the data was loaded, the content was compacted which took about 35 minutes.
-
-The example uses the language-specific tokenizers available from the Apache Lucene project for Wikipedia data.
-
-Original files:
-
-<table>
-<tr>
-<th>Articles
-<th>Compressed size
-<th>Filename
-<tr>
-<td>1.3M
-<td>2.5G
-<td>dewiki-20111120-pages-articles.xml.bz2
-<tr>
-<td>3.8M
-<td>7.9G
-<td>enwiki-20111115-pages-articles.xml.bz2
-<tr>
-<td>0.8M
-<td>1.4G
-<td>eswiki-20111112-pages-articles.xml.bz2
-
-
-The resulting tables:
-
-    &gt; du -p wiki.*
-          47,325,680,634 [wiki]
-           5,125,169,305 [wikiIndex]
-                     413 [wikiMetadata]
-           5,521,690,682 [wikiReverseIndex]
-
-Roughly a 6:1 increase in size.
-
-We performed the following queries, and repeated the set 5 times.  The query language is much more expressive than what is shown below.  The actual query specified that these words were to be found in the body of the article.  Regular expressions, searches within titles, negative tests, etc are available.
-
-<table>
-<tr>
-<th>Query
-<th colspan="5">Samples (seconds)
-<th>Matches
-<th>Result Size
-<tr>
-<td>“old” and “man” and “sea”
-<td>4.07
-<td>3.79
-<td>3.65
-<td>3.85
-<td>3.67
-<td>22,956
-<td>3,830,102
-<tr>
-<td>“paris” and “in” and “the” and “spring”
-<td>3.06
-<td>3.06
-<td>2.78
-<td>3.02
-<td>2.92
-<td>10,755
-<td>1,757,293
-<tr>
-<td>“rubber” and “ducky” and “ernie”
-<td>0.08
-<td>0.08
-<td>0.1
-<td>0.11
-<td>0.1
-<td>6
-<td>808
-<tr>
-<td>“fast”  and ( “furious” or “furriest”) 
-<td>1.34
-<td>1.33
-<td>1.3
-<td>1.31
-<td>1.31
-<td>2,973
-<td>493,800
-<tr>
-<td>“slashdot” and “grok”
-<td>0.06
-<td>0.06
-<td>0.06
-<td>0.06
-<td>0.06
-<td>14
-<td>2,371
-<tr>
-<td>“three” and “little” and “pigs”
-<td>0.92
-<td>0.91
-<td>0.9
-<td>1.08
-<td>0.88
-<td>2,742
-<td>481,531
-
-
-Because the terms are tested together within the tablet server, even fairly high-cardinality terms such as “old,” “man,” and “sea” can be tested efficiently, without needing to return to the client, or make distributed calls between servers to perform the intersection between terms.
-
-For reference, here are the cardinalities for all the terms in the query (remember, this is across all languages loaded):
-
-<table>
-<tr> <th>Term <th> Cardinality
-<tr> <td> ducky <td> 795
-<tr> <td> ernie <td> 13,433
-<tr> <td> fast <td> 166,813
-<tr> <td> furious <td> 10,535
-<tr> <td> furriest <td> 45
-<tr> <td> grok <td> 1,168
-<tr> <td> in <td> 1,884,638
-<tr> <td> little <td> 320,748
-<tr> <td> man <td> 548,238
-<tr> <td> old <td> 720,795
-<tr> <td> paris <td> 232,464
-<tr> <td> pigs <td> 8,356
-<tr> <td> rubber <td> 17,235
-<tr> <td> sea <td> 247,231
-<tr> <td> slashdot <td> 2,343
-<tr> <td> spring <td> 125,605
-<tr> <td> the <td> 3,509,498
-<tr> <td> three <td> 718,810
-
-
-
-Accumulo supports caching index information, which is turned on by default, and for the non-index blocks of a file, which is not. After turning on data block caching for the wiki table:
-
-<table>
-<tr>
-<th>Query
-<th colspan="5">Samples (seconds)
-<tr>
-<td>“old” and “man” and “sea”
-<td>2.47
-<td>2.48
-<td>2.51
-<td>2.48
-<td>2.49
-<tr>
-<td>“paris” and “in” and “the” and “spring”
-<td>1.33
-<td>1.42
-<td>1.6
-<td>1.61
-<td>1.47
-<tr>
-<td>“rubber” and “ducky” and “ernie”
-<td>0.07
-<td>0.08
-<td>0.07
-<td>0.07
-<td>0.07
-<tr>
-<td>“fast” and ( “furious” or “furriest”) 
-<td>1.28
-<td>0.78
-<td>0.77
-<td>0.79
-<td>0.78
-<tr>
-<td>“slashdot” and “grok”
-<td>0.04
-<td>0.04
-<td>0.04
-<td>0.04
-<td>0.04
-<tr>
-<td>“three” and “little” and “pigs”
-<td>0.55
-<td>0.32
-<td>0.32
-<td>0.31
-<td>0.27
-
-<table>
-<p>
-For comparison, these are the cold start lookup times (restart Accumulo, and drop the operating system disk cache):
-
-<table>
-<tr>
-<th>Query
-<th>Sample
-<tr>
-<td>“old” and “man” and “sea”
-<td>13.92
-<tr>
-<td>“paris” and “in” and “the” and “spring”
-<td>8.46
-<tr>
-<td>“rubber” and “ducky” and “ernie”
-<td>2.96
-<tr>
-<td>“fast” and ( “furious” or “furriest”) 
-<td>6.77
-<tr>
-<td>“slashdot” and “grok”
-<td>4.06
-<tr>
-<td>“three” and “little” and “pigs”
-<td>8.13
-
-
-### Random Query Load
-
-Random queries were generated using common english words.  A uniform random sample of 3 to 5 words taken from the 10000 most common words in the Project Gutenberg's online text collection were joined with “and”.  Words containing anything other than letters (such as contractions) were not used.  A client was started simultaneously on each of the 10 servers and each ran 100 random queries (1000 queries total).
-
-
-<table>
-<tr>
-<th>Time
-<th>Count
-<tr>
-<td>41.97
-<td>440,743
-<tr>
-<td>41.61
-<td>320,522
-<tr>
-<td>42.11
-<td>347,969
-<tr>
-<td>38.32
-<td>275,655
-
-
-### Query Load During Ingest
-
-The English wikipedia data was re-ingested on top of the existing, compacted data. The following  query samples were taken in 5 minute intervals while ingesting 132 articles/second:
-
-
-<table>
-<tr>
-<th>Query
-<th colspan="5">Samples (seconds)
-<tr>
-<td>“old” and “man” and “sea”
-<td>4.91
-<td>3.92
-<td>11.58
-<td>9.86
-<td>10.21
-<tr>
-<td>“paris” and “in” and “the” and “spring”
-<td>5.03
-<td>3.37
-<td>12.22
-<td>3.29
-<td>9.46
-<tr>
-<td>“rubber” and “ducky” and “ernie”
-<td>4.21
-<td>2.04
-<td>8.57
-<td>1.54
-<td>1.68
-<tr>
-<td>“fast”  and ( “furious” or “furriest”) 
-<td>5.84
-<td>2.83
-<td>2.56
-<td>3.12
-<td>3.09
-<tr>
-<td>“slashdot” and “grok”
-<td>5.68
-<td>2.62
-<td>2.2
-<td>2.78
-<td>2.8
-<tr>
-<td>“three” and “little” and “pigs”
-<td>7.82
-<td>3.42
-<td>2.79
-<td>3.29
-<td>3.3
-
-</td></td></td></td></td></td></tr></td></td></td></td></td></td></tr></td></td></td></td></td></td></tr></td></td></td></td></td></td></tr></td></td></td></td></td></td></tr></td></td></td></td></td></td></tr></th></th></tr></table></td></td></tr></td></td></tr></td></td></tr></td></td></tr></th></th></tr></table></td></td></tr></td></td></tr></td></td></tr></td></td></tr></td></td></tr></td></td></tr></th></th></tr></table></p></table></td></td></td></td></td></td></tr></td></td></td></td></td></td></tr></td></td></td></td></td></td></tr></td></td></td></td></td></td></tr></td></td></td></td></td></td></tr></td></td></td></td></td></td></tr></th></th></tr></table></td></td></tr></td></td></tr></td></td></tr></td></td></tr></td></td></tr></td></td></tr></td></td></tr></td></td></tr></td></td></tr></td></td></tr></td></td></tr></td></td></tr></td></td></tr></td></td></tr></td></td></tr></td></td></tr></td></td></tr></td></td></tr></th></th></tr></table></td></td></td></td></td></td>
 </td></td></tr></td></td></td></td></td></td></td></td></tr></td></td></td></td></td></td></td></td></tr></td></td></td></td></td></td></td></td></tr></td></td></td></td></td></td></td></td></tr></td></td></td></td></td></td></td></td></tr></th></th></th></th></tr></table></td></td></td></tr></td></td></td></tr></td></td></td></tr></th></th></th></tr></table></td></td></td></td></tr></td></td></td></td></tr></td></td></td></td></tr></td></td></td></td></tr></td></td></td></td></tr></td></td></td></td></tr></td></td></td></td></tr></th></th></th></th></tr></table></td></td></td></tr></td></td></td></tr></td></td></td></tr></table>
+<table class="wiki">
+  <thead>
+    <tr>
+      <th>Row (word)</th>
+      <th style="text-align: right">Value (count)</th>
+      <th style="text-align: left">Value (document list)</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Octopus</td>
+      <td style="text-align: right">2</td>
+      <td style="text-align: left">[Document 57, Document 220]</td>
+    </tr>
+    <tr>
+      <td>Other</td>
+      <td style="text-align: right">172,849</td>
+      <td style="text-align: left">[]</td>
+    </tr>
+    <tr>
+      <td>Ostrich</td>
+      <td style="text-align: right">1</td>
+      <td style="text-align: left">[Document 901]</td>
+    </tr>
+  </tbody>
+</table>
+
+<p>Searches can be optimized to focus on low-cardinality terms. To create these
+counts, the example installs “aggregators” which are used to combine inserted
+values. The ingester just writes simple “(Octopus, 1, Document 57)” tuples.
+The tablet servers then used the installed aggregators to merge the cells as
+the data is re-written, or queried. This reduces the in-memory locking
+required to update high-cardinality terms, and defers aggregation to a later
+time, where it can be done more efficiently.</p>
+
+<p>The example also creates a reverse word index to map each word to the document
+in which it appears. But it does this by choosing an arbitrary partition for
+the document. The article, and the word index for the article are grouped
+together into the same partition. For example:</p>
+
+<table class="wiki">
+  <thead>
+    <tr>
+      <th>Row (partition)</th>
+      <th>Column Family</th>
+      <th>Column Qualifier</th>
+      <th>Value</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>1</td>
+      <td>D</td>
+      <td>Document 57</td>
+      <td>“smart Octopus”</td>
+    </tr>
+    <tr>
+      <td>1</td>
+      <td>Word, Octopus</td>
+      <td>Document 57</td>
+      <td> </td>
+    </tr>
+    <tr>
+      <td>1</td>
+      <td>Word, smart</td>
+      <td>Document 57</td>
+      <td> </td>
+    </tr>
+    <tr>
+      <td>…</td>
+      <td> </td>
+      <td> </td>
+      <td> </td>
+    </tr>
+    <tr>
+      <td>2</td>
+      <td>D</td>
+      <td>Document 220</td>
+      <td>“big Octopus”</td>
+    </tr>
+    <tr>
+      <td>2</td>
+      <td>Word, big</td>
+      <td>Document 220</td>
+      <td> </td>
+    </tr>
+    <tr>
+      <td>2</td>
+      <td>Word, Octopus</td>
+      <td>Document 220</td>
+      <td> </td>
+    </tr>
+  </tbody>
+</table>
+
+<p>Of course, there would be large numbers of documents in each partition, and the
+elements of those documents would be interlaced according to their sort order.</p>
+
+<p>By dividing the index space into partitions, the multi-word searches can be
+performed in parallel across all the nodes. Also, by grouping the document
+together with its index, a document can be retrieved without a second request
+from the client. The query “octopus” and “big” will be performed on all the
+servers, but only those partitions for which the low-cardinality term “octopus”
+can be found by using the aggregated reverse index information. The query for a
+document is performed by extensions provided in the example. These extensions
+become part of the tablet server’s iterator stack. By cloning the underlying
+iterators, the query extensions can seek to specific words within the index,
+and when it finds a matching document, it can then seek to the document
+location and retrieve the contents.</p>
+
+<p>We loaded the example on a cluster of 10 servers, each with 12 cores, and 32G
+RAM, 6 500G drives. Accumulo tablet servers were allowed a maximum of 3G of
+working memory, of which 2G was dedicated to caching file data.</p>
+
+<p>Following the instructions in the example, the Wikipedia XML data for articles
+was loaded for English, Spanish and German languages into 10 partitions. The
+data is not partitioned by language: multiple languages were used to get a
+larger set of test data. The data load took around 8 hours, and has not been
+optimized for scale. Once the data was loaded, the content was compacted which
+took about 35 minutes.</p>
+
+<p>The example uses the language-specific tokenizers available from the Apache
+Lucene project for Wikipedia data.</p>
+
+<p>Original files:</p>
+
+<table class="wiki">
+  <thead>
+    <tr>
+      <th>Articles</th>
+      <th>Compressed size</th>
+      <th>Filename</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>1.3M</td>
+      <td>2.5G</td>
+      <td>dewiki-20111120-pages-articles.xml.bz2</td>
+    </tr>
+    <tr>
+      <td>3.8M</td>
+      <td>7.9G</td>
+      <td>enwiki-20111115-pages-articles.xml.bz2</td>
+    </tr>
+    <tr>
+      <td>0.8M</td>
+      <td>1.4G</td>
+      <td>eswiki-20111112-pages-articles.xml.bz2</td>
+    </tr>
+  </tbody>
+</table>
+
+<p>The resulting tables:</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>&gt; du -p wiki.*
+      47,325,680,634 [wiki]
+       5,125,169,305 [wikiIndex]
+                 413 [wikiMetadata]
+       5,521,690,682 [wikiReverseIndex]
+</code></pre>
+</div>
+
+<p>Roughly a 6:1 increase in size.</p>
+
+<p>We performed the following queries, and repeated the set 5 times. The query
+language is much more expressive than what is shown below. The actual query
+specified that these words were to be found in the body of the article. Regular
+expressions, searches within titles, negative tests, etc are available.</p>
+
+<table class="wiki">
+  <thead>
+    <tr>
+      <th>Query</th>
+      <th>Sample 1 (seconds)</th>
+      <th>Sample 2 (seconds)</th>
+      <th>Sample 3 (seconds)</th>
+      <th>Sample 4 (seconds)</th>
+      <th>Sample 5 (seconds)</th>
+      <th>Matches</th>
+      <th>Result Size</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>“old” and “man” and “sea”</td>
+      <td>4.07</td>
+      <td>3.79</td>
+      <td>3.65</td>
+      <td>3.85</td>
+      <td>3.67</td>
+      <td>22,956</td>
+      <td>3,830,102</td>
+    </tr>
+    <tr>
+      <td>“paris” and “in” and “the” and “spring”</td>
+      <td>3.06</td>
+      <td>3.06</td>
+      <td>2.78</td>
+      <td>3.02</td>
+      <td>2.92</td>
+      <td>10,755</td>
+      <td>1,757,293</td>
+    </tr>
+    <tr>
+      <td>“rubber” and “ducky” and “ernie”</td>
+      <td>0.08</td>
+      <td>0.08</td>
+      <td>0.1</td>
+      <td>0.11</td>
+      <td>0.1</td>
+      <td>6</td>
+      <td>808</td>
+    </tr>
+    <tr>
+      <td>“fast” and ( “furious” or “furriest”)</td>
+      <td>1.34</td>
+      <td>1.33</td>
+      <td>1.3</td>
+      <td>1.31</td>
+      <td>1.31</td>
+      <td>2,973</td>
+      <td>493,800</td>
+    </tr>
+    <tr>
+      <td>“slashdot” and “grok”</td>
+      <td>0.06</td>
+      <td>0.06</td>
+      <td>0.06</td>
+      <td>0.06</td>
+      <td>0.06</td>
+      <td>14</td>
+      <td>2,371</td>
+    </tr>
+    <tr>
+      <td>“three” and “little” and “pigs”</td>
+      <td>0.92</td>
+      <td>0.91</td>
+      <td>0.9</td>
+      <td>1.08</td>
+      <td>0.88</td>
+      <td>2,742</td>
+      <td>481,531</td>
+    </tr>
+  </tbody>
+</table>
+
+<p>Because the terms are tested together within the tablet server, even fairly
+high-cardinality terms such as “old,” “man,” and “sea” can be tested
+efficiently, without needing to return to the client, or make distributed calls
+between servers to perform the intersection between terms.</p>
+
+<p>For reference, here are the cardinalities for all the terms in the query
+(remember, this is across all languages loaded):</p>
+
+<table class="wiki">
+  <thead>
+    <tr>
+      <th>Term</th>
+      <th>Cardinality</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>ducky</td>
+      <td>795</td>
+    </tr>
+    <tr>
+      <td>ernie</td>
+      <td>13,433</td>
+    </tr>
+    <tr>
+      <td>fast</td>
+      <td>166,813</td>
+    </tr>
+    <tr>
+      <td>furious</td>
+      <td>10,535</td>
+    </tr>
+    <tr>
+      <td>furriest</td>
+      <td>45</td>
+    </tr>
+    <tr>
+      <td>grok</td>
+      <td>1,168</td>
+    </tr>
+    <tr>
+      <td>in</td>
+      <td>1,884,638</td>
+    </tr>
+    <tr>
+      <td>little</td>
+      <td>320,748</td>
+    </tr>
+    <tr>
+      <td>man</td>
+      <td>548,238</td>
+    </tr>
+    <tr>
+      <td>old</td>
+      <td>720,795</td>
+    </tr>
+    <tr>
+      <td>paris</td>
+      <td>232,464</td>
+    </tr>
+    <tr>
+      <td>pigs</td>
+      <td>8,356</td>
+    </tr>
+    <tr>
+      <td>rubber</td>
+      <td>17,235</td>
+    </tr>
+    <tr>
+      <td>sea</td>
+      <td>247,231</td>
+    </tr>
+    <tr>
+      <td>slashdot</td>
+      <td>2,343</td>
+    </tr>
+    <tr>
+      <td>spring</td>
+      <td>125,605</td>
+    </tr>
+    <tr>
+      <td>the</td>
+      <td>3,509,498</td>
+    </tr>
+    <tr>
+      <td>three</td>
+      <td>718,810</td>
+    </tr>
+  </tbody>
+</table>
+
+<p>Accumulo supports caching index information, which is turned on by default, and
+for the non-index blocks of a file, which is not. After turning on data block
+  caching for the wiki table:</p>
+
+<table class="wiki">
+  <thead>
+    <tr>
+      <th>Query</th>
+      <th>Sample 1 (seconds)</th>
+      <th>Sample 2 (seconds)</th>
+      <th>Sample 3 (seconds)</th>
+      <th>Sample 4 (seconds)</th>
+      <th>Sample 5 (seconds)</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>“old” and “man” and “sea”</td>
+      <td>2.47</td>
+      <td>2.48</td>
+      <td>2.51</td>
+      <td>2.48</td>
+      <td>2.49</td>
+    </tr>
+    <tr>
+      <td>“paris” and “in” and “the” and “spring”</td>
+      <td>1.33</td>
+      <td>1.42</td>
+      <td>1.6</td>
+      <td>1.61</td>
+      <td>1.47</td>
+    </tr>
+    <tr>
+      <td>“rubber” and “ducky” and “ernie”</td>
+      <td>0.07</td>
+      <td>0.08</td>
+      <td>0.07</td>
+      <td>0.07</td>
+      <td>0.07</td>
+    </tr>
+    <tr>
+      <td>“fast” and ( “furious” or “furriest”)</td>
+      <td>1.28</td>
+      <td>0.78</td>
+      <td>0.77</td>
+      <td>0.79</td>
+      <td>0.78</td>
+    </tr>
+    <tr>
+      <td>“slashdot” and “grok”</td>
+      <td>0.04</td>
+      <td>0.04</td>
+      <td>0.04</td>
+      <td>0.04</td>
+      <td>0.04</td>
+    </tr>
+    <tr>
+      <td>“three” and “little” and “pigs”</td>
+      <td>0.55</td>
+      <td>0.32</td>
+      <td>0.32</td>
+      <td>0.31</td>
+      <td>0.27</td>
+    </tr>
+  </tbody>
+</table>
+
+<p>For comparison, these are the cold start lookup times (restart Accumulo, and
+drop the operating system disk cache):</p>
+
+<table class="wiki">
+  <thead>
+    <tr>
+      <th>Query</th>
+      <th>Sample</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>“old” and “man” and “sea”</td>
+      <td>13.92</td>
+    </tr>
+    <tr>
+      <td>“paris” and “in” and “the” and “spring”</td>
+      <td>8.46</td>
+    </tr>
+    <tr>
+      <td>“rubber” and “ducky” and “ernie”</td>
+      <td>2.96</td>
+    </tr>
+    <tr>
+      <td>“fast” and ( “furious” or “furriest”)</td>
+      <td>6.77</td>
+    </tr>
+    <tr>
+      <td>“slashdot” and “grok”</td>
+      <td>4.06</td>
+    </tr>
+    <tr>
+      <td>“three” and “little” and “pigs”</td>
+      <td>8.13</td>
+    </tr>
+  </tbody>
+</table>
+
+<h3 id="random-query-load">Random Query Load</h3>
+
+<p>Random queries were generated using common english words. A uniform random
+sample of 3 to 5 words taken from the 10000 most common words in the Project
+Gutenberg’s online text collection were joined with “and”. Words containing
+anything other than letters (such as contractions) were not used. A client was
+started simultaneously on each of the 10 servers and each ran 100 random
+queries (1000 queries total).</p>
+
+<table class="wiki">
+  <thead>
+    <tr>
+      <th>Time</th>
+      <th>Count</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>41.97</td>
+      <td>440,743</td>
+    </tr>
+    <tr>
+      <td>41.61</td>
+      <td>320,522</td>
+    </tr>
+    <tr>
+      <td>42.11</td>
+      <td>347,969</td>
+    </tr>
+    <tr>
+      <td>38.32</td>
+      <td>275,655</td>
+    </tr>
+  </tbody>
+</table>
+
+<h3 id="query-load-during-ingest">Query Load During Ingest</h3>
+
+<p>The English wikipedia data was re-ingested on top of the existing, compacted
+data. The following query samples were taken in 5 minute intervals while
+ingesting 132 articles/second:</p>
+
+<table class="wiki">
+  <thead>
+    <tr>
+      <th>Query</th>
+      <th>Sample 1 (seconds)</th>
+      <th>Sample 2 (seconds)</th>
+      <th>Sample 3 (seconds)</th>
+      <th>Sample 4 (seconds)</th>
+      <th>Sample 5 (seconds)</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>“old” and “man” and “sea”</td>
+      <td>4.91</td>
+      <td>3.92</td>
+      <td>11.58</td>
+      <td>9.86</td>
+      <td>10.21</td>
+    </tr>
+    <tr>
+      <td>“paris” and “in” and “the” and “spring”</td>
+      <td>5.03</td>
+      <td>3.37</td>
+      <td>12.22</td>
+      <td>3.29</td>
+      <td>9.46</td>
+    </tr>
+    <tr>
+      <td>“rubber” and “ducky” and “ernie”</td>
+      <td>4.21</td>
+      <td>2.04</td>
+      <td>8.57</td>
+      <td>1.54</td>
+      <td>1.68</td>
+    </tr>
+    <tr>
+      <td>“fast” and ( “furious” or “furriest”)</td>
+      <td>5.84</td>
+      <td>2.83</td>
+      <td>2.56</td>
+      <td>3.12</td>
+      <td>3.09</td>
+    </tr>
+    <tr>
+      <td>“slashdot” and “grok”</td>
+      <td>5.68</td>
+      <td>2.62</td>
+      <td>2.2</td>
+      <td>2.78</td>
+      <td>2.8</td>
+    </tr>
+    <tr>
+      <td>“three” and “little” and “pigs”</td>
+      <td>7.82</td>
+      <td>3.42</td>
+      <td>2.79</td>
+      <td>3.29</td>
+      <td>3.3</td>
+    </tr>
+  </tbody>
+</table>
 
       </div>
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e938fe2b/feed.xml
----------------------------------------------------------------------
diff --git a/feed.xml b/feed.xml
index c10c4e0..2840926 100644
--- a/feed.xml
+++ b/feed.xml
@@ -6,8 +6,8 @@
 </description>
     <link>https://accumulo.apache.org/</link>
     <atom:link href="https://accumulo.apache.org/feed.xml" rel="self" type="application/rss+xml"/>
-    <pubDate>Thu, 28 Apr 2016 10:26:45 -0400</pubDate>
-    <lastBuildDate>Thu, 28 Apr 2016 10:26:45 -0400</lastBuildDate>
+    <pubDate>Thu, 28 Apr 2016 23:56:03 -0400</pubDate>
+    <lastBuildDate>Thu, 28 Apr 2016 23:56:03 -0400</lastBuildDate>
     <generator>Jekyll v3.0.3</generator>
     
   </channel>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e938fe2b/glossary.html
----------------------------------------------------------------------
diff --git a/glossary.html b/glossary.html
index 219d1a5..cf6464f 100644
--- a/glossary.html
+++ b/glossary.html
@@ -239,56 +239,99 @@
         <h1 class="title">Glossary</h1>
         
         <dl>
-<dt>authorizations</dt>
-<dd>a set of strings associated with a user or with a particular scan that will be used to determine which key/value pairs are visible to the user.</dd>
-<dt>cell</dt>
-<dd>a set of key/value pairs whose keys differ only in timestamp.</dd>
-<dt>column</dt>
-<dd>the portion of the key that sorts after the row and is divided into family, qualifier, and visibility.</dd>
-<dt>column family</dt>
-<dd>the portion of the key that sorts second and controls locality groups, the row/column hybrid nature of accumulo.</dd>
-<dt>column qualifier</dt>
-<dd>the portion of the key that sorts third and provides additional key uniqueness.</dd>
-<dt>column visibility</dt>
-<dd>the portion of the key that sorts fourth and controls user access to individual key/value pairs. Visibilities are boolean AND (&amp;) and OR (|) combinations of authorization strings with parentheses required to determine ordering, e.g. (AB&amp;C)|DEF.</dd>
-<dt>iterator</dt>
-<dd>a mechanism for modifying tablet-local portions of the key/value space. Iterators are used for standard administrative tasks as well as for custom processing.</dd>
-<dt>iterator priority</dt>
-<dd>an iterator must be configured with a particular scope and priority.  When a tablet server enters that scope, it will instantiate iterators in priority order starting from the smallest priority and ending with the largest, and apply each to the data read before rewriting the data or sending the data to the user.</dd>
-<dt>iterator scopes</dt>
-<dd>the possible scopes for iterators are where the tablet server is already reading and/or writing data: minor compaction / flush time (<em>minc</em> scope), major compaction / file merging time (<em>majc</em> scope), and query time (<em>scan</em> scope).</dd>
-<dt>gc</dt>
-<dd>process that identifies temporary files in HDFS that are no longer needed by any process, and deletes them.</dd>
-<dt>key</dt>
-<dd>the key into the distributed sorted map which is accumulo.  The key is subdivided into row, column, and timestamp.  The column is further divided into  family, qualifier, and visibility.</dd>
-<dt>locality group</dt>
-<dd>a set of column families that will be grouped together on disk.  With no locality groups configured, data is stored on disk in row order.  If each column family were configured to be its own locality group, the data for each column would be stored separately, in row order.  Configuring sets of columns into locality groups is a compromise between the two approaches and will improve performance when multiple columns are accessed in the same scan.</dd>
-<dt>log-structured merge-tree</dt>
-<dd>the sorting / flushing / merging scheme on which BigTable's design is based.</dd>
-<dt>logger</dt>
-<dd>in 1.4 and older, process that accepts updates to tablet servers and writes them to local on-disk storage for redundancy. in 1.5 the functionality was subsumed by the tablet server and datanode with HDFS writes.</dd>
-<dt>major compaction</dt>
-<dd>merging multiple files into a single file.  If all of a tablet's files are merged into a single file, it is called a <em>full major compaction</em>.</dd>
-<dt>master</dt>
-<dd>process that detects and responds to tablet failures, balances load across tablet servers by assigning and migrating tablets when required, coordinates table operations, and handles tablet server logistics (startup, shutdown, recovery).</dd>
-<dt>minor compaction</dt>
-<dd>flushing data from memory to disk.  Usually this creates a new file for a tablet, but if the memory flushed is merge-sorted in with data from an existing file (replacing that file), it is called a <em>merging minor compaction</em>.</dd>
-<dt>monitor</dt>
-<dd>process that displays status and usage information for all Accumulo components.</dd>
-<dt>permissions</dt>
-<dd>administrative abilities that must be given to a user such as creating tables or users and changing permissions or configuration parameters.</dd>
-<dt>row</dt>
-<dd>the portion of the key that controls atomicity.  Keys with the same row are guaranteed to remain on a single tablet hosted by a single tablet server, therefore multiple key/value pairs can be added to or removed from a row at the same time. The row is used for the primary sorting of the key.</dd>
-<dt>scan</dt>
-<dd>reading a range of key/value pairs.</dd>
-<dt>tablet</dt>
-<dd>a contiguous key range; the unit of work for a tablet server.</dd>
-<dt>tablet servers</dt>
-<dd>a set of servers that hosts reads and writes for tablets.  Each server hosts a distinct set of tablets at any given time, but the tablets may be hosted by different servers over time.</dd>
-<dt>timestamp</dt>
-<dd>the portion of the key that controls versioning.  Otherwise identical keys with differing timestamps are considered to be versions of a single <em>cell</em>.  Accumulo can be configured to keep the <em>N</em> newest versions of each <em>cell</em>.  When a deletion entry is inserted, it deletes all earlier versions for its cell.</dd>
-<dt>value</dt>
-<dd>immutable bytes associated with a particular key.</dd>
+  <dt>authorizations</dt>
+  <dd>a set of strings associated with a user or with a particular scan that will
+be used to determine which key/value pairs are visible to the user.</dd>
+  <dt>cell</dt>
+  <dd>a set of key/value pairs whose keys differ only in timestamp.</dd>
+  <dt>column</dt>
+  <dd>the portion of the key that sorts after the row and is divided into family,
+qualifier, and visibility.</dd>
+  <dt>column family</dt>
+  <dd>the portion of the key that sorts second and controls locality groups, the
+row/column hybrid nature of accumulo.</dd>
+  <dt>column qualifier</dt>
+  <dd>the portion of the key that sorts third and provides additional key
+uniqueness.</dd>
+  <dt>column visibility</dt>
+  <dd>the portion of the key that sorts fourth and controls user access to
+individual key/value pairs. Visibilities are boolean AND (&amp;) and OR (|)
+combinations of authorization strings with parentheses required to determine
+ordering, e.g. (AB&amp;C)|DEF.</dd>
+  <dt>iterator</dt>
+  <dd>a mechanism for modifying tablet-local portions of the key/value space.
+Iterators are used for standard administrative tasks as well as for custom
+processing.</dd>
+  <dt>iterator priority</dt>
+  <dd>an iterator must be configured with a particular scope and priority. When a
+tablet server enters that scope, it will instantiate iterators in priority
+order starting from the smallest priority and ending with the largest, and
+apply each to the data read before rewriting the data or sending the data to
+the user.</dd>
+  <dt>iterator scopes</dt>
+  <dd>the possible scopes for iterators are where the tablet server is already
+reading and/or writing data: minor compaction / flush time (<em>minc</em>
+scope), major compaction / file merging time (<em>majc</em> scope), and query
+time (<em>scan</em> scope).</dd>
+  <dt>gc</dt>
+  <dd>process that identifies temporary files in HDFS that are no longer needed by
+any process, and deletes them.</dd>
+  <dt>key</dt>
+  <dd>the key into the distributed sorted map which is accumulo. The key is
+subdivided into row, column, and timestamp. The column is further divided into
+family, qualifier, and visibility.</dd>
+  <dt>locality group</dt>
+  <dd>a set of column families that will be grouped together on disk. With no
+locality groups configured, data is stored on disk in row order. If each
+column family were configured to be its own locality group, the data for each
+column would be stored separately, in row order. Configuring sets of columns
+into locality groups is a compromise between the two approaches and will
+improve performance when multiple columns are accessed in the same scan.</dd>
+  <dt>log-structured merge-tree</dt>
+  <dd>the sorting / flushing / merging scheme on which BigTable’s design is based.</dd>
+  <dt>logger</dt>
+  <dd>in 1.4 and older, process that accepts updates to tablet servers and writes
+them to local on-disk storage for redundancy. in 1.5 the functionality was
+subsumed by the tablet server and datanode with HDFS writes.</dd>
+  <dt>major compaction</dt>
+  <dd>merging multiple files into a single file. If all of a tablet’s files are
+merged into a single file, it is called a <em>full major compaction</em>.</dd>
+  <dt>master</dt>
+  <dd>process that detects and responds to tablet failures, balances load across
+tablet servers by assigning and migrating tablets when required, coordinates
+table operations, and handles tablet server logistics (startup, shutdown,
+recovery).</dd>
+  <dt>minor compaction</dt>
+  <dd>flushing data from memory to disk. Usually this creates a new file for a
+tablet, but if the memory flushed is merge-sorted in with data from an existing
+file (replacing that file), it is called a <em>merging minor compaction</em>.</dd>
+  <dt>monitor</dt>
+  <dd>process that displays status and usage information for all Accumulo
+components.</dd>
+  <dt>permissions</dt>
+  <dd>administrative abilities that must be given to a user such as creating tables
+or users and changing permissions or configuration parameters.</dd>
+  <dt>row</dt>
+  <dd>the portion of the key that controls atomicity. Keys with the same row are
+guaranteed to remain on a single tablet hosted by a single tablet server,
+therefore multiple key/value pairs can be added to or removed from a row at the
+same time. The row is used for the primary sorting of the key.</dd>
+  <dt>scan</dt>
+  <dd>reading a range of key/value pairs.</dd>
+  <dt>tablet</dt>
+  <dd>a contiguous key range; the unit of work for a tablet server.</dd>
+  <dt>tablet servers</dt>
+  <dd>a set of servers that hosts reads and writes for tablets. Each server hosts
+a distinct set of tablets at any given time, but the tablets may be hosted by
+different servers over time.</dd>
+  <dt>timestamp</dt>
+  <dd>the portion of the key that controls versioning. Otherwise identical keys
+with differing timestamps are considered to be versions of a single
+<em>cell</em>. Accumulo can be configured to keep the <em>N</em> newest
+versions of each <em>cell</em>. When a deletion entry is inserted, it deletes
+all earlier versions for its cell.</dd>
+  <dt>value</dt>
+  <dd>immutable bytes associated with a particular key.</dd>
 </dl>
 
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e938fe2b/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index 9674634..86ebf93 100644
--- a/index.html
+++ b/index.html
@@ -238,22 +238,21 @@
         
         <p><br /></p>
 <div class="jumbotron" style="text-align: center">
-<p>
-The Apache Accumulo&trade; sorted, distributed key/value store is a robust, scalable, high performance data storage and retrieval system.  
-</p>
+<p>The Apache Accumulo&trade; sorted, distributed key/value store is a robust, scalable, high performance data storage and retrieval system.</p>
 <a class="btn btn-success btn-lg" href="downloads/" role="button"><span class="glyphicon glyphicon-download"></span> Download</a>
 </div>
 
-<p>Apache Accumulo is based on Google’s <a href="https://research.google.com/archive/bigtable.html" title="BigTable">BigTable</a> design and is built on
-top of <a href="https://hadoop.apache.org" title="Apache Hadoop">Apache Hadoop</a>, <a href="https://zookeeper.apache.org" title="Apache Zookeeper">Apache Zookeeper</a>, and <a href="https://thrift.apache.org" title="Apache Thrift">Apache Thrift</a>.  Apache Accumulo features a few novel 
-improvements on the BigTable design in the form of cell-based access control and a server-side
-programming mechanism that can modify key/value pairs at various points in the
-data management process.  Other notable improvements and feature are outlined
-<a href="notable_features">here</a>.</p>
+<p>Apache Accumulo is based on Google’s <a href="https://research.google.com/archive/bigtable.html" title="BigTable">BigTable</a> design and is built on top
+of <a href="https://hadoop.apache.org" title="Apache Hadoop">Apache Hadoop</a>, <a href="https://zookeeper.apache.org" title="Apache Zookeeper">Apache Zookeeper</a>, and <a href="https://thrift.apache.org" title="Apache Thrift">Apache Thrift</a>. Apache
+Accumulo features a few novel improvements on the BigTable design in the form
+of cell-based access control and a server-side programming mechanism that can
+modify key/value pairs at various points in the data management process. Other
+notable improvements and feature are outlined <a href="notable_features">here</a>.</p>
 
-<p>Google published the design of BigTable in 2006.  Several other open source
-projects have implemented aspects of this design including <a href="https://hbase.apache.org" title="Apache HBase">Apache HBase</a>, <a href="http://hypertable.com" title="Hypertable">Hypertable</a>,
-and <a href="https://cassandra.apache.org" title="Apache Cassandra">Apache Cassandra</a>.  Accumulo began its development in 2008 and joined the <a href="https://www.apache.org" title="Apache Software Foundation">Apache community</a> in 2011.</p>
+<p>Google published the design of BigTable in 2006. Several other open source
+projects have implemented aspects of this design including <a href="https://hbase.apache.org" title="Apache HBase">Apache HBase</a>,
+<a href="http://hypertable.com" title="Hypertable">Hypertable</a>, and <a href="https://cassandra.apache.org" title="Apache Cassandra">Apache Cassandra</a>. Accumulo began its development in
+2008 and joined the <a href="https://www.apache.org" title="Apache Software Foundation">Apache community</a> in 2011.</p>
 
 
       </div>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e938fe2b/mailing_list.html
----------------------------------------------------------------------
diff --git a/mailing_list.html b/mailing_list.html
index 0c6b4e0..017e9ed 100644
--- a/mailing_list.html
+++ b/mailing_list.html
@@ -243,40 +243,45 @@ that search providers linked on this page are not part of the <a href="https://m
 mailing list archives</a>.</p>
 
 <table class="table">
-
-<tr>
-<th>user</th>
-<td>For general user questions, help, and announcements.</td>
-<td><a href="https://mail-archives.apache.org/mod_mbox/accumulo-user" class="btn btn-primary btn-xs"><span class="glyphicon glyphicon-book"></span> Archive</a> <a href="https://www.mail-archive.com/user@accumulo.apache.org/" class="btn btn-info btn-xs"><span class="glyphicon glyphicon-search"></span> Search</a></td>
-<td><a href="mailto:user-subscribe@accumulo.apache.org" class="btn btn-success btn-xs"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a href="mailto:user-unsubscribe@accumulo.apache.org" class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a></td>
-<td><a href="mailto:user@accumulo.apache.org" class="btn btn-warning btn-xs"><span class="glyphicon glyphicon-envelope"></span> Post</a></td>
-</tr>
-
-<tr>
-<th>dev</th>
-<td>For anyone interested in contributing or following development activities.
-It is recommended that you also subscribe to <b>notifications</b>.</td>
-<td><a href="https://mail-archives.apache.org/mod_mbox/accumulo-dev" class="btn btn-primary btn-xs"><span class="glyphicon glyphicon-book"></span> Archive</a> <a href="https://www.mail-archive.com/dev@accumulo.apache.org/" class="btn btn-info btn-xs"><span class="glyphicon glyphicon-search"></span> Search</a></td>
-<td><a href="mailto:dev-subscribe@accumulo.apache.org" class="btn btn-success btn-xs"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a href="mailto:dev-unsubscribe@accumulo.apache.org" class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a></td>
-<td><a href="mailto:dev@accumulo.apache.org" class="btn btn-warning btn-xs"><span class="glyphicon glyphicon-envelope"></span> Post</a></td>
-</tr>
-
-<tr>
-<th>commits</th>
-<td>For following commits.</td>
-<td><a href="https://mail-archives.apache.org/mod_mbox/accumulo-commits" class="btn btn-primary btn-xs"><span class="glyphicon glyphicon-book"></span> Archive</a> <a href="https://www.mail-archive.com/commits@accumulo.apache.org/" class="btn btn-info btn-xs"><span class="glyphicon glyphicon-search"></span> Search</a></td>
-<td><a href="mailto:commits-subscribe@accumulo.apache.org" class="btn btn-success btn-xs"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a href="mailto:commits-unsubscribe@accumulo.apache.org" class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a></td>
-<td></td>
-</tr>
-
-<tr>
-<th>notifications</th>
-<td>For following JIRA notifications.</td>
-<td><a href="https://mail-archives.apache.org/mod_mbox/accumulo-notifications" class="btn btn-primary btn-xs"><span class="glyphicon glyphicon-book"></span> Archive</a> <a href="https://www.mail-archive.com/notifications@accumulo.apache.org/" class="btn btn-info btn-xs"><span class="glyphicon glyphicon-search"></span> Search</a></td>
-<td><a href="mailto:notifications-subscribe@accumulo.apache.org" class="btn btn-success btn-xs"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a href="mailto:notifications-unsubscribe@accumulo.apache.org" class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a></td>
-<td></td>
-</tr>
-
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>Description</th>
+      <th>Read</th>
+      <th>Follow</th>
+      <th>Post</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td><strong>user</strong></td>
+      <td>General user questions, help, and announcements</td>
+      <td><a class="btn btn-primary btn-xs" href="https://mail-archives.apache.org/mod_mbox/accumulo-user"><span class="glyphicon glyphicon-book"></span> Archive</a> <a class="btn btn-info btn-xs" href="https://www.mail-archive.com/user@accumulo.apache.org"><span class="glyphicon glyphicon-search"></span> Search</a></td>
+      <td><a class="btn btn-success btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#117;&#115;&#101;&#114;&#045;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a class="btn btn-danger btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#117;&#115;&#101;&#114;&#045;&#117;&#110;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a></td>
+      <td><a class="btn btn-warning btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#117;&#115;&#101;&#114;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-envelope"></span> Post</a></td>
+    </tr>
+    <tr>
+      <td><strong>dev</strong></td>
+      <td>Contributor discussions and development activity</td>
+      <td><a class="btn btn-primary btn-xs" href="https://mail-archives.apache.org/mod_mbox/accumulo-dev"><span class="glyphicon glyphicon-book"></span> Archive</a> <a class="btn btn-info btn-xs" href="https://www.mail-archive.com/dev@accumulo.apache.org"><span class="glyphicon glyphicon-search"></span> Search</a></td>
+      <td><a class="btn btn-success btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#100;&#101;&#118;&#045;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a class="btn btn-danger btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#100;&#101;&#118;&#045;&#117;&#110;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a></td>
+      <td><a class="btn btn-warning btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#100;&#101;&#118;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-envelope"></span> Post</a></td>
+    </tr>
+    <tr>
+      <td><strong>commits</strong></td>
+      <td>Code changes</td>
+      <td><a class="btn btn-primary btn-xs" href="https://mail-archives.apache.org/mod_mbox/accumulo-commits"><span class="glyphicon glyphicon-book"></span> Archive</a> <a class="btn btn-info btn-xs" href="https://www.mail-archive.com/commits@accumulo.apache.org"><span class="glyphicon glyphicon-search"></span> Search</a></td>
+      <td><a class="btn btn-success btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#099;&#111;&#109;&#109;&#105;&#116;&#115;&#045;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a class="btn btn-danger btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#099;&#111;&#109;&#109;&#105;&#116;&#115;&#045;&#117;&#110;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a></td>
+      <td> </td>
+    </tr>
+    <tr>
+      <td><strong>notifications</strong></td>
+      <td>Automated notifications (JIRA, etc.)</td>
+      <td><a class="btn btn-primary btn-xs" href="https://mail-archives.apache.org/mod_mbox/accumulo-notifications"><span class="glyphicon glyphicon-book"></span> Archive</a> <a class="btn btn-info btn-xs" href="https://www.mail-archive.com/notifications@accumulo.apache.org"><span class="glyphicon glyphicon-search"></span> Search</a></td>
+      <td><a class="btn btn-success btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#110;&#111;&#116;&#105;&#102;&#105;&#099;&#097;&#116;&#105;&#111;&#110;&#115;&#045;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a class="btn btn-danger btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#110;&#111;&#116;&#105;&#102;&#105;&#099;&#097;&#116;&#105;&#111;&#110;&#115;&#045;&#117;&#110;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a></td>
+      <td> </td>
+    </tr>
+  </tbody>
 </table>
 
 <h2 id="mailing-list-search-providers">Mailing List Search Providers</h2>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e938fe2b/notable_features.html
----------------------------------------------------------------------
diff --git a/notable_features.html b/notable_features.html
index 9a90644..563a248 100644
--- a/notable_features.html
+++ b/notable_features.html
@@ -238,23 +238,20 @@
         
         <h1 class="title">Notable Features</h1>
         
-        <h2 id="categories">Categories</h2>
-
-<ul>
-  <li><a href="#design">Table Design and Configuration</a></li>
-  <li><a href="#integrity">Integrity/Availability</a></li>
-  <li><a href="#performance">Performance</a></li>
-  <li><a href="#testing">Testing</a></li>
-  <li><a href="#client">Client API</a></li>
-  <li><a href="#behaviors">Extensible Behaviors</a></li>
-  <li><a href="#admin">General Administration</a></li>
-  <li><a href="#internal_dm">Internal Data Management</a></li>
-  <li><a href="#ondemand_dm">On-demand Data Management</a></li>
+        
+<ul id="markdown-toc">
+  <li><a href="#table-design-and-configuration" id="markdown-toc-table-design-and-configuration">Table Design and Configuration</a></li>
+  <li><a href="#integrityavailability" id="markdown-toc-integrityavailability">Integrity/Availability</a></li>
+  <li><a href="#performance" id="markdown-toc-performance">Performance</a></li>
+  <li><a href="#testing" id="markdown-toc-testing">Testing</a></li>
+  <li><a href="#client-api" id="markdown-toc-client-api">Client API</a></li>
+  <li><a href="#extensible-behaviors" id="markdown-toc-extensible-behaviors">Extensible Behaviors</a></li>
+  <li><a href="#general-administration" id="markdown-toc-general-administration">General Administration</a></li>
+  <li><a href="#internal-data-management" id="markdown-toc-internal-data-management">Internal Data Management</a></li>
+  <li><a href="#on-demand-data-management" id="markdown-toc-on-demand-data-management">On-demand Data Management</a></li>
 </ul>
 
-<hr />
-
-<h2 id="table-design-and-configuration-a-iddesigna">Table Design and Configuration <a id="design"></a></h2>
+<h2 id="table-design-and-configuration">Table Design and Configuration</h2>
 
 <h3 id="iterators">Iterators</h3>
 
@@ -303,7 +300,7 @@ over multiple disjoint HDFS instances.  This allows Accumulo to scale beyond the
 of a single namenode.  When used in conjunction with HDFS federation, multiple namenodes
 can share a pool of datanodes.</p>
 
-<h2 id="integrityavailability-a-idintegritya">Integrity/Availability <a id="integrity"></a></h2>
+<h2 id="integrityavailability">Integrity/Availability</h2>
 
 <h3 id="master-fail-over">Master fail over</h3>
 
@@ -361,7 +358,7 @@ Zookeeper to synchronize operations across process faults.</p>
 
 <p>Scans will not see data inserted into a row after the scan of that row begins.</p>
 
-<h2 id="performance-a-idperformancea">Performance <a id="performance"></a></h2>
+<h2 id="performance">Performance</h2>
 
 <h3 id="relative-encoding">Relative encoding</h3>
 
@@ -413,7 +410,7 @@ is generated.  As a block is read more, larger indexes are generated making
 future seeks faster. This strategy allows Accumulo to dynamically respond to
 read patterns without precomputing block indexes when RFiles are written.</p>
 
-<h2 id="testing-a-idtestinga">Testing <a id="testing"></a></h2>
+<h2 id="testing">Testing</h2>
 
 <h3 id="mock">Mock</h3>
 
@@ -468,7 +465,7 @@ Other tests have no concept of data correctness and have the simple goal of
 crashing Accumulo. Many obscure bugs have been uncovered by this testing
 framework and subsequently corrected.</p>
 
-<h2 id="client-api-a-idclienta">Client API <a id="client"></a></h2>
+<h2 id="client-api">Client API</h2>
 
 <h3 id="batch-scanner4"><a href="/1.5/accumulo_user_manual#_writing_accumulo_clients">Batch Scanner</a></h3>
 
@@ -509,7 +506,7 @@ available to other languages like Python, Ruby, C++, etc.</p>
 which allow users to perform efficient, atomic read-modify-write operations on rows. Conditions can
 be defined using on equality checks of the values in a column or the absence of a column. For more
 information on using this feature, users can reference the Javadoc for <a href="/1.6/apidocs/org/apache/accumulo/core/data/ConditionalMutation">ConditionalMutation</a> and
-<a href="/1.6/apidocs/org/apache/accumulo/core/client/ConditionalWriter">ConditionalWriter</a></p>
+<a href="/1.6/apidocs/org/apache/accumulo/core/client/ConditionalWriter">ConditionalWriter</a>.</p>
 
 <h3 id="lexicoders">Lexicoders</h3>
 
@@ -520,7 +517,7 @@ Lexicoders which have numerous implementations that support for efficient transl
 Java primitives to byte arrays and vice versa. These classes can greatly reduce the burden in
 re-implementing common programming mistakes in encoding.</p>
 
-<h2 id="extensible-behaviors-a-idbehaviorsa">Extensible Behaviors <a id="behaviors"></a></h2>
+<h2 id="extensible-behaviors">Extensible Behaviors</h2>
 
 <h3 id="pluggable-balancer">Pluggable balancer</h3>
 
@@ -555,7 +552,7 @@ it is very unlikely that more data will be written to it, and thus paying the pe
 to re-write a large file can be avoided. Implementations of this compaction strategy
 can be used to optimize the data that compactions will write.</p>
 
-<h2 id="general-administration-a-idadmina">General Administration <a id="admin"></a></h2>
+<h2 id="general-administration">General Administration</h2>
 
 <h3 id="monitor-page">Monitor page</h3>
 
@@ -586,7 +583,7 @@ effect until server processes are restarted.</p>
 <p>Tables can be renamed easily because Accumulo uses internal table IDs and
 stores mappings between names and IDs in Zookeeper.</p>
 
-<h2 id="internal-data-management-a-idinternaldma">Internal Data Management <a id="internal_dm"></a></h2>
+<h2 id="internal-data-management">Internal Data Management</h2>
 
 <h3 id="locality-groups">Locality groups</h3>
 
@@ -632,7 +629,7 @@ level of security that Accumulo provides. It is still a work in progress because
 the intermediate files created by Accumulo when recovering from a TabletServer
 failure are not encrypted.</p>
 
-<h2 id="on-demand-data-management-a-idondemanddma">On-demand Data Management <a id="ondemand_dm"></a></h2>
+<h2 id="on-demand-data-management">On-demand Data Management</h2>
 
 <h3 id="compactions">Compactions</h3>
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e938fe2b/old_documentation.html
----------------------------------------------------------------------
diff --git a/old_documentation.html b/old_documentation.html
index 1356706..a1d0034 100644
--- a/old_documentation.html
+++ b/old_documentation.html
@@ -243,26 +243,26 @@
 <h4 id="documentation">1.5 Documentation</h4>
 
 <ul>
-  <li><a href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=README;hb=1.5.4" id="/1.5/README">README</a></li>
-  <li><a href="/1.5/accumulo_user_manual.pdf" id="/1.5/accumulo_user_manual.pdf">PDF manual</a></li>
+  <li><a onClick="javascript: _gaq.push(['_trackPageview', '/1.5/README']);" href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=README;hb=1.5.4">README</a></li>
+  <li><a onClick="javascript: _gaq.push(['_trackPageview', '/1.5/accumulo_user_manual.pdf']);" href="/1.5/accumulo_user_manual.pdf">PDF manual</a></li>
   <li><a href="/1.5/accumulo_user_manual" title="1.5 user manual">html manual</a></li>
   <li><a href="/1.5/examples" title="1.5 examples">examples</a></li>
-  <li><a href="/1.5/apidocs" id="/1.5/apidocs">Javadoc</a></li>
+  <li><a onClick="javascript: _gaq.push(['_trackPageview', '/1.5/apidocs']);" href="/1.5/apidocs">Javadoc</a></li>
 </ul>
 
 <h4 id="documentation-1">1.4 Documentation</h4>
 
 <ul>
-  <li><a href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=README;hb=f7d87b6e407de6597b6c0ca60ca1b6a321faf237" onclick="javascript: _gaq.push(['_trackPageview', '/1.4/README']);">README</a></li>
-  <li><a href="/1.4/accumulo_user_manual.pdf" onclick="javascript: _gaq.push(['_trackPageview', '/1.4/accumulo_user_manual.pdf']);">pdf manual</a></li>
+  <li><a onClick="javascript: _gaq.push(['_trackPageview', '/1.4/README']);" href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=README;hb=f7d87b6e407de6597b6c0ca60ca1b6a321faf237">README</a></li>
+  <li><a onClick="javascript: _gaq.push(['_trackPageview', '/1.4/accumulo_user_manual.pdf']);" href="/1.4/accumulo_user_manual.pdf">PDF manual</a></li>
   <li><a href="/1.4/user_manual" title="1.4 user manual">html manual</a></li>
   <li><a href="/1.4/examples" title="1.4 examples">examples</a></li>
-  <li><a href="/1.4/apidocs" onclick="javascript: _gaq.push(['_trackPageview', '/1.4/apidocs']);">Javadoc</a></li>
+  <li><a onClick="javascript: _gaq.push(['_trackPageview', '/1.4/apidocs']);" href="/1.4/apidocs">Javadoc</a></li>
 </ul>
 
 <h4 id="documentation-2">1.3 Documentation</h4>
 <ul>
-  <li><a href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=README;h=86713d9b6add9038d5130b4a23ba4a79b72d0f15;hb=3b4ffc158945c1f834fc6f257f21484c61691d0f" onclick="javascript: _gaq.push(['_trackPageview', '/1.3/README']);">README</a></li>
+  <li><a onClick="javascript: _gaq.push(['_trackPageview', '/1.3/README']);" href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=README;h=86713d9b6add9038d5130b4a23ba4a79b72d0f15;hb=3b4ffc158945c1f834fc6f257f21484c61691d0f">README</a></li>
   <li><a href="/user_manual_1.3-incubating/" title="1.3 user manual">html manual</a></li>
   <li><a href="/user_manual_1.3-incubating/examples/" title="1.3 examples">examples</a></li>
 </ul>