http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/59a6d65d/notable_features.html
----------------------------------------------------------------------
diff --git a/notable_features.html b/notable_features.html
index 8d0b18b..8e33b59 100644
--- a/notable_features.html
+++ b/notable_features.html
@@ -1,619 +1,10 @@
 <!DOCTYPE html>
-<html lang="en">
-<head>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
+<html lang="en-US">
 <meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<link 
href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/paper/bootstrap.min.css"; 
rel="stylesheet" 
integrity="sha384-awusxf8AUojygHf2+joICySzB780jVvQaVCAt1clU3QsyAitLGul28Qxb2r1e5g+"
 crossorigin="anonymous">
-<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
-<link rel="stylesheet" type="text/css" 
href="https://cdn.datatables.net/v/bs/jq-2.2.3/dt-1.10.12/datatables.min.css";>
-<link href="/css/accumulo.css" rel="stylesheet" type="text/css">
-
-<title>Notable Features</title>
-
-<script 
src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js";></script>
-<script 
src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"; 
integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
 crossorigin="anonymous"></script>
-<script type="text/javascript" 
src="https://cdn.datatables.net/v/bs/jq-2.2.3/dt-1.10.12/datatables.min.js";></script>
-<script>
-  // show location of canonical site if not currently on the canonical site
-  $(function() {
-    var host = window.location.host;
-    if (typeof host !== 'undefined' && host !== 'accumulo.apache.org') {
-      $('#non-canonical').show();
-    }
-  });
-
-  $(function() {
-    // decorate section headers with anchors
-    return $("h2, h3, h4, h5, h6").each(function(i, el) {
-      var $el, icon, id;
-      $el = $(el);
-      id = $el.attr('id');
-      icon = '<i class="fa fa-link"></i>';
-      if (id) {
-        return $el.append($("<a />").addClass("header-link").attr("href", "#" 
+ id).html(icon));
-      }
-    });
-  });
-  
-  // configure Google Analytics
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
-  
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  if (ga.hasOwnProperty('loaded') && ga.loaded === true) {
-    ga('create', 'UA-50934829-1', 'apache.org');
-    ga('send', 'pageview');
-  }
-</script>
-
-</head>
-<body style="padding-top: 100px">
-
-  <nav class="navbar navbar-default navbar-fixed-top">
-  <div class="container">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" 
data-target="#navbar-items">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a href="/"><img id="nav-logo" alt="Apache Accumulo" 
class="img-responsive" src="/images/accumulo-logo.png" width="200"/></a>
-    </div>
-    <div class="collapse navbar-collapse" id="navbar-items">
-      <ul class="nav navbar-nav">
-        <li class="nav-link"><a href="/downloads">Download</a></li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Releases<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="/release/accumulo-1.8.0/">1.8.0 (Latest)</a></li>
-          <li><a href="/release/accumulo-1.7.2/">1.7.2</a></li>
-          <li><a href="/release/accumulo-1.6.6/">1.6.6</a></li>
-          <li><a href="/release/">Archive</a></li>
-        </ul>
-        </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Documentation<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="/user-manual/">User Manuals</a></li>
-          <li><a href="/javadocs/">Javadocs</a></li>
-          <li><a href="/examples/">Examples</a></li>
-          <li><a href="/notable_features">Features</a></li>
-          <li><a href="/screenshots">Screenshots</a></li>
-          <li><a href="/papers">Papers &amp; Presentations</a></li>
-          <li><a href="/glossary">Glossary</a></li>
-        </ul>
-        </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Community<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="/get_involved">Get Involved</a></li>
-          <li><a href="/mailing_list">Mailing Lists</a></li>
-          <li><a href="/people">People</a></li>
-          <li><a href="/news">News Archive</a></li>
-          <li><a href="/projects">Community Projects</a></li>
-          <li><a href="/thanks">Thanks</a></li>
-          <li><a href="/governance/">Governance</a></li>
-        </ul>
-        </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Development<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO";>Issue 
Tracker <i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://github.com/apache/accumulo/pulls";>Pull Requests 
<i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://builds.apache.org/view/A/view/Accumulo";>Jenkins 
Builds <i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://travis-ci.org/apache/accumulo";>TravisCI Builds 
<i class="fa fa-external-link"></i></a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Guides</li>
-          <li><a href="/source">Source &amp; Guide</a></li>
-          <li><a href="/git">Git Workflow</a></li>
-          <li><a href="/versioning">Versioning</a></li>
-          <li><a href="/contrib">Contrib Projects</a></li>
-          <li><a href="/rb">Review Board</a></li>
-          <li><a href="/releasing">Making Releases</a></li>
-          <li><a href="/verifying_releases">Verifying Releases</a></li>
-        </ul>
-        </li>
-      </ul>
-      <ul class="nav navbar-nav navbar-right">
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Apache 
Software Foundation<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="https://www.apache.org";>Apache Homepage <i class="fa 
fa-external-link"></i></a></li>
-          <li><a href="https://www.apache.org/licenses/LICENSE-2.0";>License <i 
class="fa fa-external-link"></i></a></li>
-          <li><a 
href="https://www.apache.org/foundation/sponsorship";>Sponsorship <i class="fa 
fa-external-link"></i></a></li>
-          <li><a href="https://www.apache.org/security";>Security <i class="fa 
fa-external-link"></i></a></li>
-          <li><a href="https://www.apache.org/foundation/thanks";>Thanks <i 
class="fa fa-external-link"></i></a></li>
-          <li><a 
href="https://www.apache.org/foundation/policies/conduct";>Code of Conduct <i 
class="fa fa-external-link"></i></a></li>
-        </ul>
-        </li>
-      </ul>
-    </div>
-  </div>
-</nav>
-
-
-  <div class="container">
-    <div class="row">
-      <div class="col-md-12">
-
-        <div id="non-canonical" style="display: none; background-color: 
#F0E68C; padding-left: 1em;">
-          Visit the official site at: <a 
href="https://accumulo.apache.org";>https://accumulo.apache.org</a>
-        </div>
-        <div id="content">
-          
-          <h1 class="title">Notable Features</h1>
-          
-          
-<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>
-
-<h2 id="table-design-and-configuration">Table Design and Configuration</h2>
-
-<h3 id="iterators">Iterators</h3>
-
-<p>A server-side programming mechanism to encode functions such as filtering 
and
-aggregation within the data management steps (scopes where data is read from or
-written to disk) that happen in the tablet server.</p>
-
-<h3 id="cell-labels">Cell labels</h3>
-
-<p>An additional portion of the Key that sorts after the column qualifier and
-before the timestamp. It is called column visibility and enables expressive
-cell-level access control. Authorizations are passed with each query to control
-what data is returned to the user. The column visibilities are boolean AND and
-OR combinations of arbitrary strings (such as “(A&amp;B)|C”) and 
authorizations
-are sets of strings (such as {C,D}).</p>
-
-<h3 id="constraints">Constraints</h3>
-
-<p>Configurable conditions under which writes to a table will be rejected.
-Constraints are written in Java and configurable on a per table basis.</p>
-
-<h3 id="sharding">Sharding</h3>
-
-<p>Through the use of specialized iterators, Accumulo can be a parallel sharded
-document store. For example wikipedia could be stored and searched for
-documents containing certain words.</p>
-
-<h3 id="large-rows">Large Rows</h3>
-
-<p>When reading rows, there is no requirement that an entire row fits into 
memory.</p>
-
-<h3 id="namespaces">Namespaces</h3>
-
-<p>In version 1.6.0, the concept of table “namespaces” was created to 
allow for logical
-grouping and configuration of Accumulo tables. By default, tables are created 
in a
-default namespace which is the empty string to preserve the feel for how 
tables operate
-in previous versions. One application of table namespaces is placing the 
Accumulo root
-and metadata table in an “accumulo” namespace to denote that these tables 
are used
-internally by Accumulo.</p>
-
-<h3 id="volume-support">Volume support</h3>
-
-<p>Accumulo 1.6.0 migrated away from configuration of HDFS by using a single 
HDFS host and
-directory, to a collection of HDFS URIs (host and path) which allows Accumulo 
to operate
-over multiple disjoint HDFS instances.  This allows Accumulo to scale beyond 
the limits
-of a single namenode.  When used in conjunction with HDFS federation, multiple 
namenodes
-can share a pool of datanodes.</p>
-
-<h2 id="integrityavailability">Integrity/Availability</h2>
-
-<h3 id="master-fail-over">Master fail over</h3>
-
-<p>Multiple masters can be configured.  Zookeeper locks are used to determine
-which master is active.  The remaining masters simply wait for the current
-master to lose its lock.  Current master state is held in the metadata table
-and Zookeeper (see <a href="#fate">FATE</a>).</p>
-
-<h3 id="logical-time">Logical time</h3>
-
-<p>A mechanism to ensure that server set times never go backwards, even when 
time
-across the cluster is incorrect. This ensures that updates and deletes are not
-lost. If a tablet is served on machine with time a year in the future, then the
-tablet will continue to issue new timestamps a year in the future even when it
-moves to another server. In this case the timestamps preserve ordering, but
-lose their meaning. In addition to logical time, Accumulo has master
-authoritative time. The master averages the time of all of the tablet servers
-and sends this back to the tablet servers. Tablet servers use this information
-to adjust the timestamps they issue. So logical time ensures ordering is
-always correct and master authoritative time tries to ensure that timestamps
-are meaningful.</p>
-
-<h3 id="logical-time-for-bulk-import">Logical Time for bulk import</h3>
-
-<p>Logical time as described above works with streaming (batch) ingest, where 
the
-tablet server assigns the timestamp.  Logical time is also important for bulk
-imported data, for which the client code may be choosing a timestamp.  Accumulo
-uses specialized system iterators to lazily set times in a bulk imported
-file.  This mechanism guarantees that times set by unsynchronized multi-node
-applications (such as those running on MapReduce) will maintain some semblance
-of causal ordering.  This mitigates the problem of the time being wrong on the
-system that created the file for bulk import. These times are not set when the
-file is imported, but whenever it is read by scans or compactions. At import, a
-time is obtained and always used by the specialized system iterator to set that
-time.</p>
-
-<h3 id="fate">FATE</h3>
-
-<p>Fault Tolerant Executor. A framework for executing operations in a fault
-tolerant manner. In the previous release, if the master process died in the
-middle of creating a table it could leave the system in an inconsistent state.
-With this new framework, if the master dies in the middle of create table it
-will continue on restart. Also the client requesting the create table operation
-will never know anything happened. The framework serializes work in Zookeeper
-before attempting to do the work. Clients start a FATE transaction, seed it
-with work, and then wait for it to finish. Most table operations are executed
-using this framework. Persistent, per table, read-write locks are created in
-Zookeeper to synchronize operations across process faults.</p>
-
-<h3 id="scalable-master">Scalable master</h3>
-
-<p>Stores its metadata in an Accumulo table and Zookeeper.</p>
-
-<h3 id="isolation">Isolation</h3>
-
-<p>Scans will not see data inserted into a row after the scan of that row 
begins.</p>
-
-<h2 id="performance">Performance</h2>
-
-<h3 id="relative-encoding">Relative encoding</h3>
-
-<p>If consecutive keys have identical portions (row, colf, colq, or colvis), 
there
-is a flag to indicate that a portion is the same as that of the previous key.
-This is applied when keys are stored on disk and when transferred over the
-network.  Starting with 1.5, prefix erasure is supported.  When its cost 
-effective, prefixes repeated in subsequent key fields are not repeated.</p>
-
-<h3 id="native-in-memory-map">Native In-Memory Map</h3>
-
-<p>By default data written is stored outside of Java managed memory into a C++ 
STL
-map of maps.  It maps rows to columns to values.  This hierarchical structure
-improves performance of inserting a mutation with multiple column values in a
-single row. A custom STL allocator is used to avoid the global malloc lock and
-memory fragmentation.</p>
-
-<h3 id="scan-pipeline">Scan pipeline</h3>
-
-<p>A long running Accumulo scan will eventually cause multiple threads to 
start.
-One server thread to read data from disk, one server thread to serialize and
-send data, and one client thread to deserialize and read data. When pipelining
-kicks in, it substantially increases scan speed while maintaining key order. It
-does not activate for short scans.</p>
-
-<h3 id="caching">Caching</h3>
-
-<p>Recently scanned data is cached into memory.  There are separate caches for
-indexes and data.  Caching can be turned on and off for individual tables.</p>
-
-<h3 id="multi-level-rfile-index">Multi-level RFile Index</h3>
-
-<p>RFiles store an index of the last key in each block. For large files the 
index
-can become quite large. When the index is large a lot of memory is consumed and
-files take a long time to open. To avoid this problem, RFiles have a
-multi-level index tree. Index blocks can point to other index blocks or data
-blocks. The entire index never has to be resident, even when the file is
-written. When an index block exceeds the configurable size threshold, its
-written out between data blocks. The size of index blocks is configurable on a
-per table basis.</p>
-
-<h3 id="binary-search-in-rfile-blocks">Binary search in RFile blocks</h3>
-
-<p>RFile uses its index to locate a block of key values.  Once it reaches a 
block 
-it performs a linear scan to find a key on interest.  Accumulo will generate
-indexes of cached blocks in an adaptive manner.  Accumulo indexes the blocks
-that are read most frequently.  When a block is read a few times, a small index
-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">Testing</h2>
-
-<h3 id="mock">Mock</h3>
-
-<p>The Accumulo client API has a mock implementation that is useful writing 
unit
-test against Accumulo. Mock Accumulo is in memory and in process.</p>
-
-<h3 id="mini-accumulo-cluster">Mini Accumulo Cluster</h3>
-
-<p>Mini Accumulo cluster is a set of utility code that makes it easy to spin 
up 
-a local Accumulo instance running against the local filesystem.  Mini Accumulo
-is slower than Mock Accumulo, but its behavior mirrors a real Accumulo 
-instance more closely.</p>
-
-<h3 id="accumulo-maven-plugin">Accumulo Maven Plugin</h3>
-
-<p>Using the Mini Accumulo Cluster in unit and integration tests is a great 
way for
-developers to test their applications against Accumulo in an environment that 
is
-much closer to physical deployments than Mock Accumulo provided. Accumulo 
1.6.0 also
-introduced a <a 
href="/release/accumulo-1.6.0/#maven-plugin">maven-accumulo-plugin</a> which
-can be used to start a Mini Accumulo Cluster instance as a part of the Maven
-lifecycle that your application tests can use.</p>
-
-<h3 id="functional-test">Functional Test</h3>
-
-<p>Small, system-level tests of basic Accumulo features run in a test harness,
-external to the build and unit-tests.  These tests start a complete Accumulo
-instance, and require Hadoop and Zookeeper to be running.  They attempt to
-simulate the basic functions of Accumulo, as well as common failure conditions,
-such as lost disks, killed processes, and read-only file systems.</p>
-
-<h3 id="scale-test">Scale Test</h3>
-
-<p>A test suite that verifies data is not lost at scale. This test runs many
-ingest clients that continually create linked lists containing 25 million
-nodes. At some point the clients are stopped and a map reduce job is run to
-ensure no linked list has a hole. A hole indicates data was lost by Accumulo.
-The Agitator can be run in conjunction with this test to randomly kill tablet
-servers. This test suite has uncovered many obscure data loss bugs.  This test
-also helps find bugs that impact uptime and stability when run for days or
-weeks.</p>
-
-<h3 id="random-walk-test">Random Walk Test</h3>
-
-<p>A test suite that looks for unexpected system states that may emerge in
-plausible real-world applications.  Application components are defined as test
-nodes (such as create table, insert data, scan data, delete table, etc.), and
-are programmed as Java classes that implement a specified interface.  The nodes
-are connected together in a graph specified in an XML document. Many processes
-independently and concurrently execute a random walk of the test graphs. Some
-of the test graphs have a concept of correctness and can verify data over time.
-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">Client API</h2>
-
-<h3 id="batch-scanner4"><a 
href="/1.5/accumulo_user_manual#_writing_accumulo_clients">Batch 
Scanner</a></h3>
-
-<p>Takes a list of Ranges, batches them to the appropriate tablet servers, and
-returns data as it is received (i.e. not in sorted order).</p>
-
-<h3 id="batch-writer4"><a 
href="/1.5/accumulo_user_manual#_writing_accumulo_clients">Batch Writer</a></h3>
-
-<p>Clients buffer writes in memory before sending them in batches to the
-appropriate tablet servers.</p>
-
-<h3 id="bulk-import6"><a href="/1.5/accumulo_user_manual#_bulk_ingest">Bulk 
Import</a></h3>
-
-<p>Instead of writing individual mutations to Accumulo, entire files of sorted 
key
-value pairs can be imported. These files are moved into the Accumulo directory
-and referenced by Accumulo. This feature is useful for ingesting a large amount
-of data. This method of ingest usually offers higher throughput at the cost of
-higher latency for data availability for scans.  Usually the data is sorted
-using map reduce and then bulk imported. This method of ingest also allows for
-flexibility in resource allocation.  The nodes running map reduce to sort data
-could be different from the Accumulo nodes.</p>
-
-<h3 id="map-reduce4"><a 
href="/1.5/accumulo_user_manual#_writing_accumulo_clients">Map Reduce</a></h3>
-
-<p>Accumulo can be a source and/or sink for map reduce jobs.</p>
-
-<h3 id="apache-thrift-proxy">Apache Thrift Proxy</h3>
-
-<p>The Accumulo client code contains a lot of complexity.  For example, the 
-client code locates tablets, retries in the case of failures, and supports 
-concurrent reading and writing.  All of this is written in Java.  The thrift
-proxy wraps the Accumulo client API with thrift, making this API easily
-available to other languages like Python, Ruby, C++, etc.</p>
-
-<h3 id="conditional-mutations">Conditional Mutations</h3>
-
-<p>In version 1.6.0, Accumulo introduced <a 
href="/1.6/accumulo_user_manual#_conditionalwriter">ConditionalMutations</a>
-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>
-
-<h3 id="lexicoders">Lexicoders</h3>
-
-<p>Common boilerplate code that exists when interacting with Accumulo is the 
conversion
-of Java objects to lexicographically sorted bytes, e.g. ensure that the byte 
representation
-of the number 9 sorts before the byte representation of the number 11. Version 
1.6.0 introduced
-Lexicoders which have numerous implementations that support for efficient 
translation from common
-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">Extensible Behaviors</h2>
-
-<h3 id="pluggable-balancer">Pluggable balancer</h3>
-
-<p>Users can provide a balancer plugin that decides how to distribute tablets
-across a table.  These plugins can be provided on a per table basis.  This is
-useful for ensuring a particular table’s tablets are placed optimally for
-tables with special query needs.  The default balancer randomly spreads each
-table’s tablets across the cluster.  It takes into account where a tablet was
-previously hosted to leverage locality.  When a tablet splits, the default
-balancer moves one child to another tablet server.  The assumption here is that
-splitting tablets are being actively written to, so this keeps write load 
evenly
-spread.</p>
-
-<h3 id="pluggable-memory-manager">Pluggable memory manager</h3>
-
-<p>The plugin that decides when and what tablets to minor compact is 
configurable.
-The default plugin compacts the largest tablet when memory is over a certain
-threshold.  It varies the threshold over time depending on minor compaction
-speed.  It flushes tablets that are not written to for a configurable time
-period.</p>
-
-<h3 id="pluggable-logger-assignment-strategy">Pluggable logger assignment 
strategy</h3>
-
-<p>The plugin that decided which loggers should be assigned to which tablet
-servers is configurable.</p>
-
-<h3 id="pluggable-compaction-strategy">Pluggable compaction strategy</h3>
-
-<p>The plugin that decides which files should be chosen for major compaction 
is now
-configurable. Given certain workloads, it may be known that once data is 
written,
-it is very unlikely that more data will be written to it, and thus paying the 
penalty
-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">General Administration</h2>
-
-<h3 id="monitor-page">Monitor page</h3>
-
-<p>A simple web server provides basic information about the system health and
-performance.  It displays table sizes, ingest and query statistics, server
-load, and last-update information.  It also allows the user to view recent
-diagnostic logs and traces.</p>
-
-<h3 id="tracing">Tracing</h3>
-
-<p>It can be difficult to determine why some operations are taking longer than
-expected. For example, you may be looking up items with very low latency, but
-sometimes the lookups take much longer. Determining the cause of the delay is
-difficult because the system is distributed, and the typical lookup is fast.
-Accumulo has been instrumented to record the time that various operations take
-when tracing is turned on. The fact that tracing is enabled follows all the
-requests made on behalf of the user throughout the distributed infrastructure
-of Accumulo, and across all threads of execution.</p>
-
-<h3 id="online-reconfiguration">Online reconfiguration</h3>
-
-<p>System and per table configuration is stored in Zookeeper. Many, but not 
all,
-configuration changes take effect while Accumulo is running. Some do not take
-effect until server processes are restarted.</p>
-
-<h3 id="table-renaming">Table renaming</h3>
-
-<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">Internal Data Management</h2>
-
-<h3 id="locality-groups">Locality groups</h3>
-
-<p>Groups columns within a single file. There is a default locality group so 
that
-not all columns need be specified. The locality groups can be restructured
-while the table is online and the changes will take effect on the next
-compaction.  A tablet can have files with different locality group
-configurations.  In this case scans may be suboptimal, but correct, until
-compactions rewrite all files.  After reconfiguring locality groups, a user can
-force a table to compact in order to write all data into the new locality
-groups.  Alternatively, the change could be allowed to happen over time as
-writes to the table cause compactions to happen.</p>
-
-<h3 id="smart-compaction-algorithm">Smart compaction algorithm</h3>
-
-<p>It is inefficient to merge small files with large files.  Accumulo merges 
files
-only if all files are larger than a configurable ratio (default is 3)
-multiplied by the largest file size.  If this cannot be done with all the
-files, the largest file is removed from consideration, and the remaining files
-are considered for compaction.  This is done until there are no files to 
merge.</p>
-
-<h3 id="merging-minor-compaction">Merging Minor Compaction</h3>
-
-<p>When a max number of files per tablet is reached, minor compactions will 
merge
-data from the in-memory map with the smallest file instead of creating new
-files.  This throttles ingest.  In previous releases new files were just 
created
-even if major compactions were falling behind and the number of tablets per 
file
-was growing.  Without this feature, ingest performance can roughly continue at 
a
-constant rate, even as scan performance decreases because tablets have too many
-files.</p>
-
-<h3 id="loading-jars-using-vfs">Loading jars using VFS</h3>
-
-<p>User written iterators are a useful way to manipulate data in data in 
Accumulo. 
-Before 1.5., users had to copy their iterators to each tablet server.  
Starting 
-with 1.5 Accumulo can load iterators from HDFS using Apache commons VFS.</p>
-
-<h3 id="encryption">Encryption</h3>
-
-<p>Still a work in progress, Accumulo 1.6.0 introduced encryption at rest 
(RFiles
-and WriteAheadLogs) and wire encryption (Thrift over SSL) to provide enhance 
the
-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">On-demand Data Management</h2>
-
-<h3 id="compactions">Compactions</h3>
-
-<p>Ability to force tablets to compact to one file. Even tablets with one file 
are
-compacted.  This is useful for improving query performance, permanently
-applying iterators, or using a new locality group configuration.  One example
-of using iterators is applying a filtering iterator to remove data from a
-table. Additionally, users can initiate a compaction with iterators only 
applied to
-that compaction event.</p>
-
-<h3 id="split-points">Split points</h3>
-
-<p>Arbitrary split points can be added to an online table at any point in time.
-This is useful for increasing ingest performance on a new table. It can also be
-used to accommodate new data patterns in an existing table.</p>
-
-<h3 id="tablet-merging">Tablet Merging</h3>
-
-<p>Tablet merging is a new feature. Merging of tablets can be requested in the
-shell; Accumulo does not merge tablets automatically. If desired, the METADATA
-tablets can be merged.</p>
-
-<h3 id="table-cloning">Table Cloning</h3>
-
-<p>Allows users to quickly create a new table that references an existing 
table’s
-data and copies its configuration. A cloned table and its source table can be
-mutated independently. Testing was the motivating reason behind this new
-feature. For example to test a new filtering iterator, clone the table, add the
-filter to the clone, and force a major compaction.</p>
-
-<h3 id="importexport-table">Import/Export Table</h3>
-
-<p>An offline tables metadata and files can easily be copied to another 
cluster and 
-imported.</p>
-
-<h3 id="compact-range">Compact Range</h3>
-
-<p>Compact each tablet that falls within a row range down to a single file.</p>
-
-<h3 id="delete-range">Delete Range</h3>
-
-<p>Added an operation to efficiently delete a range of rows from a table. 
Tablets
-that fall completely within a range are simply dropped. Tablets overlapping the
-beginning and end of the range are split, compacted, and then merged.</p>
-
-
-        </div>
-
-        
-<footer>
-
-  <p><a href="https://www.apache.org";><img src="/images/feather-small.gif" 
alt="Apache Software Foundation" id="asf-logo" height="100" /></a></p>
-
-  <p>Copyright © 2011-2016 The Apache Software Foundation. Licensed under the 
<a href="https://www.apache.org/licenses/LICENSE-2.0";>Apache License, 
Version 2.0</a>.</p>
-
-</footer>
-
-
-      </div>
-    </div>
-  </div>
-</body>
+<title>Redirecting…</title>
+<link rel="canonical" href="https://accumulo.apache.org/features/";>
+<meta http-equiv="refresh" content="0; 
url=https://accumulo.apache.org/features/";>
+<h1>Redirecting…</h1>
+<a href="https://accumulo.apache.org/features/";>Click here if you are not 
redirected.</a>
+<script>location="https://accumulo.apache.org/features/";</script>
 </html>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/59a6d65d/pages/old_archive.html
----------------------------------------------------------------------
diff --git a/pages/old_archive.html b/pages/old_archive.html
deleted file mode 100644
index 603896c..0000000
--- a/pages/old_archive.html
+++ /dev/null
@@ -1,229 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<link 
href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/paper/bootstrap.min.css"; 
rel="stylesheet" 
integrity="sha384-awusxf8AUojygHf2+joICySzB780jVvQaVCAt1clU3QsyAitLGul28Qxb2r1e5g+"
 crossorigin="anonymous">
-<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
-<link rel="stylesheet" type="text/css" 
href="https://cdn.datatables.net/v/bs/jq-2.2.3/dt-1.10.12/datatables.min.css";>
-<link href="/css/accumulo.css" rel="stylesheet" type="text/css">
-
-<title>Release Notes</title>
-
-<script 
src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js";></script>
-<script 
src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"; 
integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
 crossorigin="anonymous"></script>
-<script type="text/javascript" 
src="https://cdn.datatables.net/v/bs/jq-2.2.3/dt-1.10.12/datatables.min.js";></script>
-<script>
-  // show location of canonical site if not currently on the canonical site
-  $(function() {
-    var host = window.location.host;
-    if (typeof host !== 'undefined' && host !== 'accumulo.apache.org') {
-      $('#non-canonical').show();
-    }
-  });
-
-  $(function() {
-    // decorate section headers with anchors
-    return $("h2, h3, h4, h5, h6").each(function(i, el) {
-      var $el, icon, id;
-      $el = $(el);
-      id = $el.attr('id');
-      icon = '<i class="fa fa-link"></i>';
-      if (id) {
-        return $el.append($("<a />").addClass("header-link").attr("href", "#" 
+ id).html(icon));
-      }
-    });
-  });
-  
-  // configure Google Analytics
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
-  
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  if (ga.hasOwnProperty('loaded') && ga.loaded === true) {
-    ga('create', 'UA-50934829-1', 'apache.org');
-    ga('send', 'pageview');
-  }
-</script>
-
-</head>
-<body style="padding-top: 100px">
-
-  <nav class="navbar navbar-default navbar-fixed-top">
-  <div class="container">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" 
data-target="#navbar-items">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a href="/"><img id="nav-logo" alt="Apache Accumulo" 
class="img-responsive" src="/images/accumulo-logo.png" width="200"/></a>
-    </div>
-    <div class="collapse navbar-collapse" id="navbar-items">
-      <ul class="nav navbar-nav">
-        <li class="nav-link"><a href="/downloads">Download</a></li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Releases<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="/release/accumulo-1.8.0/">1.8.0 (Latest)</a></li>
-          <li><a href="/release/accumulo-1.7.2/">1.7.2</a></li>
-          <li><a href="/release/accumulo-1.6.6/">1.6.6</a></li>
-          <li><a href="/release/">Archive</a></li>
-        </ul>
-        </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Documentation<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="/user-manual/">User Manuals</a></li>
-          <li><a href="/javadocs/">Javadocs</a></li>
-          <li><a href="/examples/">Examples</a></li>
-          <li><a href="/notable_features">Features</a></li>
-          <li><a href="/screenshots">Screenshots</a></li>
-          <li><a href="/papers">Papers &amp; Presentations</a></li>
-          <li><a href="/glossary">Glossary</a></li>
-        </ul>
-        </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Community<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="/get_involved">Get Involved</a></li>
-          <li><a href="/mailing_list">Mailing Lists</a></li>
-          <li><a href="/people">People</a></li>
-          <li><a href="/news">News Archive</a></li>
-          <li><a href="/projects">Community Projects</a></li>
-          <li><a href="/thanks">Thanks</a></li>
-          <li><a href="/governance/">Governance</a></li>
-        </ul>
-        </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Development<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO";>Issue 
Tracker <i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://github.com/apache/accumulo/pulls";>Pull Requests 
<i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://builds.apache.org/view/A/view/Accumulo";>Jenkins 
Builds <i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://travis-ci.org/apache/accumulo";>TravisCI Builds 
<i class="fa fa-external-link"></i></a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Guides</li>
-          <li><a href="/source">Source &amp; Guide</a></li>
-          <li><a href="/git">Git Workflow</a></li>
-          <li><a href="/versioning">Versioning</a></li>
-          <li><a href="/contrib">Contrib Projects</a></li>
-          <li><a href="/rb">Review Board</a></li>
-          <li><a href="/releasing">Making Releases</a></li>
-          <li><a href="/verifying_releases">Verifying Releases</a></li>
-        </ul>
-        </li>
-      </ul>
-      <ul class="nav navbar-nav navbar-right">
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Apache 
Software Foundation<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="https://www.apache.org";>Apache Homepage <i class="fa 
fa-external-link"></i></a></li>
-          <li><a href="https://www.apache.org/licenses/LICENSE-2.0";>License <i 
class="fa fa-external-link"></i></a></li>
-          <li><a 
href="https://www.apache.org/foundation/sponsorship";>Sponsorship <i class="fa 
fa-external-link"></i></a></li>
-          <li><a href="https://www.apache.org/security";>Security <i class="fa 
fa-external-link"></i></a></li>
-          <li><a href="https://www.apache.org/foundation/thanks";>Thanks <i 
class="fa fa-external-link"></i></a></li>
-          <li><a 
href="https://www.apache.org/foundation/policies/conduct";>Code of Conduct <i 
class="fa fa-external-link"></i></a></li>
-        </ul>
-        </li>
-      </ul>
-    </div>
-  </div>
-</nav>
-
-
-  <div class="container">
-    <div class="row">
-      <div class="col-md-12">
-
-        <div id="non-canonical" style="display: none; background-color: 
#F0E68C; padding-left: 1em;">
-          Visit the official site at: <a 
href="https://accumulo.apache.org";>https://accumulo.apache.org</a>
-        </div>
-        <div id="content">
-          
-          <h1 class="title">Release Notes</h1>
-          
-          <p>Apache Accumulo generates release notes for the benefit of users 
which summarize the important and notable changes that
-are contained in that release. Users can leverage these release notes to make 
make decisions about the benefits (or
-concerns) in updating to a new version.</p>
-
-<p>Each release notes document aim to provide content broken down into the 
following categories of interest.</p>
-
-<ul>
-  <li>New Features</li>
-  <li>Performance Improvements</li>
-  <li>Bug Fixes</li>
-  <li>Reference to special upgrade instructions (if any)</li>
-  <li>Security Concerns</li>
-  <li>API changes outside of standard guarantees</li>
-  <li>Community-driven release testing</li>
-</ul>
-
-<h2 id="archives-of-all-release-notes">Archives of all release notes</h2>
-
-<h3 id="releases">1.7 releases</h3>
-
-<ul>
-  <li><a href="1.7.2">Apache Accumulo 1.7.2</a></li>
-  <li><a href="1.7.1">Apache Accumulo 1.7.1</a></li>
-  <li><a href="1.7.0">Apache Accumulo 1.7.0</a></li>
-</ul>
-
-<h3 id="releases-1">1.6 releases</h3>
-
-<ul>
-  <li><a href="1.6.6">Apache Accumulo 1.6.6</a></li>
-  <li><a href="1.6.5">Apache Accumulo 1.6.5</a></li>
-  <li><a href="1.6.4">Apache Accumulo 1.6.4</a></li>
-  <li><a href="1.6.3">Apache Accumulo 1.6.3</a></li>
-  <li><a href="1.6.2">Apache Accumulo 1.6.2</a></li>
-  <li><a href="1.6.1">Apache Accumulo 1.6.1</a></li>
-  <li><a href="1.6.0">Apache Accumulo 1.6.0</a></li>
-</ul>
-
-<h3 id="releases-2">1.5 releases</h3>
-
-<ul>
-  <li><a href="1.5.4">Apache Accumulo 1.5.4</a></li>
-  <li><a href="1.5.3">Apache Accumulo 1.5.3</a></li>
-  <li><a href="1.5.2">Apache Accumulo 1.5.2</a></li>
-  <li><a href="1.5.1">Apache Accumulo 1.5.1</a></li>
-</ul>
-
-
-        </div>
-
-        
-<footer>
-
-  <p><a href="https://www.apache.org";><img src="/images/feather-small.gif" 
alt="Apache Software Foundation" id="asf-logo" height="100" /></a></p>
-
-  <p>Copyright © 2011-2016 The Apache Software Foundation. Licensed under the 
<a href="https://www.apache.org/licenses/LICENSE-2.0";>Apache License, 
Version 2.0</a>.</p>
-
-</footer>
-
-
-      </div>
-    </div>
-  </div>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/59a6d65d/papers/index.html
----------------------------------------------------------------------
diff --git a/papers/index.html b/papers/index.html
index 2a92c2c..b7d42a8 100644
--- a/papers/index.html
+++ b/papers/index.html
@@ -93,13 +93,13 @@
         <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Documentation<span class="caret"></span></a>
         <ul class="dropdown-menu">
-          <li><a href="/user-manual/">User Manuals</a></li>
-          <li><a href="/javadocs/">Javadocs</a></li>
-          <li><a href="/examples/">Examples</a></li>
-          <li><a href="/notable_features">Features</a></li>
-          <li><a href="/screenshots">Screenshots</a></li>
+          <li><a href="/1.8/accumulo_user_manual.html">User Manual 
(1.8)</a></li>
+          <li><a href="/1.8/apidocs">Javadocs (1.8)</a></li>
+          <li><a href="/1.8/examples">Examples (1.8)</a></li>
+          <li><a href="/features">Features</a></li>
           <li><a href="/papers">Papers &amp; Presentations</a></li>
           <li><a href="/glossary">Glossary</a></li>
+          <li><a href="/docs-archive/">Archive</a></li>
         </ul>
         </li>
         <li class="dropdown">
@@ -108,30 +108,11 @@
           <li><a href="/get_involved">Get Involved</a></li>
           <li><a href="/mailing_list">Mailing Lists</a></li>
           <li><a href="/people">People</a></li>
-          <li><a href="/news">News Archive</a></li>
-          <li><a href="/projects">Community Projects</a></li>
-          <li><a href="/thanks">Thanks</a></li>
+          <li><a href="/projects">Related Projects</a></li>
+          <li><a href="/contributor/">Contributor Guide</a></li>
           <li><a href="/governance/">Governance</a></li>
         </ul>
         </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Development<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO";>Issue 
Tracker <i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://github.com/apache/accumulo/pulls";>Pull Requests 
<i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://builds.apache.org/view/A/view/Accumulo";>Jenkins 
Builds <i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://travis-ci.org/apache/accumulo";>TravisCI Builds 
<i class="fa fa-external-link"></i></a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Guides</li>
-          <li><a href="/source">Source &amp; Guide</a></li>
-          <li><a href="/git">Git Workflow</a></li>
-          <li><a href="/versioning">Versioning</a></li>
-          <li><a href="/contrib">Contrib Projects</a></li>
-          <li><a href="/rb">Review Board</a></li>
-          <li><a href="/releasing">Making Releases</a></li>
-          <li><a href="/verifying_releases">Verifying Releases</a></li>
-        </ul>
-        </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/59a6d65d/people.html
----------------------------------------------------------------------
diff --git a/people.html b/people.html
index ece12b6..aa0fac4 100644
--- a/people.html
+++ b/people.html
@@ -93,13 +93,13 @@
         <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Documentation<span class="caret"></span></a>
         <ul class="dropdown-menu">
-          <li><a href="/user-manual/">User Manuals</a></li>
-          <li><a href="/javadocs/">Javadocs</a></li>
-          <li><a href="/examples/">Examples</a></li>
-          <li><a href="/notable_features">Features</a></li>
-          <li><a href="/screenshots">Screenshots</a></li>
+          <li><a href="/1.8/accumulo_user_manual.html">User Manual 
(1.8)</a></li>
+          <li><a href="/1.8/apidocs">Javadocs (1.8)</a></li>
+          <li><a href="/1.8/examples">Examples (1.8)</a></li>
+          <li><a href="/features">Features</a></li>
           <li><a href="/papers">Papers &amp; Presentations</a></li>
           <li><a href="/glossary">Glossary</a></li>
+          <li><a href="/docs-archive/">Archive</a></li>
         </ul>
         </li>
         <li class="dropdown">
@@ -108,30 +108,11 @@
           <li><a href="/get_involved">Get Involved</a></li>
           <li><a href="/mailing_list">Mailing Lists</a></li>
           <li><a href="/people">People</a></li>
-          <li><a href="/news">News Archive</a></li>
-          <li><a href="/projects">Community Projects</a></li>
-          <li><a href="/thanks">Thanks</a></li>
+          <li><a href="/projects">Related Projects</a></li>
+          <li><a href="/contributor/">Contributor Guide</a></li>
           <li><a href="/governance/">Governance</a></li>
         </ul>
         </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Development<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO";>Issue 
Tracker <i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://github.com/apache/accumulo/pulls";>Pull Requests 
<i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://builds.apache.org/view/A/view/Accumulo";>Jenkins 
Builds <i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://travis-ci.org/apache/accumulo";>TravisCI Builds 
<i class="fa fa-external-link"></i></a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Guides</li>
-          <li><a href="/source">Source &amp; Guide</a></li>
-          <li><a href="/git">Git Workflow</a></li>
-          <li><a href="/versioning">Versioning</a></li>
-          <li><a href="/contrib">Contrib Projects</a></li>
-          <li><a href="/rb">Review Board</a></li>
-          <li><a href="/releasing">Making Releases</a></li>
-          <li><a href="/verifying_releases">Verifying Releases</a></li>
-        </ul>
-        </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">
@@ -838,6 +819,18 @@
   </tbody>
 </table>
 
+<h2 id="organizations">Organizations</h2>
+
+<p>First off, thanks to our parent organization, the <a 
href="https://www.apache.org";>Apache Software Foundation</a> and <a 
href="https://www.apache.org/foundation/sponsorship";>all who sponsor</a> 
them.</p>
+
+<p>Additionally, we would like to thank the following organizations for 
resources that they provide:</p>
+
+<ul>
+  <li>ej-technologies for allowing us to use their <a 
href="https://www.ej-technologies.com/products/jprofiler/overview.html";>Java 
profiler</a></li>
+  <li>YourKit for allowing us use of their <a 
href="https://www.yourkit.com/java/profiler/features/";>Java Profiler</a></li>
+  <li>Coverity for running <a 
href="https://scan.coverity.com/projects/accumulo";>static analysis</a></li>
+</ul>
+
 
         </div>
 

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/59a6d65d/projects.html
----------------------------------------------------------------------
diff --git a/projects.html b/projects.html
index 8d4c57a..a389dd1 100644
--- a/projects.html
+++ b/projects.html
@@ -93,13 +93,13 @@
         <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Documentation<span class="caret"></span></a>
         <ul class="dropdown-menu">
-          <li><a href="/user-manual/">User Manuals</a></li>
-          <li><a href="/javadocs/">Javadocs</a></li>
-          <li><a href="/examples/">Examples</a></li>
-          <li><a href="/notable_features">Features</a></li>
-          <li><a href="/screenshots">Screenshots</a></li>
+          <li><a href="/1.8/accumulo_user_manual.html">User Manual 
(1.8)</a></li>
+          <li><a href="/1.8/apidocs">Javadocs (1.8)</a></li>
+          <li><a href="/1.8/examples">Examples (1.8)</a></li>
+          <li><a href="/features">Features</a></li>
           <li><a href="/papers">Papers &amp; Presentations</a></li>
           <li><a href="/glossary">Glossary</a></li>
+          <li><a href="/docs-archive/">Archive</a></li>
         </ul>
         </li>
         <li class="dropdown">
@@ -108,30 +108,11 @@
           <li><a href="/get_involved">Get Involved</a></li>
           <li><a href="/mailing_list">Mailing Lists</a></li>
           <li><a href="/people">People</a></li>
-          <li><a href="/news">News Archive</a></li>
-          <li><a href="/projects">Community Projects</a></li>
-          <li><a href="/thanks">Thanks</a></li>
+          <li><a href="/projects">Related Projects</a></li>
+          <li><a href="/contributor/">Contributor Guide</a></li>
           <li><a href="/governance/">Governance</a></li>
         </ul>
         </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Development<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO";>Issue 
Tracker <i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://github.com/apache/accumulo/pulls";>Pull Requests 
<i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://builds.apache.org/view/A/view/Accumulo";>Jenkins 
Builds <i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://travis-ci.org/apache/accumulo";>TravisCI Builds 
<i class="fa fa-external-link"></i></a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Guides</li>
-          <li><a href="/source">Source &amp; Guide</a></li>
-          <li><a href="/git">Git Workflow</a></li>
-          <li><a href="/versioning">Versioning</a></li>
-          <li><a href="/contrib">Contrib Projects</a></li>
-          <li><a href="/rb">Review Board</a></li>
-          <li><a href="/releasing">Making Releases</a></li>
-          <li><a href="/verifying_releases">Verifying Releases</a></li>
-        </ul>
-        </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/59a6d65d/rb.html
----------------------------------------------------------------------
diff --git a/rb.html b/rb.html
deleted file mode 100644
index 607942e..0000000
--- a/rb.html
+++ /dev/null
@@ -1,286 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<link 
href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/paper/bootstrap.min.css"; 
rel="stylesheet" 
integrity="sha384-awusxf8AUojygHf2+joICySzB780jVvQaVCAt1clU3QsyAitLGul28Qxb2r1e5g+"
 crossorigin="anonymous">
-<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
-<link rel="stylesheet" type="text/css" 
href="https://cdn.datatables.net/v/bs/jq-2.2.3/dt-1.10.12/datatables.min.css";>
-<link href="/css/accumulo.css" rel="stylesheet" type="text/css">
-
-<title>Using Review Board</title>
-
-<script 
src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js";></script>
-<script 
src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"; 
integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
 crossorigin="anonymous"></script>
-<script type="text/javascript" 
src="https://cdn.datatables.net/v/bs/jq-2.2.3/dt-1.10.12/datatables.min.js";></script>
-<script>
-  // show location of canonical site if not currently on the canonical site
-  $(function() {
-    var host = window.location.host;
-    if (typeof host !== 'undefined' && host !== 'accumulo.apache.org') {
-      $('#non-canonical').show();
-    }
-  });
-
-  $(function() {
-    // decorate section headers with anchors
-    return $("h2, h3, h4, h5, h6").each(function(i, el) {
-      var $el, icon, id;
-      $el = $(el);
-      id = $el.attr('id');
-      icon = '<i class="fa fa-link"></i>';
-      if (id) {
-        return $el.append($("<a />").addClass("header-link").attr("href", "#" 
+ id).html(icon));
-      }
-    });
-  });
-  
-  // configure Google Analytics
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
-  
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  if (ga.hasOwnProperty('loaded') && ga.loaded === true) {
-    ga('create', 'UA-50934829-1', 'apache.org');
-    ga('send', 'pageview');
-  }
-</script>
-
-</head>
-<body style="padding-top: 100px">
-
-  <nav class="navbar navbar-default navbar-fixed-top">
-  <div class="container">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" 
data-target="#navbar-items">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a href="/"><img id="nav-logo" alt="Apache Accumulo" 
class="img-responsive" src="/images/accumulo-logo.png" width="200"/></a>
-    </div>
-    <div class="collapse navbar-collapse" id="navbar-items">
-      <ul class="nav navbar-nav">
-        <li class="nav-link"><a href="/downloads">Download</a></li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Releases<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="/release/accumulo-1.8.0/">1.8.0 (Latest)</a></li>
-          <li><a href="/release/accumulo-1.7.2/">1.7.2</a></li>
-          <li><a href="/release/accumulo-1.6.6/">1.6.6</a></li>
-          <li><a href="/release/">Archive</a></li>
-        </ul>
-        </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Documentation<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="/user-manual/">User Manuals</a></li>
-          <li><a href="/javadocs/">Javadocs</a></li>
-          <li><a href="/examples/">Examples</a></li>
-          <li><a href="/notable_features">Features</a></li>
-          <li><a href="/screenshots">Screenshots</a></li>
-          <li><a href="/papers">Papers &amp; Presentations</a></li>
-          <li><a href="/glossary">Glossary</a></li>
-        </ul>
-        </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Community<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="/get_involved">Get Involved</a></li>
-          <li><a href="/mailing_list">Mailing Lists</a></li>
-          <li><a href="/people">People</a></li>
-          <li><a href="/news">News Archive</a></li>
-          <li><a href="/projects">Community Projects</a></li>
-          <li><a href="/thanks">Thanks</a></li>
-          <li><a href="/governance/">Governance</a></li>
-        </ul>
-        </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Development<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO";>Issue 
Tracker <i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://github.com/apache/accumulo/pulls";>Pull Requests 
<i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://builds.apache.org/view/A/view/Accumulo";>Jenkins 
Builds <i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://travis-ci.org/apache/accumulo";>TravisCI Builds 
<i class="fa fa-external-link"></i></a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Guides</li>
-          <li><a href="/source">Source &amp; Guide</a></li>
-          <li><a href="/git">Git Workflow</a></li>
-          <li><a href="/versioning">Versioning</a></li>
-          <li><a href="/contrib">Contrib Projects</a></li>
-          <li><a href="/rb">Review Board</a></li>
-          <li><a href="/releasing">Making Releases</a></li>
-          <li><a href="/verifying_releases">Verifying Releases</a></li>
-        </ul>
-        </li>
-      </ul>
-      <ul class="nav navbar-nav navbar-right">
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Apache 
Software Foundation<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="https://www.apache.org";>Apache Homepage <i class="fa 
fa-external-link"></i></a></li>
-          <li><a href="https://www.apache.org/licenses/LICENSE-2.0";>License <i 
class="fa fa-external-link"></i></a></li>
-          <li><a 
href="https://www.apache.org/foundation/sponsorship";>Sponsorship <i class="fa 
fa-external-link"></i></a></li>
-          <li><a href="https://www.apache.org/security";>Security <i class="fa 
fa-external-link"></i></a></li>
-          <li><a href="https://www.apache.org/foundation/thanks";>Thanks <i 
class="fa fa-external-link"></i></a></li>
-          <li><a 
href="https://www.apache.org/foundation/policies/conduct";>Code of Conduct <i 
class="fa fa-external-link"></i></a></li>
-        </ul>
-        </li>
-      </ul>
-    </div>
-  </div>
-</nav>
-
-
-  <div class="container">
-    <div class="row">
-      <div class="col-md-12">
-
-        <div id="non-canonical" style="display: none; background-color: 
#F0E68C; padding-left: 1em;">
-          Visit the official site at: <a 
href="https://accumulo.apache.org";>https://accumulo.apache.org</a>
-        </div>
-        <div id="content">
-          
-          <h1 class="title">Using Review Board</h1>
-          
-          <p>The Apache Software Foundation provides an <a 
href="https://reviews.apache.org";>instance</a> of
-<a href="https://www.reviewboard.org";>Review Board</a> (RB) for projects to 
use in code reviews. Here is how RB can
-be used to support development in the context of the
-<a href="/bylaws">Apache Accumulo bylaws</a>.</p>
-
-<p>Contributors to Accumulo are encouraged to use RB for non-trivial patches 
and
-any time feedback is desired. No one is required to use RB, but its ready
-availability and better interface for feedback can help with reviews. 
Committers
-seeking review prior to pushing changes can also benefit similarly.</p>
-
-<h2 id="roles-for-review-board">Roles for Review Board</h2>
-
-<h3 id="optional-pre-commit-review">Optional Pre-Commit Review</h3>
-
-<p>Accumulo operates under the <a 
href="https://www.apache.org/foundation/glossary#CommitThenReview";>Commit-Then-Review</a>
 (CtR) policy, so code
-review does not need to occur prior to commit. However, a committer may opt to
-hold a code review before commit for changes that, in their opinion, would
-benefit from additional attention. RB can be used to conduct such code 
reviews.</p>
-
-<h3 id="consensus-approval-after-a-code-change-veto">Consensus Approval after 
a Code Change Veto</h3>
-
-<p>Code changes are approved by lazy approval, with consensus approval 
following
-a veto (see the <a href="/bylaws#actions">Actions</a> section of the bylaws). 
RB can be used
-to coordinate a consensus approval vote by providing a convenient view of the
-code change under consideration. The vote itself must still be held on the
-developer mailing list.</p>
-
-<h2 id="guidelines-for-posting-a-review">Guidelines for Posting a Review</h2>
-
-<ul>
-  <li>It is best to post a git-generated patch as the basis for a review. RB 
does
-not support patches containing multiple commits, so either squash commits
-first, or submit a diff spanning the changeset. The <code 
class="highlighter-rouge">rbt</code> and <code 
class="highlighter-rouge">post-review</code>
-tools generate diffs.</li>
-  <li>Strive to make your changes small. Reviewers are less likely to want to
-trudge through a review with lots of changes, and are more likely to miss
-problems.</li>
-  <li>Begin the summary of the review with a JIRA issue number. A review must
-always be associated with a JIRA issue. The issue number should also be
-entered in the “Bugs” field of the review, providing a link to JIRA.</li>
-  <li>The “Branch” field should contain the name of the branch that the 
code change
-is based on (e.g., the base of your git feature branch).</li>
-  <li>Include the “accumulo” user group as reviewers. Also include 
specific people
-as individual reviewers, even if they are in the “accumulo” group, if you
-deem them of primary importance for the review (e.g., you have been working
-out problems with the review with them, they are expert in the area).</li>
-  <li>Use the description to summarize the change under review. Include helpful
-instructions to the reviewers here.</li>
-  <li>Describe any testing done on the change. It is not expected that 
reviewers
-will do their own testing, and they may reject the review if you have not
-done sufficient testing yourself.</li>
-  <li>Avoid submitting generated code for review if it can be reproduced by a
-reviewer.</li>
-</ul>
-
-<p>After the review is published, set the status of the associated JIRA issue 
to
-“Patch Available” as a signal to reviewers. Also, link to the review from 
the
-issue (More -&gt; Link -&gt; Web Link) to help viewers of the issue find the 
review
-and assess its progress.</p>
-
-<h2 id="guidelines-for-reviewing-code">Guidelines for Reviewing Code</h2>
-
-<ul>
-  <li>Try to associate comments with relevant lines of code in the review.</li>
-  <li>By default, each comment opens a review issue. If a comment pertains to
-something that should not block the review from completing successfully, then
-clear the “Open an issue” checkbox before saving your feedback. Examples 
that
-might qualify as non-issues: minor formatting/whitespace issues, spelling
-mistakes, general background questions.</li>
-  <li>If a review looks good, be sure to “Ship It” by either using the 
“Ship It!”
-button or by submitting a general review with the “Ship It” checkbox 
checked.</li>
-</ul>
-
-<h2 id="guidelines-for-completing-a-review">Guidelines for Completing a 
Review</h2>
-
-<p>These guidelines do not apply to consensus approval votes, since the vote
-completion depends on the votes registered in the developer mailing list.</p>
-
-<ul>
-  <li>Use your judgement for the number of “Ship It”s you want to receive 
to
-consider a review passed. Usually, getting one “Ship It” is enough to 
proceed
-with a commit. It is recommended that the “Ship It” be from a committer who
-is a neutral party not involved in the change under review.</li>
-  <li>Use your judgement for the minimum time length you set for the review. 
Simple
-changes can be up for just a day, while complex ones should take up to 
seven.</li>
-  <li>Review time should be extended in the face of problems discovered in the
-review. Update the review with improved code instead of discarding (i.e.,
-closing unsuccessfully) it and beginning a new one.</li>
-  <li>A review should not be “submitted” (i.e., closed successfully) 
unless there
-are no outstanding issues. Check with reviewers to ensure that their issues
-are resolved satisfactorily.</li>
-  <li>A review should be “discarded” if the code requires major rework or 
it
-becomes obvious it should never be committed (due to design changes,
-becoming overcome by events, being back-burnered, etc.).</li>
-  <li>Don’t leave a review open indefinitely. Once you have received 
sufficient
-feedback to submit or discard it, do so. If there has been no activity for
-some time, discard the review. A new one can always be created later.</li>
-</ul>
-
-<p>Once you’ve closed a review as submitted, if you are unable to commit your
-changes yourself, attach the final version of them to the relevant JIRA issue.
-They should be in the form of a patch containing a single commit,
-<a href="/git#contributors">per the final steps of the contribution 
process</a>.</p>
-
-
-        </div>
-
-        
-<footer>
-
-  <p><a href="https://www.apache.org";><img src="/images/feather-small.gif" 
alt="Apache Software Foundation" id="asf-logo" height="100" /></a></p>
-
-  <p>Copyright © 2011-2016 The Apache Software Foundation. Licensed under the 
<a href="https://www.apache.org/licenses/LICENSE-2.0";>Apache License, 
Version 2.0</a>.</p>
-
-</footer>
-
-
-      </div>
-    </div>
-  </div>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/59a6d65d/release/accumulo-1.5.1/index.html
----------------------------------------------------------------------
diff --git a/release/accumulo-1.5.1/index.html 
b/release/accumulo-1.5.1/index.html
index 88cc2fe..db6048d 100644
--- a/release/accumulo-1.5.1/index.html
+++ b/release/accumulo-1.5.1/index.html
@@ -93,13 +93,13 @@
         <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Documentation<span class="caret"></span></a>
         <ul class="dropdown-menu">
-          <li><a href="/user-manual/">User Manuals</a></li>
-          <li><a href="/javadocs/">Javadocs</a></li>
-          <li><a href="/examples/">Examples</a></li>
-          <li><a href="/notable_features">Features</a></li>
-          <li><a href="/screenshots">Screenshots</a></li>
+          <li><a href="/1.8/accumulo_user_manual.html">User Manual 
(1.8)</a></li>
+          <li><a href="/1.8/apidocs">Javadocs (1.8)</a></li>
+          <li><a href="/1.8/examples">Examples (1.8)</a></li>
+          <li><a href="/features">Features</a></li>
           <li><a href="/papers">Papers &amp; Presentations</a></li>
           <li><a href="/glossary">Glossary</a></li>
+          <li><a href="/docs-archive/">Archive</a></li>
         </ul>
         </li>
         <li class="dropdown">
@@ -108,30 +108,11 @@
           <li><a href="/get_involved">Get Involved</a></li>
           <li><a href="/mailing_list">Mailing Lists</a></li>
           <li><a href="/people">People</a></li>
-          <li><a href="/news">News Archive</a></li>
-          <li><a href="/projects">Community Projects</a></li>
-          <li><a href="/thanks">Thanks</a></li>
+          <li><a href="/projects">Related Projects</a></li>
+          <li><a href="/contributor/">Contributor Guide</a></li>
           <li><a href="/governance/">Governance</a></li>
         </ul>
         </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Development<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO";>Issue 
Tracker <i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://github.com/apache/accumulo/pulls";>Pull Requests 
<i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://builds.apache.org/view/A/view/Accumulo";>Jenkins 
Builds <i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://travis-ci.org/apache/accumulo";>TravisCI Builds 
<i class="fa fa-external-link"></i></a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Guides</li>
-          <li><a href="/source">Source &amp; Guide</a></li>
-          <li><a href="/git">Git Workflow</a></li>
-          <li><a href="/versioning">Versioning</a></li>
-          <li><a href="/contrib">Contrib Projects</a></li>
-          <li><a href="/rb">Review Board</a></li>
-          <li><a href="/releasing">Making Releases</a></li>
-          <li><a href="/verifying_releases">Verifying Releases</a></li>
-        </ul>
-        </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">
@@ -167,8 +148,17 @@
 <p>Apache Accumulo 1.5.1 is a maintenance release on the 1.5 version branch.
 This release contains changes from over 200 issues, comprised of bug fixes
 (client side and server side), new test cases, and updated Hadoop support
-contributed by over 30 different contributors and committers.
-As this is a maintenance release, Apache Accumulo 1.5.1 has no client API 
+contributed by over 30 different contributors and committers.</p>
+
+<p>Below are resources for this release:</p>
+
+<ul>
+  <li><a href="/1.5/accumulo_user_manual.html">User Manual</a></li>
+  <li><a href="/1.5/apidocs">Javadocs</a></li>
+  <li><a href="/1.5/examples">Examples</a></li>
+</ul>
+
+<p>As this is a maintenance release, Apache Accumulo 1.5.1 has no client API 
 incompatibilities over Apache Accumulo 1.5.0 and requires no manual upgrade 
 process. Users of 1.5.0 are strongly encouraged to update as soon as possible 
 to benefit from the improvements.</p>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/59a6d65d/release/accumulo-1.5.2/index.html
----------------------------------------------------------------------
diff --git a/release/accumulo-1.5.2/index.html 
b/release/accumulo-1.5.2/index.html
index 666d5ae..cdd07ad 100644
--- a/release/accumulo-1.5.2/index.html
+++ b/release/accumulo-1.5.2/index.html
@@ -93,13 +93,13 @@
         <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Documentation<span class="caret"></span></a>
         <ul class="dropdown-menu">
-          <li><a href="/user-manual/">User Manuals</a></li>
-          <li><a href="/javadocs/">Javadocs</a></li>
-          <li><a href="/examples/">Examples</a></li>
-          <li><a href="/notable_features">Features</a></li>
-          <li><a href="/screenshots">Screenshots</a></li>
+          <li><a href="/1.8/accumulo_user_manual.html">User Manual 
(1.8)</a></li>
+          <li><a href="/1.8/apidocs">Javadocs (1.8)</a></li>
+          <li><a href="/1.8/examples">Examples (1.8)</a></li>
+          <li><a href="/features">Features</a></li>
           <li><a href="/papers">Papers &amp; Presentations</a></li>
           <li><a href="/glossary">Glossary</a></li>
+          <li><a href="/docs-archive/">Archive</a></li>
         </ul>
         </li>
         <li class="dropdown">
@@ -108,30 +108,11 @@
           <li><a href="/get_involved">Get Involved</a></li>
           <li><a href="/mailing_list">Mailing Lists</a></li>
           <li><a href="/people">People</a></li>
-          <li><a href="/news">News Archive</a></li>
-          <li><a href="/projects">Community Projects</a></li>
-          <li><a href="/thanks">Thanks</a></li>
+          <li><a href="/projects">Related Projects</a></li>
+          <li><a href="/contributor/">Contributor Guide</a></li>
           <li><a href="/governance/">Governance</a></li>
         </ul>
         </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Development<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO";>Issue 
Tracker <i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://github.com/apache/accumulo/pulls";>Pull Requests 
<i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://builds.apache.org/view/A/view/Accumulo";>Jenkins 
Builds <i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://travis-ci.org/apache/accumulo";>TravisCI Builds 
<i class="fa fa-external-link"></i></a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Guides</li>
-          <li><a href="/source">Source &amp; Guide</a></li>
-          <li><a href="/git">Git Workflow</a></li>
-          <li><a href="/versioning">Versioning</a></li>
-          <li><a href="/contrib">Contrib Projects</a></li>
-          <li><a href="/rb">Review Board</a></li>
-          <li><a href="/releasing">Making Releases</a></li>
-          <li><a href="/verifying_releases">Verifying Releases</a></li>
-        </ul>
-        </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">
@@ -167,8 +148,17 @@
 <p>Apache Accumulo 1.5.2 is a maintenance release on the 1.5 version branch.
 This release contains changes from over 100 issues, comprised of bug fixes
 (client side and server side), new test cases, and updated Hadoop support
-contributed by over 30 different contributors and committers.
-As this is a maintenance release, Apache Accumulo 1.5.2 has no client API 
+contributed by over 30 different contributors and committers.</p>
+
+<p>Below are resources for this release:</p>
+
+<ul>
+  <li><a href="/1.5/accumulo_user_manual.html">User Manual</a></li>
+  <li><a href="/1.5/apidocs">Javadocs</a></li>
+  <li><a href="/1.5/examples">Examples</a></li>
+</ul>
+
+<p>As this is a maintenance release, Apache Accumulo 1.5.2 has no client API 
 incompatibilities over Apache Accumulo 1.5.0 and 1.5.1 and requires no manual 
upgrade 
 process. Users of 1.5.0 or 1.5.1 are strongly encouraged to update as soon as 
possible 
 to benefit from the improvements.</p>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/59a6d65d/release/accumulo-1.5.3/index.html
----------------------------------------------------------------------
diff --git a/release/accumulo-1.5.3/index.html 
b/release/accumulo-1.5.3/index.html
index 9b89563..8276b84 100644
--- a/release/accumulo-1.5.3/index.html
+++ b/release/accumulo-1.5.3/index.html
@@ -93,13 +93,13 @@
         <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Documentation<span class="caret"></span></a>
         <ul class="dropdown-menu">
-          <li><a href="/user-manual/">User Manuals</a></li>
-          <li><a href="/javadocs/">Javadocs</a></li>
-          <li><a href="/examples/">Examples</a></li>
-          <li><a href="/notable_features">Features</a></li>
-          <li><a href="/screenshots">Screenshots</a></li>
+          <li><a href="/1.8/accumulo_user_manual.html">User Manual 
(1.8)</a></li>
+          <li><a href="/1.8/apidocs">Javadocs (1.8)</a></li>
+          <li><a href="/1.8/examples">Examples (1.8)</a></li>
+          <li><a href="/features">Features</a></li>
           <li><a href="/papers">Papers &amp; Presentations</a></li>
           <li><a href="/glossary">Glossary</a></li>
+          <li><a href="/docs-archive/">Archive</a></li>
         </ul>
         </li>
         <li class="dropdown">
@@ -108,30 +108,11 @@
           <li><a href="/get_involved">Get Involved</a></li>
           <li><a href="/mailing_list">Mailing Lists</a></li>
           <li><a href="/people">People</a></li>
-          <li><a href="/news">News Archive</a></li>
-          <li><a href="/projects">Community Projects</a></li>
-          <li><a href="/thanks">Thanks</a></li>
+          <li><a href="/projects">Related Projects</a></li>
+          <li><a href="/contributor/">Contributor Guide</a></li>
           <li><a href="/governance/">Governance</a></li>
         </ul>
         </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Development<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO";>Issue 
Tracker <i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://github.com/apache/accumulo/pulls";>Pull Requests 
<i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://builds.apache.org/view/A/view/Accumulo";>Jenkins 
Builds <i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://travis-ci.org/apache/accumulo";>TravisCI Builds 
<i class="fa fa-external-link"></i></a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Guides</li>
-          <li><a href="/source">Source &amp; Guide</a></li>
-          <li><a href="/git">Git Workflow</a></li>
-          <li><a href="/versioning">Versioning</a></li>
-          <li><a href="/contrib">Contrib Projects</a></li>
-          <li><a href="/rb">Review Board</a></li>
-          <li><a href="/releasing">Making Releases</a></li>
-          <li><a href="/verifying_releases">Verifying Releases</a></li>
-        </ul>
-        </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">
@@ -168,6 +149,14 @@
 1.5 release, with development shifting towards newer release lines. We 
recommend upgrading
 to a newer version to continue to get bug fixes and new features.</p>
 
+<p>Below are resources for this release:</p>
+
+<ul>
+  <li><a href="/1.5/accumulo_user_manual.html">User Manual</a></li>
+  <li><a href="/1.5/apidocs">Javadocs</a></li>
+  <li><a href="/1.5/examples">Examples</a></li>
+</ul>
+
 <p>In the context of Accumulo’s <a href="http://semver.org";>Semantic 
Versioning</a> <a 
href="https://github.com/apache/accumulo/blob/1.7.0/README.md#api";>guidelines</a>,
 this is a “patch version”. This means that there should be no public API 
changes. Any
 changes which were made were done in a backwards-compatible manner. Code that

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/59a6d65d/release/accumulo-1.5.4/index.html
----------------------------------------------------------------------
diff --git a/release/accumulo-1.5.4/index.html 
b/release/accumulo-1.5.4/index.html
index 4189605..56f441b 100644
--- a/release/accumulo-1.5.4/index.html
+++ b/release/accumulo-1.5.4/index.html
@@ -93,13 +93,13 @@
         <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Documentation<span class="caret"></span></a>
         <ul class="dropdown-menu">
-          <li><a href="/user-manual/">User Manuals</a></li>
-          <li><a href="/javadocs/">Javadocs</a></li>
-          <li><a href="/examples/">Examples</a></li>
-          <li><a href="/notable_features">Features</a></li>
-          <li><a href="/screenshots">Screenshots</a></li>
+          <li><a href="/1.8/accumulo_user_manual.html">User Manual 
(1.8)</a></li>
+          <li><a href="/1.8/apidocs">Javadocs (1.8)</a></li>
+          <li><a href="/1.8/examples">Examples (1.8)</a></li>
+          <li><a href="/features">Features</a></li>
           <li><a href="/papers">Papers &amp; Presentations</a></li>
           <li><a href="/glossary">Glossary</a></li>
+          <li><a href="/docs-archive/">Archive</a></li>
         </ul>
         </li>
         <li class="dropdown">
@@ -108,30 +108,11 @@
           <li><a href="/get_involved">Get Involved</a></li>
           <li><a href="/mailing_list">Mailing Lists</a></li>
           <li><a href="/people">People</a></li>
-          <li><a href="/news">News Archive</a></li>
-          <li><a href="/projects">Community Projects</a></li>
-          <li><a href="/thanks">Thanks</a></li>
+          <li><a href="/projects">Related Projects</a></li>
+          <li><a href="/contributor/">Contributor Guide</a></li>
           <li><a href="/governance/">Governance</a></li>
         </ul>
         </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Development<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO";>Issue 
Tracker <i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://github.com/apache/accumulo/pulls";>Pull Requests 
<i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://builds.apache.org/view/A/view/Accumulo";>Jenkins 
Builds <i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://travis-ci.org/apache/accumulo";>TravisCI Builds 
<i class="fa fa-external-link"></i></a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Guides</li>
-          <li><a href="/source">Source &amp; Guide</a></li>
-          <li><a href="/git">Git Workflow</a></li>
-          <li><a href="/versioning">Versioning</a></li>
-          <li><a href="/contrib">Contrib Projects</a></li>
-          <li><a href="/rb">Review Board</a></li>
-          <li><a href="/releasing">Making Releases</a></li>
-          <li><a href="/verifying_releases">Verifying Releases</a></li>
-        </ul>
-        </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">
@@ -167,6 +148,14 @@
 <p>Apache Accumulo 1.5.4 is one more bug-fix release for the 1.5 series. Like 
1.5.3 before it, this release contains a
 very small changeset when considering the normal size of changes in a 
release.</p>
 
+<p>Below are resources for this release:</p>
+
+<ul>
+  <li><a href="/1.5/accumulo_user_manual.html">User Manual</a></li>
+  <li><a href="/1.5/apidocs">Javadocs</a></li>
+  <li><a href="/1.5/examples">Examples</a></li>
+</ul>
+
 <p>This release contains no changes to the <a 
href="https://github.com/apache/accumulo/blob/1.7.0/README.md#api";>public 
API</a>. As such, there are no concerns
 for the compatibility of user code running against 1.5.3. All users are 
encourage to upgrade
 immediately without concern of stability and compatibility.</p>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/59a6d65d/release/accumulo-1.6.0/index.html
----------------------------------------------------------------------
diff --git a/release/accumulo-1.6.0/index.html 
b/release/accumulo-1.6.0/index.html
index f045e25..4e18ab5 100644
--- a/release/accumulo-1.6.0/index.html
+++ b/release/accumulo-1.6.0/index.html
@@ -93,13 +93,13 @@
         <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Documentation<span class="caret"></span></a>
         <ul class="dropdown-menu">
-          <li><a href="/user-manual/">User Manuals</a></li>
-          <li><a href="/javadocs/">Javadocs</a></li>
-          <li><a href="/examples/">Examples</a></li>
-          <li><a href="/notable_features">Features</a></li>
-          <li><a href="/screenshots">Screenshots</a></li>
+          <li><a href="/1.8/accumulo_user_manual.html">User Manual 
(1.8)</a></li>
+          <li><a href="/1.8/apidocs">Javadocs (1.8)</a></li>
+          <li><a href="/1.8/examples">Examples (1.8)</a></li>
+          <li><a href="/features">Features</a></li>
           <li><a href="/papers">Papers &amp; Presentations</a></li>
           <li><a href="/glossary">Glossary</a></li>
+          <li><a href="/docs-archive/">Archive</a></li>
         </ul>
         </li>
         <li class="dropdown">
@@ -108,30 +108,11 @@
           <li><a href="/get_involved">Get Involved</a></li>
           <li><a href="/mailing_list">Mailing Lists</a></li>
           <li><a href="/people">People</a></li>
-          <li><a href="/news">News Archive</a></li>
-          <li><a href="/projects">Community Projects</a></li>
-          <li><a href="/thanks">Thanks</a></li>
+          <li><a href="/projects">Related Projects</a></li>
+          <li><a href="/contributor/">Contributor Guide</a></li>
           <li><a href="/governance/">Governance</a></li>
         </ul>
         </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Development<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO";>Issue 
Tracker <i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://github.com/apache/accumulo/pulls";>Pull Requests 
<i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://builds.apache.org/view/A/view/Accumulo";>Jenkins 
Builds <i class="fa fa-external-link"></i></a></li>
-          <li><a href="https://travis-ci.org/apache/accumulo";>TravisCI Builds 
<i class="fa fa-external-link"></i></a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Guides</li>
-          <li><a href="/source">Source &amp; Guide</a></li>
-          <li><a href="/git">Git Workflow</a></li>
-          <li><a href="/versioning">Versioning</a></li>
-          <li><a href="/contrib">Contrib Projects</a></li>
-          <li><a href="/rb">Review Board</a></li>
-          <li><a href="/releasing">Making Releases</a></li>
-          <li><a href="/verifying_releases">Verifying Releases</a></li>
-        </ul>
-        </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">
@@ -166,6 +147,14 @@
 
 <p>Apache Accumulo 1.6.0 adds some major new features and fixes many bugs.  
This release contains changes from 609 issues contributed by 36 contributors 
and committers.</p>
 
+<p>Below are resources for this release:</p>
+
+<ul>
+  <li><a href="/1.6/accumulo_user_manual.html">User Manual</a></li>
+  <li><a href="/1.6/apidocs">Javadocs</a></li>
+  <li><a href="/1.6/examples">Examples</a></li>
+</ul>
+
 <p>Accumulo 1.6.0 runs on Hadoop 1, however Hadoop 2 with HA namenode is 
recommended for production systems.  In addition to HA, Hadoop 2 also offers 
better data durability guarantees, in the case when nodes lose power, than 
Hadoop 1.</p>
 
 <h2 id="notable-improvements">Notable Improvements</h2>

Reply via email to