accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwa...@apache.org
Subject [accumulo-website] branch asf-site updated: Jekyll build from master:2ca95a8
Date Thu, 18 Oct 2018 20:54:10 GMT
This is an automated email from the ASF dual-hosted git repository.

mwalch pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new 169f6fd  Jekyll build from master:2ca95a8
169f6fd is described below

commit 169f6fd1ce86ae6c0ef99b53ae0df94333225ca6
Author: Mike Walch <mwalch@apache.org>
AuthorDate: Thu Oct 18 16:53:40 2018 -0400

    Jekyll build from master:2ca95a8
    
    Fixes #67 - Move features and glossary pages into docs (#121)
    
    * Improved linking to docs from main page
---
 1.3/user_manual/Accumulo_Design.html               |   4 +-
 1.3/user_manual/Accumulo_Shell.html                |   4 +-
 1.3/user_manual/Administration.html                |   4 +-
 1.3/user_manual/Analytics.html                     |   4 +-
 1.3/user_manual/Contents.html                      |   4 +-
 1.3/user_manual/High_Speed_Ingest.html             |   4 +-
 1.3/user_manual/Introduction.html                  |   4 +-
 1.3/user_manual/Security.html                      |   4 +-
 1.3/user_manual/Shell_Commands.html                |   4 +-
 1.3/user_manual/Table_Configuration.html           |   4 +-
 1.3/user_manual/Table_Design.html                  |   4 +-
 1.3/user_manual/Writing_Accumulo_Clients.html      |   4 +-
 1.3/user_manual/accumulo_user_manual.html          |   4 +-
 1.3/user_manual/examples/aggregation.html          |   4 +-
 1.3/user_manual/examples/batch.html                |   4 +-
 1.3/user_manual/examples/bloom.html                |   4 +-
 1.3/user_manual/examples/bulkIngest.html           |   4 +-
 1.3/user_manual/examples/constraints.html          |   4 +-
 1.3/user_manual/examples/dirlist.html              |   4 +-
 1.3/user_manual/examples/filter.html               |   4 +-
 1.3/user_manual/examples/helloworld.html           |   4 +-
 1.3/user_manual/examples/index.html                |   4 +-
 1.3/user_manual/examples/mapred.html               |   4 +-
 1.3/user_manual/examples/shard.html                |   4 +-
 1.3/user_manual/index.html                         |   4 +-
 1.4/examples/batch.html                            |   4 +-
 1.4/examples/bloom.html                            |   4 +-
 1.4/examples/bulkIngest.html                       |   4 +-
 1.4/examples/combiner.html                         |   4 +-
 1.4/examples/constraints.html                      |   4 +-
 1.4/examples/dirlist.html                          |   4 +-
 1.4/examples/filedata.html                         |   4 +-
 1.4/examples/filter.html                           |   4 +-
 1.4/examples/helloworld.html                       |   4 +-
 1.4/examples/index.html                            |   4 +-
 1.4/examples/isolation.html                        |   4 +-
 1.4/examples/mapred.html                           |   4 +-
 1.4/examples/shard.html                            |   4 +-
 1.4/examples/visibility.html                       |   4 +-
 1.4/user_manual/Accumulo_Design.html               |   4 +-
 1.4/user_manual/Accumulo_Shell.html                |   4 +-
 1.4/user_manual/Administration.html                |   4 +-
 1.4/user_manual/Analytics.html                     |   4 +-
 1.4/user_manual/Contents.html                      |   4 +-
 1.4/user_manual/Development_Clients.html           |   4 +-
 1.4/user_manual/High_Speed_Ingest.html             |   4 +-
 1.4/user_manual/Introduction.html                  |   4 +-
 1.4/user_manual/Security.html                      |   4 +-
 1.4/user_manual/Shell_Commands.html                |   4 +-
 1.4/user_manual/Table_Configuration.html           |   4 +-
 1.4/user_manual/Table_Design.html                  |   4 +-
 1.4/user_manual/Writing_Accumulo_Clients.html      |   4 +-
 1.4/user_manual/accumulo_user_manual.html          |   4 +-
 1.4/user_manual/index.html                         |   4 +-
 1.5/examples/batch.html                            |   4 +-
 1.5/examples/bloom.html                            |   4 +-
 1.5/examples/bulkIngest.html                       |   4 +-
 1.5/examples/classpath.html                        |   4 +-
 1.5/examples/client.html                           |   4 +-
 1.5/examples/combiner.html                         |   4 +-
 1.5/examples/constraints.html                      |   4 +-
 1.5/examples/dirlist.html                          |   4 +-
 1.5/examples/export.html                           |   4 +-
 1.5/examples/filedata.html                         |   4 +-
 1.5/examples/filter.html                           |   4 +-
 1.5/examples/helloworld.html                       |   4 +-
 1.5/examples/index.html                            |   4 +-
 1.5/examples/isolation.html                        |   4 +-
 1.5/examples/mapred.html                           |   4 +-
 1.5/examples/maxmutation.html                      |   4 +-
 1.5/examples/regex.html                            |   4 +-
 1.5/examples/rowhash.html                          |   4 +-
 1.5/examples/shard.html                            |   4 +-
 1.5/examples/tabletofile.html                      |   4 +-
 1.5/examples/terasort.html                         |   4 +-
 1.5/examples/visibility.html                       |   4 +-
 1.6/examples/batch.html                            |   4 +-
 1.6/examples/bloom.html                            |   4 +-
 1.6/examples/bulkIngest.html                       |   4 +-
 1.6/examples/classpath.html                        |   4 +-
 1.6/examples/client.html                           |   4 +-
 1.6/examples/combiner.html                         |   4 +-
 1.6/examples/constraints.html                      |   4 +-
 1.6/examples/dirlist.html                          |   4 +-
 1.6/examples/export.html                           |   4 +-
 1.6/examples/filedata.html                         |   4 +-
 1.6/examples/filter.html                           |   4 +-
 1.6/examples/helloworld.html                       |   4 +-
 1.6/examples/index.html                            |   4 +-
 1.6/examples/isolation.html                        |   4 +-
 1.6/examples/mapred.html                           |   4 +-
 1.6/examples/maxmutation.html                      |   4 +-
 1.6/examples/regex.html                            |   4 +-
 1.6/examples/reservations.html                     |   4 +-
 1.6/examples/rowhash.html                          |   4 +-
 1.6/examples/shard.html                            |   4 +-
 1.6/examples/tabletofile.html                      |   4 +-
 1.6/examples/terasort.html                         |   4 +-
 1.6/examples/visibility.html                       |   4 +-
 1.7/examples/batch.html                            |   4 +-
 1.7/examples/bloom.html                            |   4 +-
 1.7/examples/bulkIngest.html                       |   4 +-
 1.7/examples/classpath.html                        |   4 +-
 1.7/examples/client.html                           |   4 +-
 1.7/examples/combiner.html                         |   4 +-
 1.7/examples/constraints.html                      |   4 +-
 1.7/examples/dirlist.html                          |   4 +-
 1.7/examples/export.html                           |   4 +-
 1.7/examples/filedata.html                         |   4 +-
 1.7/examples/filter.html                           |   4 +-
 1.7/examples/helloworld.html                       |   4 +-
 1.7/examples/index.html                            |   4 +-
 1.7/examples/isolation.html                        |   4 +-
 1.7/examples/mapred.html                           |   4 +-
 1.7/examples/maxmutation.html                      |   4 +-
 1.7/examples/regex.html                            |   4 +-
 1.7/examples/reservations.html                     |   4 +-
 1.7/examples/rowhash.html                          |   4 +-
 1.7/examples/shard.html                            |   4 +-
 1.7/examples/tabletofile.html                      |   4 +-
 1.7/examples/terasort.html                         |   4 +-
 1.7/examples/visibility.html                       |   4 +-
 1.8/examples/index.html                            |   4 +-
 1.9/examples/index.html                            |   4 +-
 api/index.html                                     |   4 +-
 blog/2014/05/03/accumulo-classloader.html          |   4 +-
 .../05/27/getting-started-with-accumulo-1.6.0.html |   4 +-
 .../scaling-accumulo-with-multivolume-support.html |   4 +-
 .../2014/07/09/functional-reads-over-accumulo.html |   4 +-
 ...eystores-for-configuring-accumulo-with-ssl.html |   4 +-
 blog/2015/03/20/balancing-groups-of-tablets.html   |   4 +-
 .../replicating-data-across-accumulo-clusters.html |   4 +-
 blog/2016/11/02/durability-performance.html        |   4 +-
 blog/2016/11/16/simpler-scripts-and-config.html    |   4 +-
 blog/2016/12/19/running-on-fedora-25.html          |   4 +-
 .../03/06/security-performance-implications.html   |   4 +-
 blog/2017/03/21/happy-anniversary-accumulo.html    |   4 +-
 blog/2017/04/21/introducing-uno-and-muchos.html    |   4 +-
 .../06/29/accumulo-documentation-improvements.html |   4 +-
 .../2017/07/27/accumulo-summmit-on-october-16.html |   4 +-
 blog/2017/12/12/take-the-accumulo-tour.html        |   4 +-
 blog/2018/03/16/moving-to-github-issues.html       |   4 +-
 blog/2018/03/22/view-metrics-in-grafana.html       |   4 +-
 blog/2018/07/05/accumulo-summit.html               |   4 +-
 contact-us/index.html                              |   4 +-
 contributor/bylaws.html                            |   4 +-
 contributor/consensusBuilding.html                 |   4 +-
 contributor/contrib-projects.html                  |   4 +-
 contributor/lazyConsensus.html                     |   4 +-
 contributor/making-release.html                    |   4 +-
 contributor/rb.html                                |   4 +-
 contributor/release-management.html                |   4 +-
 contributor/verifying-release.html                 |   4 +-
 contributor/versioning.html                        |   4 +-
 contributor/voting.html                            |   4 +-
 contributors-guide/index.html                      |   4 +-
 docs-archive/index.html                            |   4 +-
 docs/2.x/administration/caching.html               |   8 +-
 .../administration/configuration-management.html   |   8 +-
 docs/2.x/administration/crypto.html                |   8 +-
 docs/2.x/administration/fate.html                  |   8 +-
 docs/2.x/administration/in-depth-install.html      |   8 +-
 docs/2.x/administration/kerberos.html              |   8 +-
 docs/2.x/administration/monitoring-metrics.html    |   8 +-
 docs/2.x/administration/multivolume.html           |   8 +-
 docs/2.x/administration/properties.html            |   8 +-
 docs/2.x/administration/replication.html           |   8 +-
 docs/2.x/administration/scan-executors.html        |   8 +-
 docs/2.x/administration/ssl.html                   |   8 +-
 docs/2.x/administration/tracing.html               |   8 +-
 docs/2.x/administration/upgrading.html             |   8 +-
 docs/2.x/development/client-properties.html        |   8 +-
 docs/2.x/development/development_tools.html        |   8 +-
 docs/2.x/development/high_speed_ingest.html        |   8 +-
 docs/2.x/development/iterators.html                |   8 +-
 docs/2.x/development/mapreduce.html                |   8 +-
 docs/2.x/development/proxy.html                    |   8 +-
 docs/2.x/development/sampling.html                 |   8 +-
 docs/2.x/development/security.html                 |   8 +-
 docs/2.x/development/summaries.html                |   8 +-
 docs/2.x/getting-started/clients.html              |   8 +-
 docs/2.x/getting-started/design.html               |   8 +-
 .../2.x/getting-started/features.html              | 212 ++++++-
 .../getting-started/{shell.html => glossary.html}  | 324 ++++++----
 docs/2.x/getting-started/quick-install.html        |   8 +-
 docs/2.x/getting-started/shell.html                |   8 +-
 docs/2.x/getting-started/table_configuration.html  |   8 +-
 docs/2.x/getting-started/table_design.html         |   8 +-
 docs/2.x/troubleshooting/advanced.html             |   8 +-
 docs/2.x/troubleshooting/basic.html                |   8 +-
 docs/2.x/troubleshooting/performance.html          |   8 +-
 .../troubleshooting/system-metadata-tables.html    |   8 +-
 docs/2.x/troubleshooting/tools.html                |   8 +-
 downloads/index.html                               |   4 +-
 external-docs/index.html                           |   4 +-
 features/index.html                                | 667 +--------------------
 feed.xml                                           |   4 +-
 glossary/index.html                                | 378 +-----------
 how-to-contribute/index.html                       |   4 +-
 index.html                                         |  12 +-
 news/index.html                                    |   4 +-
 notable_features.html                              |  11 -
 notable_features/index.html                        |  11 +
 people/index.html                                  |   4 +-
 quickstart-1.x/index.html                          |   4 +-
 redirects.json                                     |   2 +-
 related-projects/index.html                        |   4 +-
 release/accumulo-1.3.5-incubating/index.html       |   4 +-
 release/accumulo-1.3.6/index.html                  |   4 +-
 release/accumulo-1.4.0/index.html                  |   4 +-
 release/accumulo-1.4.1/index.html                  |   4 +-
 release/accumulo-1.4.2/index.html                  |   4 +-
 release/accumulo-1.4.3/index.html                  |   4 +-
 release/accumulo-1.4.4/index.html                  |   4 +-
 release/accumulo-1.4.5/index.html                  |   4 +-
 release/accumulo-1.5.0/index.html                  |   4 +-
 release/accumulo-1.5.1/index.html                  |   4 +-
 release/accumulo-1.5.2/index.html                  |   4 +-
 release/accumulo-1.5.3/index.html                  |   4 +-
 release/accumulo-1.5.4/index.html                  |   4 +-
 release/accumulo-1.6.0/index.html                  |   4 +-
 release/accumulo-1.6.1/index.html                  |   4 +-
 release/accumulo-1.6.2/index.html                  |   4 +-
 release/accumulo-1.6.3/index.html                  |   4 +-
 release/accumulo-1.6.4/index.html                  |   4 +-
 release/accumulo-1.6.5/index.html                  |   4 +-
 release/accumulo-1.6.6/index.html                  |   4 +-
 release/accumulo-1.7.0/index.html                  |   4 +-
 release/accumulo-1.7.1/index.html                  |   4 +-
 release/accumulo-1.7.2/index.html                  |   4 +-
 release/accumulo-1.7.3/index.html                  |   4 +-
 release/accumulo-1.7.4/index.html                  |   4 +-
 release/accumulo-1.8.0/index.html                  |   4 +-
 release/accumulo-1.8.1/index.html                  |   4 +-
 release/accumulo-1.9.0/index.html                  |   4 +-
 release/accumulo-1.9.1/index.html                  |   4 +-
 release/accumulo-1.9.2/index.html                  |   4 +-
 release/accumulo-1.9.3/index.html                  |   4 +-
 release/accumulo-2.0.0-alpha-1/index.html          |   4 +-
 release/accumulo-2.0.0/index.html                  |   4 +-
 release/index.html                                 |   4 +-
 search/index.html                                  |   4 +-
 search_data.json                                   |  14 +
 tour/authorizations-code/index.html                |   4 +-
 tour/authorizations/index.html                     |   4 +-
 tour/basic-read-write/index.html                   |   4 +-
 tour/batch-scanner-code/index.html                 |   4 +-
 tour/batch-scanner/index.html                      |   4 +-
 tour/conditional-writer-code/index.html            |   4 +-
 tour/conditional-writer/index.html                 |   4 +-
 tour/data-model-code/index.html                    |   4 +-
 tour/data-model/index.html                         |   4 +-
 tour/getting-started/index.html                    |   4 +-
 tour/index.html                                    |   4 +-
 tour/ranges-splits/index.html                      |   4 +-
 tour/using-iterators/index.html                    |   4 +-
 256 files changed, 845 insertions(+), 1910 deletions(-)

diff --git a/1.3/user_manual/Accumulo_Design.html b/1.3/user_manual/Accumulo_Design.html
index 9cd4cd5..6ae02ca 100644
--- a/1.3/user_manual/Accumulo_Design.html
+++ b/1.3/user_manual/Accumulo_Design.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/Accumulo_Shell.html b/1.3/user_manual/Accumulo_Shell.html
index 01fe09a..d854434 100644
--- a/1.3/user_manual/Accumulo_Shell.html
+++ b/1.3/user_manual/Accumulo_Shell.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/Administration.html b/1.3/user_manual/Administration.html
index 9ade50a..339f89d 100644
--- a/1.3/user_manual/Administration.html
+++ b/1.3/user_manual/Administration.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/Analytics.html b/1.3/user_manual/Analytics.html
index a3ad4d3..ebbea85 100644
--- a/1.3/user_manual/Analytics.html
+++ b/1.3/user_manual/Analytics.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/Contents.html b/1.3/user_manual/Contents.html
index b07dd63..5faaf82 100644
--- a/1.3/user_manual/Contents.html
+++ b/1.3/user_manual/Contents.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/High_Speed_Ingest.html b/1.3/user_manual/High_Speed_Ingest.html
index 54183b7..c6b5b6c 100644
--- a/1.3/user_manual/High_Speed_Ingest.html
+++ b/1.3/user_manual/High_Speed_Ingest.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/Introduction.html b/1.3/user_manual/Introduction.html
index 2e52029..67f7eab 100644
--- a/1.3/user_manual/Introduction.html
+++ b/1.3/user_manual/Introduction.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/Security.html b/1.3/user_manual/Security.html
index 722bee7..7af2ad9 100644
--- a/1.3/user_manual/Security.html
+++ b/1.3/user_manual/Security.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/Shell_Commands.html b/1.3/user_manual/Shell_Commands.html
index 44b6cc9..cd2d4ff 100644
--- a/1.3/user_manual/Shell_Commands.html
+++ b/1.3/user_manual/Shell_Commands.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/Table_Configuration.html b/1.3/user_manual/Table_Configuration.html
index 49e90f8..a8116dc 100644
--- a/1.3/user_manual/Table_Configuration.html
+++ b/1.3/user_manual/Table_Configuration.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/Table_Design.html b/1.3/user_manual/Table_Design.html
index e7d054a..8c80293 100644
--- a/1.3/user_manual/Table_Design.html
+++ b/1.3/user_manual/Table_Design.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/Writing_Accumulo_Clients.html b/1.3/user_manual/Writing_Accumulo_Clients.html
index c917540..3d07bd9 100644
--- a/1.3/user_manual/Writing_Accumulo_Clients.html
+++ b/1.3/user_manual/Writing_Accumulo_Clients.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/accumulo_user_manual.html b/1.3/user_manual/accumulo_user_manual.html
index 7e4d700..a505104 100644
--- a/1.3/user_manual/accumulo_user_manual.html
+++ b/1.3/user_manual/accumulo_user_manual.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/examples/aggregation.html b/1.3/user_manual/examples/aggregation.html
index bdc64fa..c3c9006 100644
--- a/1.3/user_manual/examples/aggregation.html
+++ b/1.3/user_manual/examples/aggregation.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/examples/batch.html b/1.3/user_manual/examples/batch.html
index afc6641..bf8f210 100644
--- a/1.3/user_manual/examples/batch.html
+++ b/1.3/user_manual/examples/batch.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/examples/bloom.html b/1.3/user_manual/examples/bloom.html
index 4be1c64..94ab272 100644
--- a/1.3/user_manual/examples/bloom.html
+++ b/1.3/user_manual/examples/bloom.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/examples/bulkIngest.html b/1.3/user_manual/examples/bulkIngest.html
index 677afce..2836069 100644
--- a/1.3/user_manual/examples/bulkIngest.html
+++ b/1.3/user_manual/examples/bulkIngest.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/examples/constraints.html b/1.3/user_manual/examples/constraints.html
index 28f3dd1..9836b71 100644
--- a/1.3/user_manual/examples/constraints.html
+++ b/1.3/user_manual/examples/constraints.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/examples/dirlist.html b/1.3/user_manual/examples/dirlist.html
index 8b824a4..7757a01 100644
--- a/1.3/user_manual/examples/dirlist.html
+++ b/1.3/user_manual/examples/dirlist.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/examples/filter.html b/1.3/user_manual/examples/filter.html
index 2708dbf..0a5914d 100644
--- a/1.3/user_manual/examples/filter.html
+++ b/1.3/user_manual/examples/filter.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/examples/helloworld.html b/1.3/user_manual/examples/helloworld.html
index b96a8b3..fc0cb07 100644
--- a/1.3/user_manual/examples/helloworld.html
+++ b/1.3/user_manual/examples/helloworld.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/examples/index.html b/1.3/user_manual/examples/index.html
index 178df7b..d4f8d26 100644
--- a/1.3/user_manual/examples/index.html
+++ b/1.3/user_manual/examples/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/examples/mapred.html b/1.3/user_manual/examples/mapred.html
index 705524b..93ba982 100644
--- a/1.3/user_manual/examples/mapred.html
+++ b/1.3/user_manual/examples/mapred.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/examples/shard.html b/1.3/user_manual/examples/shard.html
index ae5e28b..7222c7c 100644
--- a/1.3/user_manual/examples/shard.html
+++ b/1.3/user_manual/examples/shard.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/index.html b/1.3/user_manual/index.html
index 7e4d700..a505104 100644
--- a/1.3/user_manual/index.html
+++ b/1.3/user_manual/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/batch.html b/1.4/examples/batch.html
index 7203f71..1823f2d 100644
--- a/1.4/examples/batch.html
+++ b/1.4/examples/batch.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/bloom.html b/1.4/examples/bloom.html
index 76adbf8..7799c91 100644
--- a/1.4/examples/bloom.html
+++ b/1.4/examples/bloom.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/bulkIngest.html b/1.4/examples/bulkIngest.html
index d732bdd..a346428 100644
--- a/1.4/examples/bulkIngest.html
+++ b/1.4/examples/bulkIngest.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/combiner.html b/1.4/examples/combiner.html
index ee56bbd..fdd7de5 100644
--- a/1.4/examples/combiner.html
+++ b/1.4/examples/combiner.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/constraints.html b/1.4/examples/constraints.html
index 5073fbf..8607f6d 100644
--- a/1.4/examples/constraints.html
+++ b/1.4/examples/constraints.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/dirlist.html b/1.4/examples/dirlist.html
index 0df5641..1a402bd 100644
--- a/1.4/examples/dirlist.html
+++ b/1.4/examples/dirlist.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/filedata.html b/1.4/examples/filedata.html
index 941a775..dda8389 100644
--- a/1.4/examples/filedata.html
+++ b/1.4/examples/filedata.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/filter.html b/1.4/examples/filter.html
index 6b02bca..0338ecf 100644
--- a/1.4/examples/filter.html
+++ b/1.4/examples/filter.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/helloworld.html b/1.4/examples/helloworld.html
index 247fd39..5a21934 100644
--- a/1.4/examples/helloworld.html
+++ b/1.4/examples/helloworld.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/index.html b/1.4/examples/index.html
index dd51069..858f5f5 100644
--- a/1.4/examples/index.html
+++ b/1.4/examples/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/isolation.html b/1.4/examples/isolation.html
index c2dd85d..338a274 100644
--- a/1.4/examples/isolation.html
+++ b/1.4/examples/isolation.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/mapred.html b/1.4/examples/mapred.html
index c993509..2bd6cfd 100644
--- a/1.4/examples/mapred.html
+++ b/1.4/examples/mapred.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/shard.html b/1.4/examples/shard.html
index facfa03..a677519 100644
--- a/1.4/examples/shard.html
+++ b/1.4/examples/shard.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/visibility.html b/1.4/examples/visibility.html
index 2004d68..71094ca 100644
--- a/1.4/examples/visibility.html
+++ b/1.4/examples/visibility.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Accumulo_Design.html b/1.4/user_manual/Accumulo_Design.html
index 64583cc..1dd01d5 100644
--- a/1.4/user_manual/Accumulo_Design.html
+++ b/1.4/user_manual/Accumulo_Design.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Accumulo_Shell.html b/1.4/user_manual/Accumulo_Shell.html
index 30f26cd..9e021c7 100644
--- a/1.4/user_manual/Accumulo_Shell.html
+++ b/1.4/user_manual/Accumulo_Shell.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Administration.html b/1.4/user_manual/Administration.html
index 218b57b..9f86de2 100644
--- a/1.4/user_manual/Administration.html
+++ b/1.4/user_manual/Administration.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Analytics.html b/1.4/user_manual/Analytics.html
index 7e6d8dd..43e3dd2 100644
--- a/1.4/user_manual/Analytics.html
+++ b/1.4/user_manual/Analytics.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Contents.html b/1.4/user_manual/Contents.html
index 1e4f1db..ffc5647 100644
--- a/1.4/user_manual/Contents.html
+++ b/1.4/user_manual/Contents.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Development_Clients.html b/1.4/user_manual/Development_Clients.html
index 90a94c2..746844a 100644
--- a/1.4/user_manual/Development_Clients.html
+++ b/1.4/user_manual/Development_Clients.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/High_Speed_Ingest.html b/1.4/user_manual/High_Speed_Ingest.html
index cbcbbd0..e73696a 100644
--- a/1.4/user_manual/High_Speed_Ingest.html
+++ b/1.4/user_manual/High_Speed_Ingest.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Introduction.html b/1.4/user_manual/Introduction.html
index ef9b81f..414c0e9 100644
--- a/1.4/user_manual/Introduction.html
+++ b/1.4/user_manual/Introduction.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Security.html b/1.4/user_manual/Security.html
index 887a2fe..31736af 100644
--- a/1.4/user_manual/Security.html
+++ b/1.4/user_manual/Security.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Shell_Commands.html b/1.4/user_manual/Shell_Commands.html
index 8018b90..b96f92a 100644
--- a/1.4/user_manual/Shell_Commands.html
+++ b/1.4/user_manual/Shell_Commands.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Table_Configuration.html b/1.4/user_manual/Table_Configuration.html
index 8ba61bc..ea1a46a 100644
--- a/1.4/user_manual/Table_Configuration.html
+++ b/1.4/user_manual/Table_Configuration.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Table_Design.html b/1.4/user_manual/Table_Design.html
index bc94a91..bff4873 100644
--- a/1.4/user_manual/Table_Design.html
+++ b/1.4/user_manual/Table_Design.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Writing_Accumulo_Clients.html b/1.4/user_manual/Writing_Accumulo_Clients.html
index 5220b9b..007af4d 100644
--- a/1.4/user_manual/Writing_Accumulo_Clients.html
+++ b/1.4/user_manual/Writing_Accumulo_Clients.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/accumulo_user_manual.html b/1.4/user_manual/accumulo_user_manual.html
index 1d4c1c0..df384e8 100644
--- a/1.4/user_manual/accumulo_user_manual.html
+++ b/1.4/user_manual/accumulo_user_manual.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/index.html b/1.4/user_manual/index.html
index 1d4c1c0..df384e8 100644
--- a/1.4/user_manual/index.html
+++ b/1.4/user_manual/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/batch.html b/1.5/examples/batch.html
index f65390e..ac72bc6 100644
--- a/1.5/examples/batch.html
+++ b/1.5/examples/batch.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/bloom.html b/1.5/examples/bloom.html
index 6ebc74f..8ab0ef5 100644
--- a/1.5/examples/bloom.html
+++ b/1.5/examples/bloom.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/bulkIngest.html b/1.5/examples/bulkIngest.html
index e19d3ca..1d58088 100644
--- a/1.5/examples/bulkIngest.html
+++ b/1.5/examples/bulkIngest.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/classpath.html b/1.5/examples/classpath.html
index 9878c60..77cfa4b 100644
--- a/1.5/examples/classpath.html
+++ b/1.5/examples/classpath.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/client.html b/1.5/examples/client.html
index d6d1afd..df8113c 100644
--- a/1.5/examples/client.html
+++ b/1.5/examples/client.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/combiner.html b/1.5/examples/combiner.html
index 0093546..dbf217a 100644
--- a/1.5/examples/combiner.html
+++ b/1.5/examples/combiner.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/constraints.html b/1.5/examples/constraints.html
index 8d6ba4f..b318b78 100644
--- a/1.5/examples/constraints.html
+++ b/1.5/examples/constraints.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/dirlist.html b/1.5/examples/dirlist.html
index a8ba06c..b958489 100644
--- a/1.5/examples/dirlist.html
+++ b/1.5/examples/dirlist.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/export.html b/1.5/examples/export.html
index 90d7409..777f9fa 100644
--- a/1.5/examples/export.html
+++ b/1.5/examples/export.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/filedata.html b/1.5/examples/filedata.html
index 45dc93c..8bb2196 100644
--- a/1.5/examples/filedata.html
+++ b/1.5/examples/filedata.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/filter.html b/1.5/examples/filter.html
index 6b02bca..0338ecf 100644
--- a/1.5/examples/filter.html
+++ b/1.5/examples/filter.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/helloworld.html b/1.5/examples/helloworld.html
index 2008114..999c58c 100644
--- a/1.5/examples/helloworld.html
+++ b/1.5/examples/helloworld.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/index.html b/1.5/examples/index.html
index da7c5cf..01dc177 100644
--- a/1.5/examples/index.html
+++ b/1.5/examples/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/isolation.html b/1.5/examples/isolation.html
index 692e50c..7b22a49 100644
--- a/1.5/examples/isolation.html
+++ b/1.5/examples/isolation.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/mapred.html b/1.5/examples/mapred.html
index 29cfa83..0a4a72a 100644
--- a/1.5/examples/mapred.html
+++ b/1.5/examples/mapred.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/maxmutation.html b/1.5/examples/maxmutation.html
index 3f2e9d9..7a71efe 100644
--- a/1.5/examples/maxmutation.html
+++ b/1.5/examples/maxmutation.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/regex.html b/1.5/examples/regex.html
index 041e781..7ccdda9 100644
--- a/1.5/examples/regex.html
+++ b/1.5/examples/regex.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/rowhash.html b/1.5/examples/rowhash.html
index 90f3153..6f197c5 100644
--- a/1.5/examples/rowhash.html
+++ b/1.5/examples/rowhash.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/shard.html b/1.5/examples/shard.html
index ef5d9d2..be82abd 100644
--- a/1.5/examples/shard.html
+++ b/1.5/examples/shard.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/tabletofile.html b/1.5/examples/tabletofile.html
index 3d5f52e..a196cba 100644
--- a/1.5/examples/tabletofile.html
+++ b/1.5/examples/tabletofile.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/terasort.html b/1.5/examples/terasort.html
index 3278162..b2288b2 100644
--- a/1.5/examples/terasort.html
+++ b/1.5/examples/terasort.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/visibility.html b/1.5/examples/visibility.html
index 2004d68..71094ca 100644
--- a/1.5/examples/visibility.html
+++ b/1.5/examples/visibility.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/batch.html b/1.6/examples/batch.html
index 023ce22..dfa7acc 100644
--- a/1.6/examples/batch.html
+++ b/1.6/examples/batch.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/bloom.html b/1.6/examples/bloom.html
index 53f258f..62428ed 100644
--- a/1.6/examples/bloom.html
+++ b/1.6/examples/bloom.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/bulkIngest.html b/1.6/examples/bulkIngest.html
index 3d270db..d075187 100644
--- a/1.6/examples/bulkIngest.html
+++ b/1.6/examples/bulkIngest.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/classpath.html b/1.6/examples/classpath.html
index 10e8f06..785e7b2 100644
--- a/1.6/examples/classpath.html
+++ b/1.6/examples/classpath.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/client.html b/1.6/examples/client.html
index 6e275ec..2dc2ea5 100644
--- a/1.6/examples/client.html
+++ b/1.6/examples/client.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/combiner.html b/1.6/examples/combiner.html
index 2b25c66..fffb4f5 100644
--- a/1.6/examples/combiner.html
+++ b/1.6/examples/combiner.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/constraints.html b/1.6/examples/constraints.html
index 38b1477..b6e7458 100644
--- a/1.6/examples/constraints.html
+++ b/1.6/examples/constraints.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/dirlist.html b/1.6/examples/dirlist.html
index 65bb7cb..a8c9a2d 100644
--- a/1.6/examples/dirlist.html
+++ b/1.6/examples/dirlist.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/export.html b/1.6/examples/export.html
index db8a32a..d25c18f 100644
--- a/1.6/examples/export.html
+++ b/1.6/examples/export.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/filedata.html b/1.6/examples/filedata.html
index 8741131..01b4a25 100644
--- a/1.6/examples/filedata.html
+++ b/1.6/examples/filedata.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/filter.html b/1.6/examples/filter.html
index 00cef97..8a4ab95 100644
--- a/1.6/examples/filter.html
+++ b/1.6/examples/filter.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/helloworld.html b/1.6/examples/helloworld.html
index c4bf395..0cb4052 100644
--- a/1.6/examples/helloworld.html
+++ b/1.6/examples/helloworld.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/index.html b/1.6/examples/index.html
index c90c361..3c4d05c 100644
--- a/1.6/examples/index.html
+++ b/1.6/examples/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/isolation.html b/1.6/examples/isolation.html
index e65dbcd..82c30ee 100644
--- a/1.6/examples/isolation.html
+++ b/1.6/examples/isolation.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/mapred.html b/1.6/examples/mapred.html
index 5a919ff..a9d3e17 100644
--- a/1.6/examples/mapred.html
+++ b/1.6/examples/mapred.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/maxmutation.html b/1.6/examples/maxmutation.html
index 332fc4a..25e6b85 100644
--- a/1.6/examples/maxmutation.html
+++ b/1.6/examples/maxmutation.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/regex.html b/1.6/examples/regex.html
index d25ef24..fde7e57 100644
--- a/1.6/examples/regex.html
+++ b/1.6/examples/regex.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/reservations.html b/1.6/examples/reservations.html
index 0eebba2..658cfb1 100644
--- a/1.6/examples/reservations.html
+++ b/1.6/examples/reservations.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/rowhash.html b/1.6/examples/rowhash.html
index ae1b825..ebe30f3 100644
--- a/1.6/examples/rowhash.html
+++ b/1.6/examples/rowhash.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/shard.html b/1.6/examples/shard.html
index 44b4d01..5829324 100644
--- a/1.6/examples/shard.html
+++ b/1.6/examples/shard.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/tabletofile.html b/1.6/examples/tabletofile.html
index 7e3381b..5954add 100644
--- a/1.6/examples/tabletofile.html
+++ b/1.6/examples/tabletofile.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/terasort.html b/1.6/examples/terasort.html
index f18b44a..0157b68 100644
--- a/1.6/examples/terasort.html
+++ b/1.6/examples/terasort.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/visibility.html b/1.6/examples/visibility.html
index 6aa1c8b..6e9d2b2 100644
--- a/1.6/examples/visibility.html
+++ b/1.6/examples/visibility.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/batch.html b/1.7/examples/batch.html
index 023ce22..dfa7acc 100644
--- a/1.7/examples/batch.html
+++ b/1.7/examples/batch.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/bloom.html b/1.7/examples/bloom.html
index 8cca343..7c89fa3 100644
--- a/1.7/examples/bloom.html
+++ b/1.7/examples/bloom.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/bulkIngest.html b/1.7/examples/bulkIngest.html
index 3d270db..d075187 100644
--- a/1.7/examples/bulkIngest.html
+++ b/1.7/examples/bulkIngest.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/classpath.html b/1.7/examples/classpath.html
index f157ff2..0afc723 100644
--- a/1.7/examples/classpath.html
+++ b/1.7/examples/classpath.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/client.html b/1.7/examples/client.html
index 6e275ec..2dc2ea5 100644
--- a/1.7/examples/client.html
+++ b/1.7/examples/client.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/combiner.html b/1.7/examples/combiner.html
index f2e9626..aa98acd 100644
--- a/1.7/examples/combiner.html
+++ b/1.7/examples/combiner.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/constraints.html b/1.7/examples/constraints.html
index e839d5f..9a89697 100644
--- a/1.7/examples/constraints.html
+++ b/1.7/examples/constraints.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/dirlist.html b/1.7/examples/dirlist.html
index 65bb7cb..a8c9a2d 100644
--- a/1.7/examples/dirlist.html
+++ b/1.7/examples/dirlist.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/export.html b/1.7/examples/export.html
index 297dca7..03d6472 100644
--- a/1.7/examples/export.html
+++ b/1.7/examples/export.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/filedata.html b/1.7/examples/filedata.html
index 8741131..01b4a25 100644
--- a/1.7/examples/filedata.html
+++ b/1.7/examples/filedata.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/filter.html b/1.7/examples/filter.html
index 00cef97..8a4ab95 100644
--- a/1.7/examples/filter.html
+++ b/1.7/examples/filter.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/helloworld.html b/1.7/examples/helloworld.html
index c4bf395..0cb4052 100644
--- a/1.7/examples/helloworld.html
+++ b/1.7/examples/helloworld.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/index.html b/1.7/examples/index.html
index 9eb0050..d15f21f 100644
--- a/1.7/examples/index.html
+++ b/1.7/examples/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/isolation.html b/1.7/examples/isolation.html
index e65dbcd..82c30ee 100644
--- a/1.7/examples/isolation.html
+++ b/1.7/examples/isolation.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/mapred.html b/1.7/examples/mapred.html
index 72adf59..dbf0643 100644
--- a/1.7/examples/mapred.html
+++ b/1.7/examples/mapred.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/maxmutation.html b/1.7/examples/maxmutation.html
index 46bdcd5..1856b99 100644
--- a/1.7/examples/maxmutation.html
+++ b/1.7/examples/maxmutation.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/regex.html b/1.7/examples/regex.html
index edb3378..b54a10f 100644
--- a/1.7/examples/regex.html
+++ b/1.7/examples/regex.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/reservations.html b/1.7/examples/reservations.html
index 0eebba2..658cfb1 100644
--- a/1.7/examples/reservations.html
+++ b/1.7/examples/reservations.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/rowhash.html b/1.7/examples/rowhash.html
index 7e6fe9d..ea8be9d 100644
--- a/1.7/examples/rowhash.html
+++ b/1.7/examples/rowhash.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/shard.html b/1.7/examples/shard.html
index 44b4d01..5829324 100644
--- a/1.7/examples/shard.html
+++ b/1.7/examples/shard.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/tabletofile.html b/1.7/examples/tabletofile.html
index 1214f06..8a4c10e 100644
--- a/1.7/examples/tabletofile.html
+++ b/1.7/examples/tabletofile.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/terasort.html b/1.7/examples/terasort.html
index f18b44a..0157b68 100644
--- a/1.7/examples/terasort.html
+++ b/1.7/examples/terasort.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/visibility.html b/1.7/examples/visibility.html
index 6aa1c8b..6e9d2b2 100644
--- a/1.7/examples/visibility.html
+++ b/1.7/examples/visibility.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.8/examples/index.html b/1.8/examples/index.html
index 57ac978..0e6a955 100644
--- a/1.8/examples/index.html
+++ b/1.8/examples/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/1.9/examples/index.html b/1.9/examples/index.html
index 57ac978..0e6a955 100644
--- a/1.9/examples/index.html
+++ b/1.9/examples/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/api/index.html b/api/index.html
index 3a4fad6..55f6d2b 100644
--- a/api/index.html
+++ b/api/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/blog/2014/05/03/accumulo-classloader.html b/blog/2014/05/03/accumulo-classloader.html
index 8e85e9e..675f017 100644
--- a/blog/2014/05/03/accumulo-classloader.html
+++ b/blog/2014/05/03/accumulo-classloader.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/blog/2014/05/27/getting-started-with-accumulo-1.6.0.html b/blog/2014/05/27/getting-started-with-accumulo-1.6.0.html
index 9624f5b..2145cb6 100644
--- a/blog/2014/05/27/getting-started-with-accumulo-1.6.0.html
+++ b/blog/2014/05/27/getting-started-with-accumulo-1.6.0.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/blog/2014/06/25/scaling-accumulo-with-multivolume-support.html b/blog/2014/06/25/scaling-accumulo-with-multivolume-support.html
index 5d3acb8..794ad39 100644
--- a/blog/2014/06/25/scaling-accumulo-with-multivolume-support.html
+++ b/blog/2014/06/25/scaling-accumulo-with-multivolume-support.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/blog/2014/07/09/functional-reads-over-accumulo.html b/blog/2014/07/09/functional-reads-over-accumulo.html
index 97bde70..c8a2a5e 100644
--- a/blog/2014/07/09/functional-reads-over-accumulo.html
+++ b/blog/2014/07/09/functional-reads-over-accumulo.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/blog/2014/09/02/generating-keystores-for-configuring-accumulo-with-ssl.html b/blog/2014/09/02/generating-keystores-for-configuring-accumulo-with-ssl.html
index a2122cf..a6352d2 100644
--- a/blog/2014/09/02/generating-keystores-for-configuring-accumulo-with-ssl.html
+++ b/blog/2014/09/02/generating-keystores-for-configuring-accumulo-with-ssl.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/blog/2015/03/20/balancing-groups-of-tablets.html b/blog/2015/03/20/balancing-groups-of-tablets.html
index 31a98fe..a6d0e23 100644
--- a/blog/2015/03/20/balancing-groups-of-tablets.html
+++ b/blog/2015/03/20/balancing-groups-of-tablets.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/blog/2015/04/06/replicating-data-across-accumulo-clusters.html b/blog/2015/04/06/replicating-data-across-accumulo-clusters.html
index 492c3e6..e5027eb 100644
--- a/blog/2015/04/06/replicating-data-across-accumulo-clusters.html
+++ b/blog/2015/04/06/replicating-data-across-accumulo-clusters.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/blog/2016/11/02/durability-performance.html b/blog/2016/11/02/durability-performance.html
index 674db04..11ff3ec 100644
--- a/blog/2016/11/02/durability-performance.html
+++ b/blog/2016/11/02/durability-performance.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/blog/2016/11/16/simpler-scripts-and-config.html b/blog/2016/11/16/simpler-scripts-and-config.html
index de4b334..ba864b7 100644
--- a/blog/2016/11/16/simpler-scripts-and-config.html
+++ b/blog/2016/11/16/simpler-scripts-and-config.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/blog/2016/12/19/running-on-fedora-25.html b/blog/2016/12/19/running-on-fedora-25.html
index f8fcec6..13ddd09 100644
--- a/blog/2016/12/19/running-on-fedora-25.html
+++ b/blog/2016/12/19/running-on-fedora-25.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/blog/2017/03/06/security-performance-implications.html b/blog/2017/03/06/security-performance-implications.html
index df3a4d7..1664a74 100644
--- a/blog/2017/03/06/security-performance-implications.html
+++ b/blog/2017/03/06/security-performance-implications.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/blog/2017/03/21/happy-anniversary-accumulo.html b/blog/2017/03/21/happy-anniversary-accumulo.html
index 8d1d2d4..4511df9 100644
--- a/blog/2017/03/21/happy-anniversary-accumulo.html
+++ b/blog/2017/03/21/happy-anniversary-accumulo.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/blog/2017/04/21/introducing-uno-and-muchos.html b/blog/2017/04/21/introducing-uno-and-muchos.html
index 4effaaa..75766f9 100644
--- a/blog/2017/04/21/introducing-uno-and-muchos.html
+++ b/blog/2017/04/21/introducing-uno-and-muchos.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/blog/2017/06/29/accumulo-documentation-improvements.html b/blog/2017/06/29/accumulo-documentation-improvements.html
index 02b6469..5e7b483 100644
--- a/blog/2017/06/29/accumulo-documentation-improvements.html
+++ b/blog/2017/06/29/accumulo-documentation-improvements.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/blog/2017/07/27/accumulo-summmit-on-october-16.html b/blog/2017/07/27/accumulo-summmit-on-october-16.html
index b7840f5..7fde603 100644
--- a/blog/2017/07/27/accumulo-summmit-on-october-16.html
+++ b/blog/2017/07/27/accumulo-summmit-on-october-16.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/blog/2017/12/12/take-the-accumulo-tour.html b/blog/2017/12/12/take-the-accumulo-tour.html
index fae9a9e..ad75cc9 100644
--- a/blog/2017/12/12/take-the-accumulo-tour.html
+++ b/blog/2017/12/12/take-the-accumulo-tour.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/blog/2018/03/16/moving-to-github-issues.html b/blog/2018/03/16/moving-to-github-issues.html
index e0f96cb..8d844f0 100644
--- a/blog/2018/03/16/moving-to-github-issues.html
+++ b/blog/2018/03/16/moving-to-github-issues.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/blog/2018/03/22/view-metrics-in-grafana.html b/blog/2018/03/22/view-metrics-in-grafana.html
index 8ad6c6c..8943c48 100644
--- a/blog/2018/03/22/view-metrics-in-grafana.html
+++ b/blog/2018/03/22/view-metrics-in-grafana.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/blog/2018/07/05/accumulo-summit.html b/blog/2018/07/05/accumulo-summit.html
index 720f923..e98b203 100644
--- a/blog/2018/07/05/accumulo-summit.html
+++ b/blog/2018/07/05/accumulo-summit.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/contact-us/index.html b/contact-us/index.html
index 248d88d..807c885 100644
--- a/contact-us/index.html
+++ b/contact-us/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/contributor/bylaws.html b/contributor/bylaws.html
index 344c3e3..2c32fb0 100644
--- a/contributor/bylaws.html
+++ b/contributor/bylaws.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/contributor/consensusBuilding.html b/contributor/consensusBuilding.html
index d8d52e3..000ef22 100644
--- a/contributor/consensusBuilding.html
+++ b/contributor/consensusBuilding.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/contributor/contrib-projects.html b/contributor/contrib-projects.html
index dd18bd9..cceabdb 100644
--- a/contributor/contrib-projects.html
+++ b/contributor/contrib-projects.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/contributor/lazyConsensus.html b/contributor/lazyConsensus.html
index 223296c..140eb81 100644
--- a/contributor/lazyConsensus.html
+++ b/contributor/lazyConsensus.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/contributor/making-release.html b/contributor/making-release.html
index ccce7a7..a5959b8 100644
--- a/contributor/making-release.html
+++ b/contributor/making-release.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/contributor/rb.html b/contributor/rb.html
index f073636..9aa335b 100644
--- a/contributor/rb.html
+++ b/contributor/rb.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/contributor/release-management.html b/contributor/release-management.html
index a3139e9..bc704da 100644
--- a/contributor/release-management.html
+++ b/contributor/release-management.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/contributor/verifying-release.html b/contributor/verifying-release.html
index 8cff9b8..32a10f2 100644
--- a/contributor/verifying-release.html
+++ b/contributor/verifying-release.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/contributor/versioning.html b/contributor/versioning.html
index 1f80b35..29e5b73 100644
--- a/contributor/versioning.html
+++ b/contributor/versioning.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/contributor/voting.html b/contributor/voting.html
index 5a3c268..99abf70 100644
--- a/contributor/voting.html
+++ b/contributor/voting.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/contributors-guide/index.html b/contributors-guide/index.html
index a486f23..9c777e0 100644
--- a/contributors-guide/index.html
+++ b/contributors-guide/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/docs-archive/index.html b/docs-archive/index.html
index 440e68e..755946f 100644
--- a/docs-archive/index.html
+++ b/docs-archive/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/docs/2.x/administration/caching.html b/docs/2.x/administration/caching.html
index 441c4dd..46b3082 100644
--- a/docs/2.x/administration/caching.html
+++ b/docs/2.x/administration/caching.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/administration/configuration-management.html b/docs/2.x/administration/configuration-management.html
index ccb3607..38fe164 100644
--- a/docs/2.x/administration/configuration-management.html
+++ b/docs/2.x/administration/configuration-management.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/administration/crypto.html b/docs/2.x/administration/crypto.html
index 859c277..5cb6c26 100644
--- a/docs/2.x/administration/crypto.html
+++ b/docs/2.x/administration/crypto.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/administration/fate.html b/docs/2.x/administration/fate.html
index bb41063..6073c0b 100644
--- a/docs/2.x/administration/fate.html
+++ b/docs/2.x/administration/fate.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/administration/in-depth-install.html b/docs/2.x/administration/in-depth-install.html
index defd4ff..d1d0258 100644
--- a/docs/2.x/administration/in-depth-install.html
+++ b/docs/2.x/administration/in-depth-install.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/administration/kerberos.html b/docs/2.x/administration/kerberos.html
index 757c27f..fa4d8e3 100644
--- a/docs/2.x/administration/kerberos.html
+++ b/docs/2.x/administration/kerberos.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/administration/monitoring-metrics.html b/docs/2.x/administration/monitoring-metrics.html
index 82a300e..859e73e 100644
--- a/docs/2.x/administration/monitoring-metrics.html
+++ b/docs/2.x/administration/monitoring-metrics.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/administration/multivolume.html b/docs/2.x/administration/multivolume.html
index bdc420f..acdfcd7 100644
--- a/docs/2.x/administration/multivolume.html
+++ b/docs/2.x/administration/multivolume.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/administration/properties.html b/docs/2.x/administration/properties.html
index bd39ffe..e104875 100644
--- a/docs/2.x/administration/properties.html
+++ b/docs/2.x/administration/properties.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/administration/replication.html b/docs/2.x/administration/replication.html
index e270974..c499bfd 100644
--- a/docs/2.x/administration/replication.html
+++ b/docs/2.x/administration/replication.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/administration/scan-executors.html b/docs/2.x/administration/scan-executors.html
index 6a04e35..27f0f8a 100644
--- a/docs/2.x/administration/scan-executors.html
+++ b/docs/2.x/administration/scan-executors.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/administration/ssl.html b/docs/2.x/administration/ssl.html
index 832e0ac..dcd2962 100644
--- a/docs/2.x/administration/ssl.html
+++ b/docs/2.x/administration/ssl.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/administration/tracing.html b/docs/2.x/administration/tracing.html
index ef4ca73..79f59d9 100644
--- a/docs/2.x/administration/tracing.html
+++ b/docs/2.x/administration/tracing.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/administration/upgrading.html b/docs/2.x/administration/upgrading.html
index fd826f7..6c25cf8 100644
--- a/docs/2.x/administration/upgrading.html
+++ b/docs/2.x/administration/upgrading.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/development/client-properties.html b/docs/2.x/development/client-properties.html
index e46eadc..f2c0e2a 100644
--- a/docs/2.x/development/client-properties.html
+++ b/docs/2.x/development/client-properties.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/development/development_tools.html b/docs/2.x/development/development_tools.html
index cf4eb86..5503950 100644
--- a/docs/2.x/development/development_tools.html
+++ b/docs/2.x/development/development_tools.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/development/high_speed_ingest.html b/docs/2.x/development/high_speed_ingest.html
index ab8d884..855f443 100644
--- a/docs/2.x/development/high_speed_ingest.html
+++ b/docs/2.x/development/high_speed_ingest.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/development/iterators.html b/docs/2.x/development/iterators.html
index e0211ce..60bc527 100644
--- a/docs/2.x/development/iterators.html
+++ b/docs/2.x/development/iterators.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/development/mapreduce.html b/docs/2.x/development/mapreduce.html
index 226c12b..e52a1c0 100644
--- a/docs/2.x/development/mapreduce.html
+++ b/docs/2.x/development/mapreduce.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/development/proxy.html b/docs/2.x/development/proxy.html
index f641eb0..70fc36c 100644
--- a/docs/2.x/development/proxy.html
+++ b/docs/2.x/development/proxy.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/development/sampling.html b/docs/2.x/development/sampling.html
index 3c3ca59..10018fb 100644
--- a/docs/2.x/development/sampling.html
+++ b/docs/2.x/development/sampling.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/development/security.html b/docs/2.x/development/security.html
index 099f06f..47c5661 100644
--- a/docs/2.x/development/security.html
+++ b/docs/2.x/development/security.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/development/summaries.html b/docs/2.x/development/summaries.html
index 08bac8d..9a2cb56 100644
--- a/docs/2.x/development/summaries.html
+++ b/docs/2.x/development/summaries.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/getting-started/clients.html b/docs/2.x/getting-started/clients.html
index 556d8a9..6d048fc 100644
--- a/docs/2.x/getting-started/clients.html
+++ b/docs/2.x/getting-started/clients.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/getting-started/design.html b/docs/2.x/getting-started/design.html
index 8a9dad2..e35de67 100644
--- a/docs/2.x/getting-started/design.html
+++ b/docs/2.x/getting-started/design.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/features/index.html b/docs/2.x/getting-started/features.html
similarity index 78%
copy from features/index.html
copy to docs/2.x/getting-started/features.html
index 4e597ef..e5a5eec 100644
--- a/features/index.html
+++ b/docs/2.x/getting-started/features.html
@@ -25,7 +25,7 @@
 <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>Features</title>
+<title>Accumulo Documentation - 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>
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -148,9 +146,205 @@
         </div>
         <div id="content">
           
-          <h1 class="title">Features</h1>
+          <div class="row">
+  <div class="col-md-3">
+    <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true" data-spy="affix">
+      <div class="panel panel-default">
+      
+      
+      
+        
+          
+        
+          
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="true" aria-controls="collapsegetting-started">
+                  Getting started
+                </a>
+              </h4>
+            </div>
+            <div id="collapsegetting-started" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+      
+        
+          
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
+                  Development
+                </a>
+              </h4>
+            </div>
+            <div id="collapsedevelopment" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
+                  Administration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseadministration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
           
+        
+          
+        
+          
+        
+          
+        
           
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
+                  Troubleshooting
+                </a>
+              </h4>
+            </div>
+            <div id="collapsetroubleshooting" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
+                
+              </div>
+            </div>
+          
+        
+      
+      </div>
+    </div>
+  </div>
+  <div class="col-md-9">
+    
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Getting started &nbsp;&gt;&gt;&nbsp; Features</p>
+    
+
+    <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
+
+    <div class="row">
+      <div class="col-md-10"><h1>Features</h1></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/getting-started/features.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+    </div>
+
+    
 <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>
@@ -636,6 +830,14 @@ root@test15 ci&gt; scan -b 1c16a4ae1bef9f1f -e 1c16a4ae1bef9f1f
 </code></pre></div></div>
 
 
+
+    <div class="row" style="margin-top: 20px;">
+      <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/getting-started/features.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+    </div>  
+  </div>
+</div>
+
         </div>
 
         
diff --git a/docs/2.x/getting-started/shell.html b/docs/2.x/getting-started/glossary.html
similarity index 69%
copy from docs/2.x/getting-started/shell.html
copy to docs/2.x/getting-started/glossary.html
index 2aa894a..c1827d1 100644
--- a/docs/2.x/getting-started/shell.html
+++ b/docs/2.x/getting-started/glossary.html
@@ -25,7 +25,7 @@
 <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>Accumulo Documentation - Accumulo Shell</title>
+<title>Accumulo Documentation - Glossary</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>
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
@@ -332,133 +334,217 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Getting started &nbsp;&gt;&gt;&nbsp; Accumulo Shell</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Getting started &nbsp;&gt;&gt;&nbsp; Glossary</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
-      <div class="col-md-10"><h1>Accumulo Shell</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/getting-started/shell.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-10"><h1>Glossary</h1></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/getting-started/glossary.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
-    <p>Accumulo provides a simple shell that can be used to examine the contents and
-configuration settings of tables, insert/update/delete values, and change
-configuration settings.</p>
-
-<p>The shell can be started by the following command:</p>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>accumulo shell -u [username]
-</code></pre></div></div>
-
-<p>The shell will prompt for the corresponding password to the username specified
-and then display the following prompt:</p>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>Shell - Apache Accumulo Interactive Shell
--
-- version: 2.0.0-alpha-1
-- instance name: myinstance
-- instance id: 00000000-0000-0000-0000-000000000000
--
-- type 'help' for a list of available commands
--
-root@myinstance&gt;
-</code></pre></div></div>
-
-<h2 id="basic-administration">Basic Administration</h2>
-
-<p>The <code class="highlighter-rouge">tables</code> command will list all existing tables.</p>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>root@myinstance&gt; tables
-accumulo.metadata
-accumulo.root
-</code></pre></div></div>
-
-<p>The <code class="highlighter-rouge">createtable</code> command creates a new table.</p>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>root@myinstance&gt; createtable mytable
-root@myinstance mytable&gt; tables
-accumulo.metadata
-accumulo.root
-mytable
-</code></pre></div></div>
-
-<p>The <code class="highlighter-rouge">deletetable</code> command deletes a table.</p>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>root@myinstance testtable&gt; deletetable testtable
-deletetable { testtable } (yes|no)? yes
-Table: [testtable] has been deleted.
-</code></pre></div></div>
-
-<p>The shell can be used to insert updates and scan tables. This is useful for inspecting tables.</p>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>root@myinstance mytable&gt; scan
-
-root@myinstance mytable&gt; insert row1 colf colq value1
-insert successful
-
-root@myinstance mytable&gt; scan
-row1 colf:colq [] value1
-</code></pre></div></div>
-
-<p>The value in brackets <code class="highlighter-rouge">[]</code> would be the visibility labels. Since none were used, this is empty for this row.
-You can use the <code class="highlighter-rouge">-st</code> option to scan to see the timestamp for the cell, too.</p>
-
-<h2 id="table-maintenance">Table Maintenance</h2>
-
-<p>The <code class="highlighter-rouge">compact</code> command instructs Accumulo to schedule a compaction of the table during which
-files are consolidated and deleted entries are removed.</p>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>root@myinstance mytable&gt; compact -t mytable
-07 16:13:53,201 [shell.Shell] INFO : Compaction of table mytable started for given range
-</code></pre></div></div>
-
-<p>If needed, the compaction can be canceled using <code class="highlighter-rouge">compact --cancel -t mytable</code>.</p>
-
-<p>The <code class="highlighter-rouge">flush</code> command instructs Accumulo to write all entries currently in memory for a given table
-to disk.</p>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>root@myinstance mytable&gt; flush -t mytable
-07 16:14:19,351 [shell.Shell] INFO : Flush of table mytable
-initiated...
-</code></pre></div></div>
-
-<h2 id="user-administration">User Administration</h2>
-
-<p>The Shell can be used to add, remove, and grant privileges to users.</p>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>root@myinstance mytable&gt; createuser bob
-Enter new password for 'bob': *********
-Please confirm new password for 'bob': *********
-
-root@myinstance mytable&gt; authenticate bob
-Enter current password for 'bob': *********
-Valid
-
-root@myinstance mytable&gt; grant System.CREATE_TABLE -s -u bob
-
-root@myinstance mytable&gt; user bob
-Enter current password for 'bob': *********
-
-bob@myinstance mytable&gt; userpermissions
-System permissions: System.CREATE_TABLE
-Table permissions (accumulo.metadata): Table.READ
-Table permissions (mytable): NONE
-
-bob@myinstance mytable&gt; createtable bobstable
-
-bob@myinstance bobstable&gt;
-
-bob@myinstance bobstable&gt; user root
-Enter current password for 'root': *********
+    <dl>
+  <dt>authorizations</dt>
+  <dd>
+    <blockquote>
+      <p>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.</p>
+    </blockquote>
+  </dd>
+  <dt>cell</dt>
+  <dd>
+    <blockquote>
+      <p>a set of key/value pairs whose keys differ only in timestamp.</p>
+    </blockquote>
+  </dd>
+  <dt>column</dt>
+  <dd>
+    <blockquote>
+      <p>the portion of the key that sorts after the row and is divided into family,
+qualifier, and visibility.</p>
+    </blockquote>
+  </dd>
+  <dt>column family</dt>
+  <dd>
+    <blockquote>
+      <p>the portion of the key that sorts second and controls locality groups, the
+row/column hybrid nature of accumulo.</p>
+    </blockquote>
+  </dd>
+  <dt>column qualifier</dt>
+  <dd>
+    <blockquote>
+      <p>the portion of the key that sorts third and provides additional key
+uniqueness.</p>
+    </blockquote>
+  </dd>
+  <dt>column visibility</dt>
+  <dd>
+    <blockquote>
+      <p>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.</p>
+    </blockquote>
+  </dd>
+  <dt>iterator</dt>
+  <dd>
+    <blockquote>
+      <p>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.</p>
+    </blockquote>
+  </dd>
+  <dt>iterator priority</dt>
+  <dd>
+    <blockquote>
+      <p>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.</p>
+    </blockquote>
+  </dd>
+  <dt>iterator scopes</dt>
+  <dd>
+    <blockquote>
+      <p>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).</p>
+    </blockquote>
+  </dd>
+  <dt>gc</dt>
+  <dd>
+    <blockquote>
+      <p>process that identifies temporary files in HDFS that are no longer needed by
+any process, and deletes them.</p>
+    </blockquote>
+  </dd>
+  <dt>key</dt>
+  <dd>
+    <blockquote>
+      <p>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.</p>
+    </blockquote>
+  </dd>
+  <dt>locality group</dt>
+  <dd>
+    <blockquote>
+      <p>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.</p>
+    </blockquote>
+  </dd>
+  <dt>log-structured merge-tree</dt>
+  <dd>
+    <blockquote>
+      <p>the sorting / flushing / merging scheme on which BigTable’s design is based.</p>
+    </blockquote>
+  </dd>
+  <dt>logger</dt>
+  <dd>
+    <blockquote>
+      <p>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.</p>
+    </blockquote>
+  </dd>
+  <dt>major compaction</dt>
+  <dd>
+    <blockquote>
+      <p>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>.</p>
+    </blockquote>
+  </dd>
+  <dt>master</dt>
+  <dd>
+    <blockquote>
+      <p>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).</p>
+    </blockquote>
+  </dd>
+  <dt>minor compaction</dt>
+  <dd>
+    <blockquote>
+      <p>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>.</p>
+    </blockquote>
+  </dd>
+  <dt>monitor</dt>
+  <dd>
+    <blockquote>
+      <p>process that displays status and usage information for all Accumulo
+components.</p>
+    </blockquote>
+  </dd>
+  <dt>permissions</dt>
+  <dd>
+    <blockquote>
+      <p>administrative abilities that must be given to a user such as creating tables
+or users and changing permissions or configuration parameters.</p>
+    </blockquote>
+  </dd>
+  <dt>row</dt>
+  <dd>
+    <blockquote>
+      <p>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.</p>
+    </blockquote>
+  </dd>
+  <dt>scan</dt>
+  <dd>
+    <blockquote>
+      <p>reading a range of key/value pairs.</p>
+    </blockquote>
+  </dd>
+  <dt>tablet</dt>
+  <dd>
+    <blockquote>
+      <p>a contiguous key range; the unit of work for a tablet server.</p>
+    </blockquote>
+  </dd>
+  <dt>tablet servers</dt>
+  <dd>
+    <blockquote>
+      <p>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.</p>
+    </blockquote>
+  </dd>
+  <dt>timestamp</dt>
+  <dd>
+    <blockquote>
+      <p>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.</p>
+    </blockquote>
+  </dd>
+  <dt>value</dt>
+  <dd>
+    <blockquote>
+      <p>immutable bytes associated with a particular key.</p>
+    </blockquote>
+  </dd>
+</dl>
 
-root@myinstance bobstable&gt; revoke System.CREATE_TABLE -s -u bob
-</code></pre></div></div>
 
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/getting-started/shell.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/getting-started/glossary.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.x/getting-started/quick-install.html b/docs/2.x/getting-started/quick-install.html
index 94d4fe5..b30e2ef 100644
--- a/docs/2.x/getting-started/quick-install.html
+++ b/docs/2.x/getting-started/quick-install.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/getting-started/shell.html b/docs/2.x/getting-started/shell.html
index 2aa894a..fec4dc3 100644
--- a/docs/2.x/getting-started/shell.html
+++ b/docs/2.x/getting-started/shell.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/getting-started/table_configuration.html b/docs/2.x/getting-started/table_configuration.html
index 25fe4c1..4ab043a 100644
--- a/docs/2.x/getting-started/table_configuration.html
+++ b/docs/2.x/getting-started/table_configuration.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/getting-started/table_design.html b/docs/2.x/getting-started/table_design.html
index d338b85..d3a06dd 100644
--- a/docs/2.x/getting-started/table_design.html
+++ b/docs/2.x/getting-started/table_design.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/troubleshooting/advanced.html b/docs/2.x/troubleshooting/advanced.html
index 7f28916..49bf18f 100644
--- a/docs/2.x/troubleshooting/advanced.html
+++ b/docs/2.x/troubleshooting/advanced.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/troubleshooting/basic.html b/docs/2.x/troubleshooting/basic.html
index 5e788b5..5ceb7bd 100644
--- a/docs/2.x/troubleshooting/basic.html
+++ b/docs/2.x/troubleshooting/basic.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/troubleshooting/performance.html b/docs/2.x/troubleshooting/performance.html
index 81537b7..7e6bddc 100644
--- a/docs/2.x/troubleshooting/performance.html
+++ b/docs/2.x/troubleshooting/performance.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/troubleshooting/system-metadata-tables.html b/docs/2.x/troubleshooting/system-metadata-tables.html
index 574c213..8f84ec2 100644
--- a/docs/2.x/troubleshooting/system-metadata-tables.html
+++ b/docs/2.x/troubleshooting/system-metadata-tables.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/troubleshooting/tools.html b/docs/2.x/troubleshooting/tools.html
index f22add0..01fd2f8 100644
--- a/docs/2.x/troubleshooting/tools.html
+++ b/docs/2.x/troubleshooting/tools.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -174,6 +172,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/features">Features</a></div>
+                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
@@ -184,6 +184,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/glossary">Glossary</a></div>
+                
               </div>
             </div>
           
diff --git a/downloads/index.html b/downloads/index.html
index 5678b91..aca25ce 100644
--- a/downloads/index.html
+++ b/downloads/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/external-docs/index.html b/external-docs/index.html
index 361f12f..aca50f6 100644
--- a/external-docs/index.html
+++ b/external-docs/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/features/index.html b/features/index.html
index 4e597ef..a3611f2 100644
--- a/features/index.html
+++ b/features/index.html
@@ -1,660 +1,11 @@
 <!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>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));
-      }
-    });
-  });
-
-  // fix sidebar width in documentation
-  $(function() {
-    var $affixElement = $('div[data-spy="affix"]');
-    $affixElement.width($affixElement.parent().width());
-  });
-</script>
-
-<!-- Global Site Tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=UA-50934829-1"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments)};
-  gtag('js', new Date());
-
-  gtag('config', 'UA-50934829-1');
-</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="nav-link"><a href="/tour">Tour</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-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
-            <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</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="/quickstart-1.x">Quickstart (1.x)</a></li>
-            <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
-            <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
-            <li><a href="/external-docs">External Docs</a></li>
-            <li><a href="/docs-archive/">Archive</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="/contact-us">Contact Us</a></li>
-            <li><a href="/how-to-contribute">How To Contribute</a></li>
-            <li><a href="/people">People</a></li>
-            <li><a href="/related-projects">Related Projects</a></li>
-          </ul>
-        </li>
-        <li class="nav-link"><a href="/search">Search</a></li>
-      </ul>
-      <ul class="nav navbar-nav navbar-right">
-        <li class="dropdown">
-          <a class="dropdown-toggle" data-toggle="dropdown" href="#"><img alt="Apache Software Foundation" src="https://www.apache.org/foundation/press/kit/feather.svg" width="15"/><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 <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>
-            <li><a href="https://www.apache.org/events/current-event.html">Current Event <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">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>
-  <li><a href="#screenshots" id="markdown-toc-screenshots">Screenshots</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 its HDFS configuration from a single HDFS host and directory 
-to a collection of HDFS URIs (host and path). This allows Accumulo to operate over 
-multiple disjoint HDFS instances and 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 it is 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 of interest.  Accumulo will generate
-indexes of cached blocks in an adaptive manner.  Accumulo indexes the most 
-frequently read blocks.  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 a Mock Accumulo environment. 
-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-scanner">Batch Scanner</h3>
-
-<p>The <a href="/1.9/accumulo_user_manual#_batchscanner">BatchScanner</a> 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-writer">Batch Writer</h3>
-
-<p>The <a href="/1.9/accumulo_user_manual#_batchwriter">BatchWriter</a> client buffers writes in memory before sending them in batches to the
-appropriate tablet servers.</p>
-
-<h3 id="bulk-import">Bulk Import</h3>
-
-<p>Instead of writing individual mutations to Accumulo, entire files of sorted key
-value pairs can be imported using <a href="/1.9/accumulo_user_manual#_bulk_ingest">BulkImport</a>. 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="mapreduce">MapReduce</h3>
-
-<p>Accumulo can be a source and/or sink for <a href="/1.9/accumulo_user_manual#_analytics">MapReduce</a> 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.9/accumulo_user_manual#_conditionalwriter">Conditional Mutations</a>
-which allow users to perform efficient, atomic read-modify-write operations on rows. Conditions can
-be defined using 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.9/apidocs/org/apache/accumulo/core/data/ConditionalMutation">ConditionalMutation</a> and
-<a href="/1.9/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 that 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 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>
-
-<h2 id="screenshots">Screenshots</h2>
-
-<div class="row">
-<div class="col-xs-3">
-The following is a screenshot of the Apache Accumulo&reg; monitor overview web page.  Accumulo was running on an eleven node cluster.  The continuous ingest test suite was running to generate load.  Ten continuous ingest clients were running.
-</div>
-<div class="col-xs-9">
-<a class="thumbnail" href="/images/overview2.png">
-<img src="/images/overview2.png" alt="monitor overview" />
-</a>
-</div>
-</div>
-
-<div class="row">
-<div class="col-xs-3">
-The following screenshot shows the monitor master page.  This page gives information about individual tables within accumulo.  Continuous ingest is running against the table ci.
-</div>
-<div class="col-xs-9">
-<a class="thumbnail" href="/images/master2.png">
-<img src="/images/master2.png" alt="monitor master" />
-</a>
-</div>
-</div>
-
-<p>The data generated by the continuous ingest test suite looks like the following.  The data is random, but forms many giant linked list.  Each ingest client continually generates linked list containing 25 million nodes.  In the shell session below, a few scans are issued to start following the linked list that the first node in the table is part of.</p>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>root@test15 ci&gt; scan 
-000000000135fbbe 074c:569c []    2db1de18-cd37-407d-b060-481a0a214c90:000000002b2bcfe1:2e15cb9f62fd22ab:fe6f84c7
-000000000d76dcc9 4f62:0647 []    65f401e8-4f93-498c-bffa-ecc21a8645fd:000000000e7c2bbc:6fad98d023b8f146:a2c4d59f
-0000000024e07be4 5e56:221d []    5283b4bd-4f18-4af9-a242-c8053b095e04:000000001e1ad441:12de1d82f4a7bf2f:ae231a6a
-000000003e13cb50 1d0a:415c []    5944afab-8407-4391-9994-91b313e545dd:0000000002d61c91:4890a8885e54b714:d542fafa
-00000000634d0aaa 310d:1e58 []    2db1de18-cd37-407d-b060-481a0a214c90:000000000c9e8018:4111345bc9afe2bb:4cbfd774
-000000007d378414 08d2:0066 []    15ab8578-faae-4ebb-9827-26728be78476:0000000052de5aac:06202f405c60726d:8ad4911a
-000000008c3615d8 3868:5f66 []    8f47568c-a383-4910-83c9-36b75ac66440:0000000067faf572:750d567f3dd0c5bf:5ea938fe
-0000000090be2a77 7f32:2ca4 []    8f47568c-a383-4910-83c9-36b75ac66440:000000005912be62:47ac0c7bb89013f1:dff13db9
-00000000a7ca8e58 360f:5763 []    a9f5e129-e260-4a0e-a763-c6e3ef7b3eb6:0000000030bff255:37c8226225c804ba:665f261f
-00000000f1000713 5079:46bd []    30af7f48-15ae-4ccb-81c9-4662ad74be92:0000000014d408e3:56a9dec63aed4d8f:0f2a44ec
-000000017e3ca989 56ac:062b []    30af7f48-15ae-4ccb-81c9-4662ad74be92:000000000a8926a1:0bd54c769871aa78:b8e61d77
---------------------------------------- hit any key to continue or 'q' to quit -----------------------------------------
-root@test15 ci&gt; scan -b 2e15cb9f62fd22ab -e 2e15cb9f62fd22ab
-2e15cb9f62fd22ab 1fc1:1486 []    2db1de18-cd37-407d-b060-481a0a214c90:000000002b1c8da1:53a9e4ba97e4a6e0:4a8bd624
-root@test15 ci&gt; scan -b 53a9e4ba97e4a6e0 -e 53a9e4ba97e4a6e0
-53a9e4ba97e4a6e0 37f3:33a2 []    2db1de18-cd37-407d-b060-481a0a214c90:000000002b0d4b61:1c16a4ae1bef9f1f:f03c869b
-root@test15 ci&gt; scan -b 1c16a4ae1bef9f1f -e 1c16a4ae1bef9f1f
-1c16a4ae1bef9f1f 07c8:7cd3 []    2db1de18-cd37-407d-b060-481a0a214c90:000000002afe0921:2e3ec09a8d2fdf52:8b82be48
-</code></pre></div></div>
-
-
-        </div>
-
-        
-<footer>
-
-  <p><a href="https://www.apache.org/foundation/contributing"><img src="https://www.apache.org/images/SupportApache-small.png" alt="Support the ASF" id="asf-logo" height="100" /></a></p>
-
-  <p>Copyright © 2011-2018 <a href="https://www.apache.org">The Apache Software Foundation</a>.
-Licensed under the <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.</p>
-
-  <p>Apache®, the names of Apache projects and their logos, and the multicolor feather
-logo are registered trademarks or trademarks of The Apache Software Foundation
-in the United States and/or other countries.</p>
-
-</footer>
-
-
-      </div>
-    </div>
-  </div>
-</body>
+<html lang="en-US">
+  <meta charset="utf-8">
+  <title>Redirecting&hellip;</title>
+  <link rel="canonical" href="https://accumulo.apache.org/docs/2.x/getting-started/features">
+  <meta http-equiv="refresh" content="0; url=https://accumulo.apache.org/docs/2.x/getting-started/features">
+  <meta name="robots" content="noindex">
+  <h1>Redirecting&hellip;</h1>
+  <a href="https://accumulo.apache.org/docs/2.x/getting-started/features">Click here if you are not redirected.</a>
+  <script>location="https://accumulo.apache.org/docs/2.x/getting-started/features"</script>
 </html>
diff --git a/feed.xml b/feed.xml
index b8137cc..86759a1 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>Wed, 17 Oct 2018 19:05:25 -0400</pubDate>
-    <lastBuildDate>Wed, 17 Oct 2018 19:05:25 -0400</lastBuildDate>
+    <pubDate>Thu, 18 Oct 2018 16:53:30 -0400</pubDate>
+    <lastBuildDate>Thu, 18 Oct 2018 16:53:30 -0400</lastBuildDate>
     <generator>Jekyll v3.7.3</generator>
     
     
diff --git a/glossary/index.html b/glossary/index.html
index d71eaa2..ccc7800 100644
--- a/glossary/index.html
+++ b/glossary/index.html
@@ -1,371 +1,11 @@
 <!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>Glossary</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));
-      }
-    });
-  });
-
-  // fix sidebar width in documentation
-  $(function() {
-    var $affixElement = $('div[data-spy="affix"]');
-    $affixElement.width($affixElement.parent().width());
-  });
-</script>
-
-<!-- Global Site Tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=UA-50934829-1"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments)};
-  gtag('js', new Date());
-
-  gtag('config', 'UA-50934829-1');
-</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="nav-link"><a href="/tour">Tour</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-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
-            <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</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="/quickstart-1.x">Quickstart (1.x)</a></li>
-            <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
-            <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
-            <li><a href="/external-docs">External Docs</a></li>
-            <li><a href="/docs-archive/">Archive</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="/contact-us">Contact Us</a></li>
-            <li><a href="/how-to-contribute">How To Contribute</a></li>
-            <li><a href="/people">People</a></li>
-            <li><a href="/related-projects">Related Projects</a></li>
-          </ul>
-        </li>
-        <li class="nav-link"><a href="/search">Search</a></li>
-      </ul>
-      <ul class="nav navbar-nav navbar-right">
-        <li class="dropdown">
-          <a class="dropdown-toggle" data-toggle="dropdown" href="#"><img alt="Apache Software Foundation" src="https://www.apache.org/foundation/press/kit/feather.svg" width="15"/><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 <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>
-            <li><a href="https://www.apache.org/events/current-event.html">Current Event <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">Glossary</h1>
-          
-          <dl>
-  <dt>authorizations</dt>
-  <dd>
-    <blockquote>
-      <p>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.</p>
-    </blockquote>
-  </dd>
-  <dt>cell</dt>
-  <dd>
-    <blockquote>
-      <p>a set of key/value pairs whose keys differ only in timestamp.</p>
-    </blockquote>
-  </dd>
-  <dt>column</dt>
-  <dd>
-    <blockquote>
-      <p>the portion of the key that sorts after the row and is divided into family,
-qualifier, and visibility.</p>
-    </blockquote>
-  </dd>
-  <dt>column family</dt>
-  <dd>
-    <blockquote>
-      <p>the portion of the key that sorts second and controls locality groups, the
-row/column hybrid nature of accumulo.</p>
-    </blockquote>
-  </dd>
-  <dt>column qualifier</dt>
-  <dd>
-    <blockquote>
-      <p>the portion of the key that sorts third and provides additional key
-uniqueness.</p>
-    </blockquote>
-  </dd>
-  <dt>column visibility</dt>
-  <dd>
-    <blockquote>
-      <p>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.</p>
-    </blockquote>
-  </dd>
-  <dt>iterator</dt>
-  <dd>
-    <blockquote>
-      <p>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.</p>
-    </blockquote>
-  </dd>
-  <dt>iterator priority</dt>
-  <dd>
-    <blockquote>
-      <p>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.</p>
-    </blockquote>
-  </dd>
-  <dt>iterator scopes</dt>
-  <dd>
-    <blockquote>
-      <p>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).</p>
-    </blockquote>
-  </dd>
-  <dt>gc</dt>
-  <dd>
-    <blockquote>
-      <p>process that identifies temporary files in HDFS that are no longer needed by
-any process, and deletes them.</p>
-    </blockquote>
-  </dd>
-  <dt>key</dt>
-  <dd>
-    <blockquote>
-      <p>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.</p>
-    </blockquote>
-  </dd>
-  <dt>locality group</dt>
-  <dd>
-    <blockquote>
-      <p>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.</p>
-    </blockquote>
-  </dd>
-  <dt>log-structured merge-tree</dt>
-  <dd>
-    <blockquote>
-      <p>the sorting / flushing / merging scheme on which BigTable’s design is based.</p>
-    </blockquote>
-  </dd>
-  <dt>logger</dt>
-  <dd>
-    <blockquote>
-      <p>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.</p>
-    </blockquote>
-  </dd>
-  <dt>major compaction</dt>
-  <dd>
-    <blockquote>
-      <p>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>.</p>
-    </blockquote>
-  </dd>
-  <dt>master</dt>
-  <dd>
-    <blockquote>
-      <p>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).</p>
-    </blockquote>
-  </dd>
-  <dt>minor compaction</dt>
-  <dd>
-    <blockquote>
-      <p>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>.</p>
-    </blockquote>
-  </dd>
-  <dt>monitor</dt>
-  <dd>
-    <blockquote>
-      <p>process that displays status and usage information for all Accumulo
-components.</p>
-    </blockquote>
-  </dd>
-  <dt>permissions</dt>
-  <dd>
-    <blockquote>
-      <p>administrative abilities that must be given to a user such as creating tables
-or users and changing permissions or configuration parameters.</p>
-    </blockquote>
-  </dd>
-  <dt>row</dt>
-  <dd>
-    <blockquote>
-      <p>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.</p>
-    </blockquote>
-  </dd>
-  <dt>scan</dt>
-  <dd>
-    <blockquote>
-      <p>reading a range of key/value pairs.</p>
-    </blockquote>
-  </dd>
-  <dt>tablet</dt>
-  <dd>
-    <blockquote>
-      <p>a contiguous key range; the unit of work for a tablet server.</p>
-    </blockquote>
-  </dd>
-  <dt>tablet servers</dt>
-  <dd>
-    <blockquote>
-      <p>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.</p>
-    </blockquote>
-  </dd>
-  <dt>timestamp</dt>
-  <dd>
-    <blockquote>
-      <p>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.</p>
-    </blockquote>
-  </dd>
-  <dt>value</dt>
-  <dd>
-    <blockquote>
-      <p>immutable bytes associated with a particular key.</p>
-    </blockquote>
-  </dd>
-</dl>
-
-
-        </div>
-
-        
-<footer>
-
-  <p><a href="https://www.apache.org/foundation/contributing"><img src="https://www.apache.org/images/SupportApache-small.png" alt="Support the ASF" id="asf-logo" height="100" /></a></p>
-
-  <p>Copyright © 2011-2018 <a href="https://www.apache.org">The Apache Software Foundation</a>.
-Licensed under the <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.</p>
-
-  <p>Apache®, the names of Apache projects and their logos, and the multicolor feather
-logo are registered trademarks or trademarks of The Apache Software Foundation
-in the United States and/or other countries.</p>
-
-</footer>
-
-
-      </div>
-    </div>
-  </div>
-</body>
+<html lang="en-US">
+  <meta charset="utf-8">
+  <title>Redirecting&hellip;</title>
+  <link rel="canonical" href="https://accumulo.apache.org/docs/2.x/getting-started/glossary">
+  <meta http-equiv="refresh" content="0; url=https://accumulo.apache.org/docs/2.x/getting-started/glossary">
+  <meta name="robots" content="noindex">
+  <h1>Redirecting&hellip;</h1>
+  <a href="https://accumulo.apache.org/docs/2.x/getting-started/glossary">Click here if you are not redirected.</a>
+  <script>location="https://accumulo.apache.org/docs/2.x/getting-started/glossary"</script>
 </html>
diff --git a/how-to-contribute/index.html b/how-to-contribute/index.html
index b67d394..401ca8f 100644
--- a/how-to-contribute/index.html
+++ b/how-to-contribute/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/index.html b/index.html
index aa1b95a..58355c5 100644
--- a/index.html
+++ b/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
@@ -163,21 +161,21 @@
     <div class="row">
       <div class="col-md-6"> 
         <h4>Server-side programming</h4>
-        <p>Accumulo has a programing meachinism (called Iterators) that can modify key/value pairs at various points in the data management process.</p>
+        <p>Accumulo has a programing meachinism (called <a href="/docs/2.x/development/iterators">Iterators</a>) that can modify key/value pairs at various points in the data management process.</p>
       </div>
       <div class="col-md-6">
         <h4>Cell-based access control</h4>
-        <p>Every Accumulo key/value pair has its own security label which limits query results based off user authorizations.</p>
+        <p>Every Accumulo key/value pair has its own <a href="/docs/2.x/development/security#security-label-expressions">security label</a> which limits query results based off user authorizations.</p>
       </div>
     </div>
     <div class="row">
       <div class="col-md-6"> 
         <h4>Designed to scale</h4>
-        <p>Accumulo runs on a cluster using one or more HDFS instances. Nodes can be added or removed as the amount of data stored in Accumulo changes.</p>
+        <p>Accumulo runs on a cluster using <a href="/docs/2.x/administration/multivolume">one or more HDFS instances</a>. Nodes can be added or removed as the amount of data stored in Accumulo changes.</p>
       </div>
       <div class="col-md-6">
         <h4>Stable</h4>
-        <p>Accumulo has a stable <a href="/latest/apidocs">client API</a> that follows <a href="https://semver.org">semantic versioning</a>. Each Accumulo release goes through <a href="/features/#testing">extensive testing</a>.</p>
+        <p>Accumulo has a stable <a href="/latest/apidocs">client API</a> that follows <a href="https://semver.org">semantic versioning</a>. Each Accumulo release goes through <a href="/docs/2.x/getting-started/features/#testing">extensive testing</a>.</p>
       </div>
     </div>
   </div>
diff --git a/news/index.html b/news/index.html
index 80b8496..754c4b0 100644
--- a/news/index.html
+++ b/news/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/notable_features.html b/notable_features.html
deleted file mode 100644
index 67f2614..0000000
--- a/notable_features.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-  <meta charset="utf-8">
-  <title>Redirecting&hellip;</title>
-  <link rel="canonical" href="https://accumulo.apache.org/features/">
-  <meta http-equiv="refresh" content="0; url=https://accumulo.apache.org/features/">
-  <meta name="robots" content="noindex">
-  <h1>Redirecting&hellip;</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>
diff --git a/notable_features/index.html b/notable_features/index.html
new file mode 100644
index 0000000..a3611f2
--- /dev/null
+++ b/notable_features/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en-US">
+  <meta charset="utf-8">
+  <title>Redirecting&hellip;</title>
+  <link rel="canonical" href="https://accumulo.apache.org/docs/2.x/getting-started/features">
+  <meta http-equiv="refresh" content="0; url=https://accumulo.apache.org/docs/2.x/getting-started/features">
+  <meta name="robots" content="noindex">
+  <h1>Redirecting&hellip;</h1>
+  <a href="https://accumulo.apache.org/docs/2.x/getting-started/features">Click here if you are not redirected.</a>
+  <script>location="https://accumulo.apache.org/docs/2.x/getting-started/features"</script>
+</html>
diff --git a/people/index.html b/people/index.html
index d821ead..f694015 100644
--- a/people/index.html
+++ b/people/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/quickstart-1.x/index.html b/quickstart-1.x/index.html
index d0929a7..04e61a9 100644
--- a/quickstart-1.x/index.html
+++ b/quickstart-1.x/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/redirects.json b/redirects.json
index 01d88db..38538e9 100644
--- a/redirects.json
+++ b/redirects.json
@@ -1 +1 @@
-{"/release_notes/1.5.1.html":"https://accumulo.apache.org/release/accumulo-1.5.1/","/release_notes/1.6.0.html":"https://accumulo.apache.org/release/accumulo-1.6.0/","/release_notes/1.6.1.html":"https://accumulo.apache.org/release/accumulo-1.6.1/","/release_notes/1.6.2.html":"https://accumulo.apache.org/release/accumulo-1.6.2/","/release_notes/1.7.0.html":"https://accumulo.apache.org/release/accumulo-1.7.0/","/release_notes/1.5.3.html":"https://accumulo.apache.org/release/accumulo-1.5.3/" [...]
\ No newline at end of file
+{"/release_notes/1.5.1.html":"https://accumulo.apache.org/release/accumulo-1.5.1/","/release_notes/1.6.0.html":"https://accumulo.apache.org/release/accumulo-1.6.0/","/release_notes/1.6.1.html":"https://accumulo.apache.org/release/accumulo-1.6.1/","/release_notes/1.6.2.html":"https://accumulo.apache.org/release/accumulo-1.6.2/","/release_notes/1.7.0.html":"https://accumulo.apache.org/release/accumulo-1.7.0/","/release_notes/1.5.3.html":"https://accumulo.apache.org/release/accumulo-1.5.3/" [...]
\ No newline at end of file
diff --git a/related-projects/index.html b/related-projects/index.html
index 491dec0..a19b1e5 100644
--- a/related-projects/index.html
+++ b/related-projects/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.3.5-incubating/index.html b/release/accumulo-1.3.5-incubating/index.html
index 2777302..d806630 100644
--- a/release/accumulo-1.3.5-incubating/index.html
+++ b/release/accumulo-1.3.5-incubating/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.3.6/index.html b/release/accumulo-1.3.6/index.html
index 0e390ed..67d628a 100644
--- a/release/accumulo-1.3.6/index.html
+++ b/release/accumulo-1.3.6/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.4.0/index.html b/release/accumulo-1.4.0/index.html
index 0bc75e8..1b0d44b 100644
--- a/release/accumulo-1.4.0/index.html
+++ b/release/accumulo-1.4.0/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.4.1/index.html b/release/accumulo-1.4.1/index.html
index 484ec80..e1ed9e6 100644
--- a/release/accumulo-1.4.1/index.html
+++ b/release/accumulo-1.4.1/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.4.2/index.html b/release/accumulo-1.4.2/index.html
index 3a6b4c6..d6f9c76 100644
--- a/release/accumulo-1.4.2/index.html
+++ b/release/accumulo-1.4.2/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.4.3/index.html b/release/accumulo-1.4.3/index.html
index 63ec771..2c401ef 100644
--- a/release/accumulo-1.4.3/index.html
+++ b/release/accumulo-1.4.3/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.4.4/index.html b/release/accumulo-1.4.4/index.html
index 74e4b35..a5fb755 100644
--- a/release/accumulo-1.4.4/index.html
+++ b/release/accumulo-1.4.4/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.4.5/index.html b/release/accumulo-1.4.5/index.html
index ea941c9..35ca785 100644
--- a/release/accumulo-1.4.5/index.html
+++ b/release/accumulo-1.4.5/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.5.0/index.html b/release/accumulo-1.5.0/index.html
index c876d01..6358ba3 100644
--- a/release/accumulo-1.5.0/index.html
+++ b/release/accumulo-1.5.0/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.5.1/index.html b/release/accumulo-1.5.1/index.html
index e381dc0..9883a05 100644
--- a/release/accumulo-1.5.1/index.html
+++ b/release/accumulo-1.5.1/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.5.2/index.html b/release/accumulo-1.5.2/index.html
index e6b2557..1d59218 100644
--- a/release/accumulo-1.5.2/index.html
+++ b/release/accumulo-1.5.2/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.5.3/index.html b/release/accumulo-1.5.3/index.html
index 46af82a..9e060ec 100644
--- a/release/accumulo-1.5.3/index.html
+++ b/release/accumulo-1.5.3/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.5.4/index.html b/release/accumulo-1.5.4/index.html
index b906caa..25cf361 100644
--- a/release/accumulo-1.5.4/index.html
+++ b/release/accumulo-1.5.4/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.6.0/index.html b/release/accumulo-1.6.0/index.html
index 12ac97c..213dbfc 100644
--- a/release/accumulo-1.6.0/index.html
+++ b/release/accumulo-1.6.0/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.6.1/index.html b/release/accumulo-1.6.1/index.html
index d1197ec..c15902e 100644
--- a/release/accumulo-1.6.1/index.html
+++ b/release/accumulo-1.6.1/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.6.2/index.html b/release/accumulo-1.6.2/index.html
index e2c7bbd..9cf6948 100644
--- a/release/accumulo-1.6.2/index.html
+++ b/release/accumulo-1.6.2/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.6.3/index.html b/release/accumulo-1.6.3/index.html
index 08e2eca..8dddabc 100644
--- a/release/accumulo-1.6.3/index.html
+++ b/release/accumulo-1.6.3/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.6.4/index.html b/release/accumulo-1.6.4/index.html
index 9159f8e..81e1b3c 100644
--- a/release/accumulo-1.6.4/index.html
+++ b/release/accumulo-1.6.4/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.6.5/index.html b/release/accumulo-1.6.5/index.html
index a19a44a..1d4c9ea 100644
--- a/release/accumulo-1.6.5/index.html
+++ b/release/accumulo-1.6.5/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.6.6/index.html b/release/accumulo-1.6.6/index.html
index da5f555..15e290f 100644
--- a/release/accumulo-1.6.6/index.html
+++ b/release/accumulo-1.6.6/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.7.0/index.html b/release/accumulo-1.7.0/index.html
index 974e8ea..23cc3a7 100644
--- a/release/accumulo-1.7.0/index.html
+++ b/release/accumulo-1.7.0/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.7.1/index.html b/release/accumulo-1.7.1/index.html
index 1e843cb..69f4620 100644
--- a/release/accumulo-1.7.1/index.html
+++ b/release/accumulo-1.7.1/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.7.2/index.html b/release/accumulo-1.7.2/index.html
index c6c6477..f9f2b97 100644
--- a/release/accumulo-1.7.2/index.html
+++ b/release/accumulo-1.7.2/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.7.3/index.html b/release/accumulo-1.7.3/index.html
index 45934f1..7173c68 100644
--- a/release/accumulo-1.7.3/index.html
+++ b/release/accumulo-1.7.3/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.7.4/index.html b/release/accumulo-1.7.4/index.html
index 101dd39..d5ed37d 100644
--- a/release/accumulo-1.7.4/index.html
+++ b/release/accumulo-1.7.4/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.8.0/index.html b/release/accumulo-1.8.0/index.html
index 26eea06..f39e1c7 100644
--- a/release/accumulo-1.8.0/index.html
+++ b/release/accumulo-1.8.0/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.8.1/index.html b/release/accumulo-1.8.1/index.html
index be13b1b..126cefe 100644
--- a/release/accumulo-1.8.1/index.html
+++ b/release/accumulo-1.8.1/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.9.0/index.html b/release/accumulo-1.9.0/index.html
index a89e812..6446335 100644
--- a/release/accumulo-1.9.0/index.html
+++ b/release/accumulo-1.9.0/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.9.1/index.html b/release/accumulo-1.9.1/index.html
index 46894fb..e03fd64 100644
--- a/release/accumulo-1.9.1/index.html
+++ b/release/accumulo-1.9.1/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.9.2/index.html b/release/accumulo-1.9.2/index.html
index fc6d823..09ff879 100644
--- a/release/accumulo-1.9.2/index.html
+++ b/release/accumulo-1.9.2/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-1.9.3/index.html b/release/accumulo-1.9.3/index.html
index 99e8cb5..0af7b4a 100644
--- a/release/accumulo-1.9.3/index.html
+++ b/release/accumulo-1.9.3/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-2.0.0-alpha-1/index.html b/release/accumulo-2.0.0-alpha-1/index.html
index 2e58fcd..782cc4e 100644
--- a/release/accumulo-2.0.0-alpha-1/index.html
+++ b/release/accumulo-2.0.0-alpha-1/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/accumulo-2.0.0/index.html b/release/accumulo-2.0.0/index.html
index c656d68..8ed3989 100644
--- a/release/accumulo-2.0.0/index.html
+++ b/release/accumulo-2.0.0/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/release/index.html b/release/index.html
index 18f6ead..0ed5685 100644
--- a/release/index.html
+++ b/release/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/search/index.html b/search/index.html
index a1a7c60..acf9a24 100644
--- a/search/index.html
+++ b/search/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/search_data.json b/search_data.json
index 098438f..783fa4b 100644
--- a/search_data.json
+++ b/search_data.json
@@ -175,6 +175,20 @@
       "categories": "getting-started"
     },
   
+    "docs-2-x-getting-started-features": {
+      "title": "Features",
+      "content"	 : "  Table Design and Configuration  Integrity/Availability  Performance  Testing  Client API  Extensible Behaviors  General Administration  Internal Data Management  On-demand Data Management  ScreenshotsTable Design and ConfigurationIteratorsA server-side programming mechanism to encode functions such as filtering andaggregation within the data management steps (scopes where data is read from orwritten to disk) that happen in the tablet server.Cell labelsAn additional  [...]
+      "url": " /docs/2.x/getting-started/features",
+      "categories": "getting-started"
+    },
+  
+    "docs-2-x-getting-started-glossary": {
+      "title": "Glossary",
+      "content"	 : "  authorizations            a set of strings associated with a user or with a particular scan that willbe used to determine which key/value pairs are visible to the user.        cell            a set of key/value pairs whose keys differ only in timestamp.        column            the portion of the key that sorts after the row and is divided into family,qualifier, and visibility.        column family            the portion of the key that sorts second and controls loc [...]
+      "url": " /docs/2.x/getting-started/glossary",
+      "categories": "getting-started"
+    },
+  
     "docs-2-x-getting-started-quick-install": {
       "title": "Quick Installation",
       "content"	 : "This document provides basic instructions for installing Accumulo. For detailed instructions,see the in-depth installation guide.Either download or build a binary distribution of Accumulo from source code andunpack as follows.tar xzf /path/to/accumulo-2.0.0-alpha-1-bin.tar.gzcd accumulo-2.0.0-alpha-1There are four scripts in the bin directory of the tarball distribution that are usedto manage Accumulo:  accumulo - Runs Accumulo command-line tools and starts Accumulo p [...]
diff --git a/tour/authorizations-code/index.html b/tour/authorizations-code/index.html
index f36c778..2c122e1 100644
--- a/tour/authorizations-code/index.html
+++ b/tour/authorizations-code/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/tour/authorizations/index.html b/tour/authorizations/index.html
index 46e11a7..8fe1515 100644
--- a/tour/authorizations/index.html
+++ b/tour/authorizations/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/tour/basic-read-write/index.html b/tour/basic-read-write/index.html
index 1506bc9..7f16b60 100644
--- a/tour/basic-read-write/index.html
+++ b/tour/basic-read-write/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/tour/batch-scanner-code/index.html b/tour/batch-scanner-code/index.html
index 27ab136..bd79965 100644
--- a/tour/batch-scanner-code/index.html
+++ b/tour/batch-scanner-code/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/tour/batch-scanner/index.html b/tour/batch-scanner/index.html
index 0eef1ba..b2dc6e9 100644
--- a/tour/batch-scanner/index.html
+++ b/tour/batch-scanner/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/tour/conditional-writer-code/index.html b/tour/conditional-writer-code/index.html
index 3bca278..2bbdda8 100644
--- a/tour/conditional-writer-code/index.html
+++ b/tour/conditional-writer-code/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/tour/conditional-writer/index.html b/tour/conditional-writer/index.html
index 7b72db3..594107c 100644
--- a/tour/conditional-writer/index.html
+++ b/tour/conditional-writer/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/tour/data-model-code/index.html b/tour/data-model-code/index.html
index a47ab62..d661cd6 100644
--- a/tour/data-model-code/index.html
+++ b/tour/data-model-code/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/tour/data-model/index.html b/tour/data-model/index.html
index 6ae55a0..58fbf9b 100644
--- a/tour/data-model/index.html
+++ b/tour/data-model/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/tour/getting-started/index.html b/tour/getting-started/index.html
index cddefb3..9367c1b 100644
--- a/tour/getting-started/index.html
+++ b/tour/getting-started/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/tour/index.html b/tour/index.html
index 2725a07..746f198 100644
--- a/tour/index.html
+++ b/tour/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/tour/ranges-splits/index.html b/tour/ranges-splits/index.html
index 5a7f2ff..baabe3b 100644
--- a/tour/ranges-splits/index.html
+++ b/tour/ranges-splits/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>
diff --git a/tour/using-iterators/index.html b/tour/using-iterators/index.html
index 71799b0..0d9b378 100644
--- a/tour/using-iterators/index.html
+++ b/tour/using-iterators/index.html
@@ -99,12 +99,10 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
           <ul class="dropdown-menu">
+            <li><a href="/docs/2.x/getting-started/design/">User Manual (2.x)</a></li>
             <li><a href="/quickstart-1.x">Quickstart (1.x)</a></li>
             <li><a href="/1.9/accumulo_user_manual.html">User Manual (1.9)</a></li>
             <li><a href="/1.9/apidocs">Javadocs (1.9)</a></li>
-            <li><a href="/1.9/examples">Examples (1.9)</a></li>
-            <li><a href="/features">Features</a></li>
-            <li><a href="/glossary">Glossary</a></li>
             <li><a href="/external-docs">External Docs</a></li>
             <li><a href="/docs-archive/">Archive</a></li>
           </ul>


Mime
View raw message