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:afcdcfe
Date Thu, 25 Oct 2018 17:22:03 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 49e8316  Jekyll build from master:afcdcfe
49e8316 is described below

commit 49e831695e0677ae51736cae243862f1e8653b37
Author: Mike Walch <mwalch@apache.org>
AuthorDate: Thu Oct 25 13:21:44 2018 -0400

    Jekyll build from master:afcdcfe
    
    Updates to documentation (#125)
    
    * Updated monitor images
    * Several updates to Security documentation
    * Updated features documentation and added links
      to the rest of the documentation
---
 docs/2.x/administration/caching.html               |  10 +-
 docs/2.x/administration/fate.html                  |  10 +-
 docs/2.x/administration/in-depth-install.html      |  10 +-
 docs/2.x/administration/monitoring-metrics.html    |  37 +++--
 docs/2.x/administration/multivolume.html           |  10 +-
 docs/2.x/administration/replication.html           |  10 +-
 docs/2.x/administration/scan-executors.html        |  10 +-
 docs/2.x/administration/upgrading.html             |  10 +-
 docs/2.x/configuration/client-properties.html      |  10 +-
 docs/2.x/configuration/overview.html               |  10 +-
 docs/2.x/configuration/server-properties.html      |  10 +-
 docs/2.x/development/development_tools.html        |  10 +-
 docs/2.x/development/high_speed_ingest.html        |  10 +-
 docs/2.x/development/iterators.html                |  10 +-
 docs/2.x/development/mapreduce.html                |  10 +-
 docs/2.x/development/proxy.html                    |  10 +-
 docs/2.x/development/sampling.html                 |  10 +-
 docs/2.x/development/summaries.html                |  10 +-
 docs/2.x/getting-started/clients.html              |  10 +-
 docs/2.x/getting-started/design.html               |  10 +-
 docs/2.x/getting-started/features.html             | 159 +++++++--------------
 docs/2.x/getting-started/glossary.html             |  10 +-
 docs/2.x/getting-started/quick-install.html        |  10 +-
 docs/2.x/getting-started/shell.html                |  10 +-
 docs/2.x/getting-started/table_configuration.html  |  10 +-
 docs/2.x/getting-started/table_design.html         |  10 +-
 docs/2.x/security/kerberos.html                    |  10 +-
 docs/2.x/security/{features.html => labels.html}   |  92 +++---------
 .../{crypto.html => on-disk-encryption.html}       |  17 +--
 .../caching.html => security/overview.html}        |  99 +++++++------
 .../security/{ssl.html => wire-encryption.html}    |  20 +--
 docs/2.x/troubleshooting/advanced.html             |  10 +-
 docs/2.x/troubleshooting/basic.html                |  10 +-
 docs/2.x/troubleshooting/performance.html          |  10 +-
 .../troubleshooting/system-metadata-tables.html    |  10 +-
 docs/2.x/troubleshooting/tools.html                |  10 +-
 docs/2.x/troubleshooting/tracing.html              |  10 +-
 feed.xml                                           |   4 +-
 images/accumulo-monitor-1.png                      | Bin 0 -> 84774 bytes
 images/accumulo-monitor-2.png                      | Bin 0 -> 58243 bytes
 images/master.png                                  | Bin 115283 -> 0 bytes
 images/master2.png                                 | Bin 74768 -> 0 bytes
 images/overview2.png                               | Bin 340104 -> 0 bytes
 index.html                                         |   2 +-
 redirects.json                                     |   2 +-
 search_data.json                                   |  41 +++---
 46 files changed, 381 insertions(+), 402 deletions(-)

diff --git a/docs/2.x/administration/caching.html b/docs/2.x/administration/caching.html
index 724de50..2d7a6bd 100644
--- a/docs/2.x/administration/caching.html
+++ b/docs/2.x/administration/caching.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/administration/fate.html b/docs/2.x/administration/fate.html
index f96f291..e276780 100644
--- a/docs/2.x/administration/fate.html
+++ b/docs/2.x/administration/fate.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</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 f7aa2dc..1af2fa5 100644
--- a/docs/2.x/administration/in-depth-install.html
+++ b/docs/2.x/administration/in-depth-install.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/administration/monitoring-metrics.html b/docs/2.x/administration/monitoring-metrics.html
index 8161a17..922fb39 100644
--- a/docs/2.x/administration/monitoring-metrics.html
+++ b/docs/2.x/administration/monitoring-metrics.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
@@ -424,22 +426,30 @@
 
 <h3 id="accumulo-monitor">Accumulo Monitor</h3>
 
-<p>The Accumulo Monitor provides an interface for monitoring the status and health of
-Accumulo components. The Accumulo Monitor provides a web UI for accessing this information at
-<code class="highlighter-rouge">http://_monitorhost_:9995/</code>.</p>
+<p>The Accumulo Monitor provides a web UI with information on the health and status of Accumulo.</p>
 
-<p>Things highlighted in yellow may be in need of attention.
-If anything is highlighted in red on the monitor page, it is something that definitely needs attention.</p>
+<p>The monitor can be viewed at:</p>
+<ul>
+  <li><a href="http://localhost:9995">http://localhost:9995</a> - if Accumulo is running locally (for development)</li>
+  <li><code class="highlighter-rouge">http://&lt;MONITOR_HOST&gt;:9995/</code> - if Accumulo is running on a cluster</li>
+</ul>
+
+<p>The Overview page (shown below) contains some summary information about the Accumulo instance and graphs
+displaying various metrics over time. These include ingest and scan performance and other useful measurements.</p>
 
-<p>The Overview page contains some summary information about the Accumulo instance, including the version, instance name, and instance ID.
-There is a table labeled Accumulo Master with current status, a table listing the active Zookeeper servers, and graphs displaying various metrics over time.
-These include ingest and scan performance and other useful measurements.</p>
+<p><a class="thumbnail" href="/images/accumulo-monitor-1.png">
+<img src="/images/accumulo-monitor-1.png" alt="monitor overview" />
+</a></p>
 
 <p>The Master Server, Tablet Servers, and Tables pages display metrics grouped in different ways (e.g. by tablet server or by table).
 Metrics typically include number of entries (key/value pairs), ingest and query rates.
 The number of running scans, major and minor compactions are in the form <em>number_running</em> (<em>number_queued</em>).
 Another important metric is hold time, which is the amount of time a tablet has been waiting but unable to flush its memory in a minor compaction.</p>
 
+<p><a class="thumbnail" href="/images/accumulo-monitor-2.png">
+<img src="/images/accumulo-monitor-2.png" alt="monitor master" />
+</a></p>
+
 <p>The Server Activity page graphically displays tablet server status, with each server represented as a circle or square.
 Different metrics may be assigned to the nodes’ color and speed of oscillation.
 The Overall Avg metric is only used on the Server Activity page, and represents the average of all the other metrics (after normalization).
@@ -455,6 +465,9 @@ the monitor is intended to be a tool used with care. It is not a production-grad
 a good idea to whitelist access to the monitor via an authentication proxy or firewall. It
 is strongly recommended that the Monitor is not exposed to any publicly-accessible networks.</p>
 
+<p>Things highlighted in yellow may be in need of attention.
+If anything is highlighted in red on the monitor page, it is something that definitely needs attention.</p>
+
 <h3 id="ssl">SSL</h3>
 
 <p>SSL may be enabled for the monitor page by setting the following properties in the <code class="highlighter-rouge">accumulo.properties</code> file:</p>
diff --git a/docs/2.x/administration/multivolume.html b/docs/2.x/administration/multivolume.html
index 3723491..fd9d699 100644
--- a/docs/2.x/administration/multivolume.html
+++ b/docs/2.x/administration/multivolume.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/administration/replication.html b/docs/2.x/administration/replication.html
index 959a0c5..f2ea870 100644
--- a/docs/2.x/administration/replication.html
+++ b/docs/2.x/administration/replication.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/administration/scan-executors.html b/docs/2.x/administration/scan-executors.html
index 719553f..391d998 100644
--- a/docs/2.x/administration/scan-executors.html
+++ b/docs/2.x/administration/scan-executors.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/administration/upgrading.html b/docs/2.x/administration/upgrading.html
index b514e30..e21665e 100644
--- a/docs/2.x/administration/upgrading.html
+++ b/docs/2.x/administration/upgrading.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/configuration/client-properties.html b/docs/2.x/configuration/client-properties.html
index 0aa5c7c..dc232cc 100644
--- a/docs/2.x/configuration/client-properties.html
+++ b/docs/2.x/configuration/client-properties.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/configuration/overview.html b/docs/2.x/configuration/overview.html
index fb9a090..8689e9c 100644
--- a/docs/2.x/configuration/overview.html
+++ b/docs/2.x/configuration/overview.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/configuration/server-properties.html b/docs/2.x/configuration/server-properties.html
index e52236e..41600ee 100644
--- a/docs/2.x/configuration/server-properties.html
+++ b/docs/2.x/configuration/server-properties.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/development/development_tools.html b/docs/2.x/development/development_tools.html
index 881f223..76879e4 100644
--- a/docs/2.x/development/development_tools.html
+++ b/docs/2.x/development/development_tools.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</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 d6321a8..5edf92a 100644
--- a/docs/2.x/development/high_speed_ingest.html
+++ b/docs/2.x/development/high_speed_ingest.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/development/iterators.html b/docs/2.x/development/iterators.html
index 8a9e406..8676132 100644
--- a/docs/2.x/development/iterators.html
+++ b/docs/2.x/development/iterators.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/development/mapreduce.html b/docs/2.x/development/mapreduce.html
index 247b675..76b06cf 100644
--- a/docs/2.x/development/mapreduce.html
+++ b/docs/2.x/development/mapreduce.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/development/proxy.html b/docs/2.x/development/proxy.html
index 11c138f..6b90089 100644
--- a/docs/2.x/development/proxy.html
+++ b/docs/2.x/development/proxy.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/development/sampling.html b/docs/2.x/development/sampling.html
index 535a203..d4b9d61 100644
--- a/docs/2.x/development/sampling.html
+++ b/docs/2.x/development/sampling.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/development/summaries.html b/docs/2.x/development/summaries.html
index ce4fe24..cb41925 100644
--- a/docs/2.x/development/summaries.html
+++ b/docs/2.x/development/summaries.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/getting-started/clients.html b/docs/2.x/getting-started/clients.html
index 4b5b966..87251d2 100644
--- a/docs/2.x/getting-started/clients.html
+++ b/docs/2.x/getting-started/clients.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/getting-started/design.html b/docs/2.x/getting-started/design.html
index edf4677..2dde00c 100644
--- a/docs/2.x/getting-started/design.html
+++ b/docs/2.x/getting-started/design.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/getting-started/features.html b/docs/2.x/getting-started/features.html
index 3415f86..65e6636 100644
--- a/docs/2.x/getting-started/features.html
+++ b/docs/2.x/getting-started/features.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
@@ -431,30 +433,29 @@
   <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
+<p><a href="/docs/2.x/development/iterators">Iterators</a> are server-side programming mechanisms that 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>
+<h3 id="security-labels">Security 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>
+<p>Accumulo Keys can contain a <a href="/docs/2.x/security/labels">security label</a>
+(called a Column Visibility) that enables expressive cell-level access control.
+Authorizations are passed with each query to control what data is returned to the user.
+Column visibilities support boolean <code class="highlighter-rouge">AND</code> and <code class="highlighter-rouge">OR</code> combinations of arbitrary strings (such
+as <code class="highlighter-rouge">(A&amp;B)|C</code>) and authorizations are sets of strings (such as <code class="highlighter-rouge">{C,D}</code>).</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>
+<p><a href="/docs/2.x/getting-started/table_configuration#constraints">Constraints</a> are configurable
+conditions where table writes are rejected. Constraints are written in Java and configurable
+on a per table basis.</p>
 
 <h3 id="sharding">Sharding</h3>
 
@@ -468,20 +469,18 @@ documents containing certain words.</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>
+<p>Table namespaces (since 1.6.0) 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>
+<p>While Accumulo typically runs on a single HDFS instance, it supports <a href="/docs/2.x/administration/multivolume">multi-volume installations</a>
+(since 1.6.0) which allow it to run 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>
 
@@ -490,7 +489,7 @@ of datanodes.</p>
 <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>
+and Zookeeper.</p>
 
 <h3 id="logical-time">Logical time</h3>
 
@@ -522,8 +521,8 @@ 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
+<p><a href="/docs/2.x/administration/fate">FATE</a> (short for <strong>Fa</strong>ult <strong>T</strong>olerant <strong>E</strong>xecutor) is a framework for executing
+operations in a fault tolerant manner. Before FATE, 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
@@ -569,8 +568,9 @@ 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>
+<p>Recently scanned data is <a href="/docs/2.x/administration/caching">cached</a> 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>
 
@@ -595,11 +595,6 @@ 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 
@@ -652,18 +647,18 @@ framework and subsequently corrected.</p>
 
 <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
+<p>The <a href="/docs/2.x/getting-started/clients#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
+<p>The <a href="/docs/2.x/getting-started/clients#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
+value pairs can be imported using <a href="/docs/2.x/development/high_speed_ingest#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
@@ -673,23 +668,19 @@ 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>
+<p>Accumulo can be a source and/or sink for <a href="/docs/2.x/development/mapreduce">MapReduce</a> jobs.</p>
 
-<h3 id="apache-thrift-proxy">Apache Thrift Proxy</h3>
+<h3 id="proxy">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>
+<p>Accumulo has a <a href="/docs/2.x/development/proxy">proxy</a> which enables interaction
+to with Accumulo using 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>
+<p><a href="/docs/2.x/getting-started/clients#conditionalwriter">Conditional Mutations</a> (since 1.6.0) 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="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/data/ConditionalMutation.html">ConditionalMutation</a> and <a href="/docs/2.x/getting-started/clients#conditionalwriter">ConditionalWriter</a>.</p>
 
 <h3 id="lexicoders">Lexicoders</h3>
 
@@ -739,11 +730,15 @@ can be used to optimize the data that compactions will write.</p>
 
 <h3 id="monitor-page">Monitor page</h3>
 
-<p>A simple web server that provides basic information about the system health and
+<p>The <a href="/docs/2.x/administration/monitoring-metrics">Accumulo Monitor</a> 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>
 
+<p><a class="thumbnail" href="/images/accumulo-monitor-1.png">
+<img src="/images/accumulo-monitor-1.png" alt="monitor overview" />
+</a></p>
+
 <h3 id="tracing">Tracing</h3>
 
 <p>It can be difficult to determine why some operations are taking longer than
@@ -798,19 +793,10 @@ 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>
+<p>Accumulo can encrypt its <a href="/docs/2.x/security/on-disk-encryption">data on disk</a> and
+<a href="/docs/2.x/security/wire-encryption">data sent over the wire</a>.</p>
 
 <h2 id="on-demand-data-management">On-demand Data Management</h2>
 
@@ -858,53 +844,6 @@ imported.</p>
 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 class="row" style="margin-top: 20px;">
diff --git a/docs/2.x/getting-started/glossary.html b/docs/2.x/getting-started/glossary.html
index a31ebd1..f0e8bf3 100644
--- a/docs/2.x/getting-started/glossary.html
+++ b/docs/2.x/getting-started/glossary.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/getting-started/quick-install.html b/docs/2.x/getting-started/quick-install.html
index b221b8d..d970ef4 100644
--- a/docs/2.x/getting-started/quick-install.html
+++ b/docs/2.x/getting-started/quick-install.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/getting-started/shell.html b/docs/2.x/getting-started/shell.html
index 0d4d8c7..369106e 100644
--- a/docs/2.x/getting-started/shell.html
+++ b/docs/2.x/getting-started/shell.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</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 7166dcc..7b449c3 100644
--- a/docs/2.x/getting-started/table_configuration.html
+++ b/docs/2.x/getting-started/table_configuration.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</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 1b454cb..67bfdca 100644
--- a/docs/2.x/getting-started/table_design.html
+++ b/docs/2.x/getting-started/table_design.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/security/kerberos.html b/docs/2.x/security/kerberos.html
index 6f6ad39..2b5fa15 100644
--- a/docs/2.x/security/kerberos.html
+++ b/docs/2.x/security/kerberos.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/security/features.html b/docs/2.x/security/labels.html
similarity index 81%
rename from docs/2.x/security/features.html
rename to docs/2.x/security/labels.html
index 24036fc..3e531bb 100644
--- a/docs/2.x/security/features.html
+++ b/docs/2.x/security/labels.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 - Security Features</title>
+<title>Accumulo Documentation - Security Labels</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>
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
@@ -410,22 +412,21 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Security &nbsp;&gt;&gt;&nbsp; Security Features</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Security &nbsp;&gt;&gt;&nbsp; Security Labels</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>Security 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/security/features.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-10"><h1>Security Labels</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/security/labels.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
-    <p>Accumulo extends the BigTable data model to implement a security mechanism
-known as cell-level security. Every <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/data/Key.html">Key</a>-<a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/data/Value.html">Value</a> pair has its own security label, stored
-under the column visibility element of the key, which is used to determine whether
-a given user meets the security requirements to read the value. This enables data of
-various security levels to be stored within the same row, and users of varying
-degrees of access to query the same table, while preserving data confidentiality.</p>
+    <p>Every <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/data/Key.html">Key</a>-<a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/data/Value.html">Value</a> pair in Accumulo has its own security label, stored under the column visibility
+element of the key, which is used to determine whether a given user meets the security
+requirements to read the value. This enables data of various security levels to be stored
+within the same row, and users of varying degrees of access to query the same table, while
+preserving data confidentiality.</p>
 
 <h2 id="security-label-expressions">Security Label Expressions</h2>
 
@@ -524,72 +525,11 @@ conflict with any existing constraints.</p>
 This constraint is not applied to bulk imported data, if this a concern then
 disable the bulk import permission.</p>
 
-<h2 id="pluggable-security">Pluggable Security</h2>
-
-<p>Accumulo has a pluggable security mechanism. It can be broken into three actions: authentication, 
-authorization, and permission handling.</p>
-
-<p>Authentication verifies the identity of a user. In Accumulo, authentication occurs when
-the <code class="highlighter-rouge">usingToken'</code> method of the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a> builder is called with a principal (i.e username)
-and an <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.html">AuthenticationToken</a> which is an interface with multiple implementations. The most
-common implementation is <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/security/tokens/PasswordToken.html">PasswordToken</a> which is the default authentication method for Accumulo
-out of the box.</p>
-
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">()</span>
-                    <span class="o">.</span><span class="na">forInstance</span><span class="o">(</span><span class="s">"myinstance"</span><span class="o">,</span> <span class="s">"zookeeper1,zookeper2"</span><span class="o">)</span>
-                    <span class="o">.</span><span class="na">usingToken</span><span class="o">(</span><span class="s">"user"</span><span class="o">,</span> <span class="k">new</span> <span class="n">PasswordToken</span><span class="o">(</span><span class="s">"passwd"</span><span class="o">)).</span><span class="na">build</span><span class="o">();</span>
-</code></pre></div></div>
-
-<p>Once a user is authenticated by the Authenticator, the user has access to the other actions within
-Accumulo. All actions in Accumulo are ACLed, and this ACL check is handled by the Permission
-Handler. This is what manages all of the permissions, which are divided in system and per table
-level. From there, if a user is doing an action which requires authorizations, the Authorizor is
-queried to determine what authorizations the user has.</p>
-
-<p>This setup allows a variety of different mechanisms to be used for handling different aspects of
-Accumulo’s security. A system like Kerberos can be used for authentication, then a system like LDAP
-could be used to determine if a user has a specific permission, and then it may default back to the
-default ZookeeperAuthorizor to determine what Authorizations a user is ultimately allowed to use.
-This is a pluggable system so custom components can be created depending on your need.</p>
-
-<h2 id="secure-authorizations-handling">Secure Authorizations Handling</h2>
-
-<p>For applications serving many users, it is not expected that an Accumulo user
-will be created for each application user. In this case an Accumulo user with
-all authorizations needed by any of the applications users must be created. To
-service queries, the application should create a scanner with the application
-user’s authorizations. These authorizations could be obtained from a trusted 3rd
-party.</p>
-
-<p>Often production systems will integrate with Public-Key Infrastructure (PKI) and
-designate client code within the query layer to negotiate with PKI servers in order
-to authenticate users and retrieve their authorization tokens (credentials). This
-requires users to specify only the information necessary to authenticate themselves
-to the system. Once user identity is established, their credentials can be accessed by
-the client code and passed to Accumulo outside of the reach of the user.</p>
-
-<h2 id="query-services-layer">Query Services Layer</h2>
-
-<p>Since the primary method of interaction with Accumulo is through the Java API,
-production environments often call for the implementation of a Query layer. This
-can be done using web services in containers such as Apache Tomcat, but is not a
-requirement. The Query Services Layer provides a mechanism for providing a
-platform on which user facing applications can be built. This allows the application
-designers to isolate potentially complex query logic, and enables a convenient point
-at which to perform essential security functions.</p>
-
-<p>Several production environments choose to implement authentication at this layer,
-where users identifiers are used to retrieve their access credentials which are then
-cached within the query layer and presented to Accumulo through the
-Authorizations mechanism.</p>
-
-<p>Typically, the query services layer sits between Accumulo and user workstations.</p>
-
 
 
     <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/security/features.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/security/labels.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/security/crypto.html b/docs/2.x/security/on-disk-encryption.html
similarity index 97%
rename from docs/2.x/security/crypto.html
rename to docs/2.x/security/on-disk-encryption.html
index f8c96a4..0048562 100644
--- a/docs/2.x/security/crypto.html
+++ b/docs/2.x/security/on-disk-encryption.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
@@ -417,12 +419,11 @@
 
     <div class="row">
       <div class="col-md-10"><h1>On Disk Encryption</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/security/crypto.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" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/security/on-disk-encryption.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <p>For an additional layer of security, Accumulo can encrypt files stored on disk.  On Disk encryption was reworked 
-for 2.0, making it easier to configure and more secure.  The files that can be encrypted include: <a href="/docs/2.x/getting-started/design#rfile">RFiles</a> and Write Ahead Logs (WALs).
-For information on encrypting data over the wire see the section on <a href="/docs/2.x/security/ssl">SSL</a>.  For information on cryptographic client-server authentication see the section on <a href="/docs/2.x/security/kerberos">Kerberos</a>.</p>
+for 2.0, making it easier to configure and more secure.  The files that can be encrypted include: <a href="/docs/2.x/getting-started/design#rfile">RFiles</a> and Write Ahead Logs (WALs).</p>
 
 <h2 id="configuration">Configuration</h2>
 
@@ -517,7 +518,7 @@ Java 8 GCM times:
 
     <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/security/crypto.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/security/on-disk-encryption.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/administration/caching.html b/docs/2.x/security/overview.html
similarity index 76%
copy from docs/2.x/administration/caching.html
copy to docs/2.x/security/overview.html
index 724de50..d97c5ff 100644
--- a/docs/2.x/administration/caching.html
+++ b/docs/2.x/security/overview.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 - Caching</title>
+<title>Accumulo Documentation - Security Overview</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>
@@ -257,22 +257,24 @@
           
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
-                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsesecurity" aria-expanded="false" aria-controls="collapsesecurity">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsesecurity" aria-expanded="true" aria-controls="collapsesecurity">
                   Security
                 </a>
               </h4>
             </div>
-            <div id="collapsesecurity" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+            <div id="collapsesecurity" 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/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
@@ -321,12 +323,12 @@
           
             <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="true" aria-controls="collapseadministration">
+                <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 in" role="tabpanel" aria-labelledby="headingOne">
+            <div id="collapseadministration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
               <div class="panel-body">
                 
                 
@@ -410,63 +412,76 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Caching</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Security &nbsp;&gt;&gt;&nbsp; Security Overview</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>Caching</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/administration/caching.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-10"><h1>Security Overview</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/security/overview.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
-    <p>Accumulo <a href="/docs/2.x/getting-started/design#tablet-server-1">tablet servers</a> have <strong>block caches</strong> that buffer data in memory to limit reads from disk.
-This caching has the following benefits:</p>
+    <p>This page provides an overview of Accumulo’s security features.</p>
+
+<p>A few Accumulo security features have on their own documentation page:</p>
 
 <ul>
-  <li>reduces latency when reading data</li>
-  <li>helps alleviate hotspots in tables</li>
+  <li><a href="/docs/2.x/security/labels">Security Labels</a></li>
+  <li><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></li>
+  <li><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></li>
+  <li><a href="/docs/2.x/security/kerberos">Kerberos</a></li>
 </ul>
 
-<p>Each tablet server has an index and data block cache that is shared by all hosted tablets (see the <a href="/docs/2.x/getting-started/design#tablet-server-1">tablet server diagram</a>
-to learn more). A typical Accumulo read operation will perform a binary search over several index blocks followed by a linear scan
-of one or more data blocks. If these blocks are not in a cache, they will need to be retrieved from <a href="/docs/2.x/getting-started/design#rfile">RFiles</a> in HDFS. While the index
-block cache is enabled for all tables, the data block cache has to be enabled for a table by the user. It is typically only enabled
-for tables where read performance is critical.</p>
-
-<h2 id="configuration">Configuration</h2>
-
-<p>The index and data block caches are configured for tables by the following properties:</p>
+<h2 id="pluggable-security">Pluggable Security</h2>
 
-<ul>
-  <li><a href="/docs/2.x/configuration/server-properties#table_cache_block_enable">table.cache.block.enable</a> - enables data block cache on the table (default is <code class="highlighter-rouge">false</code>)</li>
-  <li><a href="/docs/2.x/configuration/server-properties#table_cache_index_enable">table.cache.index.enable</a> - enables index block cache on the table (default is <code class="highlighter-rouge">true</code>)</li>
-</ul>
+<p>Accumulo has a pluggable security mechanism. It can be broken into three actions: authentication, 
+authorization, and permission handling.</p>
 
-<p>While the index block cache is enabled by default for all Accumulo tables, users must enable the data block cache by
-setting <a href="/docs/2.x/configuration/server-properties#table_cache_block_enable">table.cache.block.enable</a> to <code class="highlighter-rouge">true</code> in the shell:</p>
+<p>Authentication verifies the identity of a user. In Accumulo, authentication occurs when
+the <code class="highlighter-rouge">usingToken'</code> method of the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a> builder is called with a principal (i.e username)
+and an <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.html">AuthenticationToken</a> which is an interface with multiple implementations. The most
+common implementation is <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/security/tokens/PasswordToken.html">PasswordToken</a> which is the default authentication method for Accumulo
+out of the box.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>config -t mytable -s table.cache.block.enable=true
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">()</span>
+                    <span class="o">.</span><span class="na">forInstance</span><span class="o">(</span><span class="s">"myinstance"</span><span class="o">,</span> <span class="s">"zookeeper1,zookeper2"</span><span class="o">)</span>
+                    <span class="o">.</span><span class="na">usingToken</span><span class="o">(</span><span class="s">"user"</span><span class="o">,</span> <span class="k">new</span> <span class="n">PasswordToken</span><span class="o">(</span><span class="s">"passwd"</span><span class="o">)).</span><span class="na">build</span><span class="o">();</span>
 </code></pre></div></div>
 
-<p>Or programmatically using <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/admin/TableOperations.html#setProperty-java.lang.String-java.lang.String-java.lang.String-">TableOperations.setProperty()</a>:</p>
+<p>Once a user is authenticated by the Authenticator, the user has access to the other actions within
+Accumulo. All actions in Accumulo are ACLed, and this ACL check is handled by the Permission
+Handler. This is what manages all of the permissions, which are divided in system and per table
+level. From there, if a user is doing an action which requires authorizations, the Authorizor is
+queried to determine what authorizations the user has.</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">client</span><span class="o">.</span><span class="na">tableOperations</span><span class="o">().</span><span class="na">setProperty</span><span class="o">(</span><span class="s">"mytable"</span><span class="o">,</span> <span class="s">"table.cache.block.enable"</span><span class="o">,</span> <span class="s">"true"</span><span class="o">);</span>
-</code></pre></div></div>
+<p>This setup allows a variety of different mechanisms to be used for handling different aspects of
+Accumulo’s security. A system like Kerberos can be used for authentication, then a system like LDAP
+could be used to determine if a user has a specific permission, and then it may default back to the
+default ZookeeperAuthorizor to determine what Authorizations a user is ultimately allowed to use.
+This is a pluggable system so custom components can be created depending on your need.</p>
 
-<p>The size of the index and data block caches (which are shared by all tablets of tablet server) can be changed from
-their defaults by setting the following properties:</p>
+<h2 id="secure-authorizations-handling">Secure Authorizations Handling</h2>
 
-<ul>
-  <li><a href="/docs/2.x/configuration/server-properties#tserver_cache_data_size">tserver.cache.data.size</a></li>
-  <li><a href="/docs/2.x/configuration/server-properties#tserver_cache_index_size">tserver.cache.index.size</a></li>
-</ul>
+<p>For applications serving many users, it is not expected that an Accumulo user
+will be created for each application user. In this case an Accumulo user with
+all authorizations needed by any of the applications users must be created. To
+service queries, the application should create a scanner with the application
+user’s authorizations. These authorizations could be obtained from a trusted 3rd
+party.</p>
+
+<p>Often production systems will integrate with Public-Key Infrastructure (PKI) and
+designate client code within the query layer to negotiate with PKI servers in order
+to authenticate users and retrieve their authorization tokens (credentials). This
+requires users to specify only the information necessary to authenticate themselves
+to the system. Once user identity is established, their credentials can be accessed by
+the client code and passed to Accumulo outside of the reach of the user.</p>
 
 
 
     <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/administration/caching.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/security/overview.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/security/ssl.html b/docs/2.x/security/wire-encryption.html
similarity index 97%
rename from docs/2.x/security/ssl.html
rename to docs/2.x/security/wire-encryption.html
index 9ae550d..539ecb4 100644
--- a/docs/2.x/security/ssl.html
+++ b/docs/2.x/security/wire-encryption.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 - SSL</title>
+<title>Accumulo Documentation - Wire Encryption</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>
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
@@ -410,14 +412,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Security &nbsp;&gt;&gt;&nbsp; SSL</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Security &nbsp;&gt;&gt;&nbsp; Wire Encryption</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>SSL</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/security/ssl.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-10"><h1>Wire Encryption</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/security/wire-encryption.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <p>Accumulo, through Thrift’s TSSLTransport, provides the ability to encrypt
@@ -545,7 +547,7 @@ methods are equivalent whether the certificate is generate for an Accumulo serve
 
     <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/security/ssl.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/security/wire-encryption.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/troubleshooting/advanced.html b/docs/2.x/troubleshooting/advanced.html
index 623383d..b21bbe0 100644
--- a/docs/2.x/troubleshooting/advanced.html
+++ b/docs/2.x/troubleshooting/advanced.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/troubleshooting/basic.html b/docs/2.x/troubleshooting/basic.html
index 8399f2a..0cfb5d3 100644
--- a/docs/2.x/troubleshooting/basic.html
+++ b/docs/2.x/troubleshooting/basic.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/troubleshooting/performance.html b/docs/2.x/troubleshooting/performance.html
index bd7a8a4..ff045da 100644
--- a/docs/2.x/troubleshooting/performance.html
+++ b/docs/2.x/troubleshooting/performance.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</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 c71a4e8..623ce4f 100644
--- a/docs/2.x/troubleshooting/system-metadata-tables.html
+++ b/docs/2.x/troubleshooting/system-metadata-tables.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/troubleshooting/tools.html b/docs/2.x/troubleshooting/tools.html
index 9759037..2e7a82e 100644
--- a/docs/2.x/troubleshooting/tools.html
+++ b/docs/2.x/troubleshooting/tools.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/docs/2.x/troubleshooting/tracing.html b/docs/2.x/troubleshooting/tracing.html
index 593f074..b83bcaa 100644
--- a/docs/2.x/troubleshooting/tracing.html
+++ b/docs/2.x/troubleshooting/tracing.html
@@ -266,13 +266,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/features">Security Features</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/overview">Security Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/labels">Security Labels</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/on-disk-encryption">On Disk Encryption</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/wire-encryption">Wire Encryption</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/security/kerberos">Kerberos</a></div>
                 
               </div>
             </div>
diff --git a/feed.xml b/feed.xml
index b09afb0..2c2b029 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>Mon, 22 Oct 2018 15:39:37 -0400</pubDate>
-    <lastBuildDate>Mon, 22 Oct 2018 15:39:37 -0400</lastBuildDate>
+    <pubDate>Thu, 25 Oct 2018 13:21:34 -0400</pubDate>
+    <lastBuildDate>Thu, 25 Oct 2018 13:21:34 -0400</lastBuildDate>
     <generator>Jekyll v3.7.3</generator>
     
     
diff --git a/images/accumulo-monitor-1.png b/images/accumulo-monitor-1.png
new file mode 100644
index 0000000..ea4c2c1
Binary files /dev/null and b/images/accumulo-monitor-1.png differ
diff --git a/images/accumulo-monitor-2.png b/images/accumulo-monitor-2.png
new file mode 100644
index 0000000..a43e418
Binary files /dev/null and b/images/accumulo-monitor-2.png differ
diff --git a/images/master.png b/images/master.png
deleted file mode 100644
index 0ddd3cc..0000000
Binary files a/images/master.png and /dev/null differ
diff --git a/images/master2.png b/images/master2.png
deleted file mode 100644
index eba6c00..0000000
Binary files a/images/master2.png and /dev/null differ
diff --git a/images/overview2.png b/images/overview2.png
deleted file mode 100644
index f69a07f..0000000
Binary files a/images/overview2.png and /dev/null differ
diff --git a/index.html b/index.html
index 7cbfc8b..fbcfece 100644
--- a/index.html
+++ b/index.html
@@ -165,7 +165,7 @@
       </div>
       <div class="col-md-6">
         <h4>Cell-based access control</h4>
-        <p>Every Accumulo key/value pair has its own <a href="/docs/2.x/security/features#security-label-expressions">security label</a> which limits query results based off user authorizations.</p>
+        <p>Every Accumulo key/value pair has its own <a href="/docs/2.x/security/labels">security label</a> which limits query results based off user authorizations.</p>
       </div>
     </div>
     <div class="row">
diff --git a/redirects.json b/redirects.json
index 87ee136..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/search_data.json b/search_data.json
index 76f21d2..30cc103 100644
--- a/search_data.json
+++ b/search_data.json
@@ -23,7 +23,7 @@
   
     "docs-2-x-administration-monitoring-metrics": {
       "title": "Monitoring &amp; Metrics",
-      "content"	 : "MonitoringAccumulo MonitorThe Accumulo Monitor provides an interface for monitoring the status and health ofAccumulo components. The Accumulo Monitor provides a web UI for accessing this information athttp://_monitorhost_:9995/.Things highlighted in yellow may be in need of attention.If anything is highlighted in red on the monitor page, it is something that definitely needs attention.The Overview page contains some summary information about the Accumulo instance, inc [...]
+      "content"	 : "MonitoringAccumulo MonitorThe Accumulo Monitor provides a web UI with information on the health and status of Accumulo.The monitor can be viewed at:  http://localhost:9995 - if Accumulo is running locally (for development)  http://&amp;lt;MONITOR_HOST&amp;gt;:9995/ - if Accumulo is running on a clusterThe Overview page (shown below) contains some summary information about the Accumulo instance and graphsdisplaying various metrics over time. These include ingest and sc [...]
       "url": " /docs/2.x/administration/monitoring-metrics",
       "categories": "administration"
     },
@@ -142,7 +142,7 @@
   
     "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  [...]
+      "content"	 : "  Table Design and Configuration  Integrity/Availability  Performance  Testing  Client API  Extensible Behaviors  General Administration  Internal Data Management  On-demand Data ManagementTable Design and ConfigurationIteratorsIterators are server-side programming mechanisms that 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.Security labelsAccumulo [...]
       "url": " /docs/2.x/getting-started/features",
       "categories": "getting-started"
     },
@@ -189,31 +189,38 @@
       "categories": ""
     },
   
-    "docs-2-x-security-crypto": {
-      "title": "On Disk Encryption",
-      "content"	 : "For an additional layer of security, Accumulo can encrypt files stored on disk.  On Disk encryption was reworked for 2.0, making it easier to configure and more secure.  The files that can be encrypted include: RFiles and Write Ahead Logs (WALs).For information on encrypting data over the wire see the section on SSL.  For information on cryptographic client-server authentication see the section on Kerberos.ConfigurationTo encrypt all tables on disk, encryption must be [...]
-      "url": " /docs/2.x/security/crypto",
+    "docs-2-x-security-kerberos": {
+      "title": "Kerberos",
+      "content"	 : "OverviewKerberos is a network authentication protocol that provides a secure way forpeers to prove their identity over an unsecure network in a client-server model.A centralized key-distribution center (KDC) is the service that coordinatesauthentication between a client and a server. Clients and servers use “tickets”,obtained from the KDC via a password or a special file called a “keytab”, tocommunicate with the KDC and prove their identity. A KDC administrator mustcr [...]
+      "url": " /docs/2.x/security/kerberos",
       "categories": "security"
     },
   
-    "docs-2-x-security-features": {
-      "title": "Security Features",
-      "content"	 : "Accumulo extends the BigTable data model to implement a security mechanismknown as cell-level security. Every Key-Value pair has its own security label, storedunder the column visibility element of the key, which is used to determine whethera given user meets the security requirements to read the value. This enables data ofvarious security levels to be stored within the same row, and users of varyingdegrees of access to query the same table, while preserving data conf [...]
-      "url": " /docs/2.x/security/features",
+    "docs-2-x-security-labels": {
+      "title": "Security Labels",
+      "content"	 : "Every Key-Value pair in Accumulo has its own security label, stored under the column visibilityelement of the key, which is used to determine whether a given user meets the securityrequirements to read the value. This enables data of various security levels to be storedwithin the same row, and users of varying degrees of access to query the same table, whilepreserving data confidentiality.Security Label ExpressionsWhen mutations are applied, users can specify a securi [...]
+      "url": " /docs/2.x/security/labels",
       "categories": "security"
     },
   
-    "docs-2-x-security-kerberos": {
-      "title": "Kerberos",
-      "content"	 : "OverviewKerberos is a network authentication protocol that provides a secure way forpeers to prove their identity over an unsecure network in a client-server model.A centralized key-distribution center (KDC) is the service that coordinatesauthentication between a client and a server. Clients and servers use “tickets”,obtained from the KDC via a password or a special file called a “keytab”, tocommunicate with the KDC and prove their identity. A KDC administrator mustcr [...]
-      "url": " /docs/2.x/security/kerberos",
+    "docs-2-x-security-on-disk-encryption": {
+      "title": "On Disk Encryption",
+      "content"	 : "For an additional layer of security, Accumulo can encrypt files stored on disk.  On Disk encryption was reworked for 2.0, making it easier to configure and more secure.  The files that can be encrypted include: RFiles and Write Ahead Logs (WALs).ConfigurationTo encrypt all tables on disk, encryption must be enabled before an Accumulo instance is initialized.  If on disk encryption is enabled on an existing cluster, only files created after it is enabled will be encryp [...]
+      "url": " /docs/2.x/security/on-disk-encryption",
+      "categories": "security"
+    },
+  
+    "docs-2-x-security-overview": {
+      "title": "Security Overview",
+      "content"	 : "This page provides an overview of Accumulo’s security features.A few Accumulo security features have on their own documentation page:  Security Labels  On Disk Encryption  Wire Encryption  KerberosPluggable SecurityAccumulo has a pluggable security mechanism. It can be broken into three actions: authentication, authorization, and permission handling.Authentication verifies the identity of a user. In Accumulo, authentication occurs whenthe usingToken&#39; method of the [...]
+      "url": " /docs/2.x/security/overview",
       "categories": "security"
     },
   
-    "docs-2-x-security-ssl": {
-      "title": "SSL",
+    "docs-2-x-security-wire-encryption": {
+      "title": "Wire Encryption",
       "content"	 : "Accumulo, through Thrift’s TSSLTransport, provides the ability to encryptwire communication between Accumulo servers and clients using securesockets layer (SSL). SSL certificates signed by the same certificate authoritycontrol the “circle of trust” in which a secure connection can be established.Typically, each host running Accumulo processes would be given a certificatewhich identifies itself.Clients can optionally also be given a certificate, when client-auth is ena [...]
-      "url": " /docs/2.x/security/ssl",
+      "url": " /docs/2.x/security/wire-encryption",
       "categories": "security"
     },
   


Mime
View raw message