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:5316eb7
Date Thu, 18 Oct 2018 22:40:58 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 f01ac0b  Jekyll build from master:5316eb7
f01ac0b is described below

commit f01ac0bdc0b93cf81b715d2c86bbc78dc89c3ada
Author: Mike Walch <mwalch@apache.org>
AuthorDate: Thu Oct 18 18:40:26 2018 -0400

    Jekyll build from master:5316eb7
    
    Organized sidebar to reduce number of pages in Admin tab (#122)
    
    * Created security tab
    * Moved ssl, kerberos, crypto, and dev/security to security tab
    * Moved tracing to troubleshooting tab
    * Updated links
---
 css/accumulo.css                                   |  4 +-
 docs/2.x/administration/caching.html               | 56 +++++++++++++----
 .../administration/configuration-management.html   | 56 +++++++++++++----
 docs/2.x/administration/fate.html                  | 56 +++++++++++++----
 docs/2.x/administration/in-depth-install.html      | 56 +++++++++++++----
 docs/2.x/administration/monitoring-metrics.html    | 58 ++++++++++++++----
 docs/2.x/administration/multivolume.html           | 56 +++++++++++++----
 docs/2.x/administration/properties.html            | 56 +++++++++++++----
 docs/2.x/administration/replication.html           | 56 +++++++++++++----
 docs/2.x/administration/scan-executors.html        | 56 +++++++++++++----
 docs/2.x/administration/upgrading.html             | 56 +++++++++++++----
 docs/2.x/development/client-properties.html        | 56 +++++++++++++----
 docs/2.x/development/development_tools.html        | 56 +++++++++++++----
 docs/2.x/development/high_speed_ingest.html        | 56 +++++++++++++----
 docs/2.x/development/iterators.html                | 56 +++++++++++++----
 docs/2.x/development/mapreduce.html                | 56 +++++++++++++----
 docs/2.x/development/proxy.html                    | 56 +++++++++++++----
 docs/2.x/development/sampling.html                 | 56 +++++++++++++----
 docs/2.x/development/summaries.html                | 56 +++++++++++++----
 docs/2.x/getting-started/clients.html              | 56 +++++++++++++----
 docs/2.x/getting-started/design.html               | 58 ++++++++++++++----
 docs/2.x/getting-started/features.html             | 56 +++++++++++++----
 docs/2.x/getting-started/glossary.html             | 56 +++++++++++++----
 docs/2.x/getting-started/quick-install.html        | 56 +++++++++++++----
 docs/2.x/getting-started/shell.html                | 56 +++++++++++++----
 docs/2.x/getting-started/table_configuration.html  | 56 +++++++++++++----
 docs/2.x/getting-started/table_design.html         | 56 +++++++++++++----
 docs/2.x/{administration => security}/crypto.html  | 68 ++++++++++++++++-----
 .../security.html => security/features.html}       | 70 ++++++++++++++++------
 .../2.x/{administration => security}/kerberos.html | 66 +++++++++++++++-----
 docs/2.x/{administration => security}/ssl.html     | 66 +++++++++++++++-----
 docs/2.x/troubleshooting/advanced.html             | 56 +++++++++++++----
 docs/2.x/troubleshooting/basic.html                | 56 +++++++++++++----
 docs/2.x/troubleshooting/performance.html          | 56 +++++++++++++----
 .../troubleshooting/system-metadata-tables.html    | 56 +++++++++++++----
 docs/2.x/troubleshooting/tools.html                | 56 +++++++++++++----
 .../tracing.html                                   | 70 ++++++++++++++++------
 feed.xml                                           |  4 +-
 index.html                                         |  2 +-
 search_data.json                                   | 70 +++++++++++-----------
 40 files changed, 1728 insertions(+), 432 deletions(-)

diff --git a/css/accumulo.css b/css/accumulo.css
index 4206bcf..7677ee0 100644
--- a/css/accumulo.css
+++ b/css/accumulo.css
@@ -376,8 +376,8 @@ footer > p {
   height: 70px; }
 
 .doc-sidebar-link {
-  font-size: 14px;
-  margin-bottom: 10px;
+  font-size: 13px;
+  margin-bottom: 5px;
   margin-left: 0px; }
 
 .header-link {
diff --git a/docs/2.x/administration/caching.html b/docs/2.x/administration/caching.html
index 8a7ea77..57fe091 100644
--- a/docs/2.x/administration/caching.html
+++ b/docs/2.x/administration/caching.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/administration/configuration-management.html b/docs/2.x/administration/configuration-management.html
index a5cc7cc..587689f 100644
--- a/docs/2.x/administration/configuration-management.html
+++ b/docs/2.x/administration/configuration-management.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/administration/fate.html b/docs/2.x/administration/fate.html
index 08f4274..d6b92e9 100644
--- a/docs/2.x/administration/fate.html
+++ b/docs/2.x/administration/fate.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</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 b7e237a..1ae7a38 100644
--- a/docs/2.x/administration/in-depth-install.html
+++ b/docs/2.x/administration/in-depth-install.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/administration/monitoring-metrics.html b/docs/2.x/administration/monitoring-metrics.html
index 94739eb..52fb007 100644
--- a/docs/2.x/administration/monitoring-metrics.html
+++ b/docs/2.x/administration/monitoring-metrics.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
@@ -370,7 +406,7 @@ The Overall Avg metric is only used on the Server Activity page, and represents
 Similarly, the Overall Max metric picks the metric with the maximum normalized value.</p>
 
 <p>The Garbage Collector page displays a list of garbage collection cycles, the number of files found of each type (including deletion candidates in use and files actually deleted), and the length of the deletion cycle.
-The Traces page displays data for recent traces performed (see the following section for information on <a href="/docs/2.x/administration/tracing">tracing</a>).
+The Traces page displays data for recent traces performed (see the following section for information on <a href="/docs/2.x/troubleshooting/tracing">tracing</a>).
 The Recent Logs page displays warning and error logs forwarded to the monitor from all Accumulo processes.
 Also, the XML and JSON links provide metrics in XML and JSON formats, respectively.</p>
 
diff --git a/docs/2.x/administration/multivolume.html b/docs/2.x/administration/multivolume.html
index e79c020..839fd4e 100644
--- a/docs/2.x/administration/multivolume.html
+++ b/docs/2.x/administration/multivolume.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/administration/properties.html b/docs/2.x/administration/properties.html
index d9ffc7a..fe13be4 100644
--- a/docs/2.x/administration/properties.html
+++ b/docs/2.x/administration/properties.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/administration/replication.html b/docs/2.x/administration/replication.html
index c714d82..1f9a1ab 100644
--- a/docs/2.x/administration/replication.html
+++ b/docs/2.x/administration/replication.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/administration/scan-executors.html b/docs/2.x/administration/scan-executors.html
index 80da214..8b6ac79 100644
--- a/docs/2.x/administration/scan-executors.html
+++ b/docs/2.x/administration/scan-executors.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/administration/upgrading.html b/docs/2.x/administration/upgrading.html
index 3b2a293..5ea6833 100644
--- a/docs/2.x/administration/upgrading.html
+++ b/docs/2.x/administration/upgrading.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/development/client-properties.html b/docs/2.x/development/client-properties.html
index 949095d..c94a4fc 100644
--- a/docs/2.x/development/client-properties.html
+++ b/docs/2.x/development/client-properties.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/development/development_tools.html b/docs/2.x/development/development_tools.html
index 3d15c26..84e28e5 100644
--- a/docs/2.x/development/development_tools.html
+++ b/docs/2.x/development/development_tools.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</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 0ab4a56..a8190d3 100644
--- a/docs/2.x/development/high_speed_ingest.html
+++ b/docs/2.x/development/high_speed_ingest.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/development/iterators.html b/docs/2.x/development/iterators.html
index 6ebc852..4bb6fce 100644
--- a/docs/2.x/development/iterators.html
+++ b/docs/2.x/development/iterators.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/development/mapreduce.html b/docs/2.x/development/mapreduce.html
index ec2dfa6..e7d49cc 100644
--- a/docs/2.x/development/mapreduce.html
+++ b/docs/2.x/development/mapreduce.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/development/proxy.html b/docs/2.x/development/proxy.html
index 5a99e79..a64bb31 100644
--- a/docs/2.x/development/proxy.html
+++ b/docs/2.x/development/proxy.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/development/sampling.html b/docs/2.x/development/sampling.html
index cb316a8..638bb6b 100644
--- a/docs/2.x/development/sampling.html
+++ b/docs/2.x/development/sampling.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/development/summaries.html b/docs/2.x/development/summaries.html
index 239b59f..bcb83a5 100644
--- a/docs/2.x/development/summaries.html
+++ b/docs/2.x/development/summaries.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/getting-started/clients.html b/docs/2.x/getting-started/clients.html
index dfa37ad..e9cf359 100644
--- a/docs/2.x/getting-started/clients.html
+++ b/docs/2.x/getting-started/clients.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/getting-started/design.html b/docs/2.x/getting-started/design.html
index 49f4029..0bb8c32 100644
--- a/docs/2.x/getting-started/design.html
+++ b/docs/2.x/getting-started/design.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
@@ -412,7 +448,7 @@ and the others will become backups if the master should fail.</p>
 <p>The Accumulo Tracer process supports the distributed timing API provided by Accumulo.
 One to many of these processes can be run on a cluster which will write the timing
 information to a given Accumulo table for future reference. See the
-<a href="/docs/2.x/administration/tracing">tracing documentation</a> for more information.</p>
+<a href="/docs/2.x/troubleshooting/tracing">tracing documentation</a> for more information.</p>
 
 <h3 id="monitor">Monitor</h3>
 
diff --git a/docs/2.x/getting-started/features.html b/docs/2.x/getting-started/features.html
index 8f6a842..3a33684 100644
--- a/docs/2.x/getting-started/features.html
+++ b/docs/2.x/getting-started/features.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/getting-started/glossary.html b/docs/2.x/getting-started/glossary.html
index 809e797..d8427ba 100644
--- a/docs/2.x/getting-started/glossary.html
+++ b/docs/2.x/getting-started/glossary.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</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 0064942..7d253ec 100644
--- a/docs/2.x/getting-started/quick-install.html
+++ b/docs/2.x/getting-started/quick-install.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/getting-started/shell.html b/docs/2.x/getting-started/shell.html
index a73453f..dd8a315 100644
--- a/docs/2.x/getting-started/shell.html
+++ b/docs/2.x/getting-started/shell.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</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 fa5f13b..8452b4c 100644
--- a/docs/2.x/getting-started/table_configuration.html
+++ b/docs/2.x/getting-started/table_configuration.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</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 53380d7..bb781b7 100644
--- a/docs/2.x/getting-started/table_design.html
+++ b/docs/2.x/getting-started/table_design.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/administration/crypto.html b/docs/2.x/security/crypto.html
similarity index 93%
rename from docs/2.x/administration/crypto.html
rename to docs/2.x/security/crypto.html
index af2e9de..d1a1f51 100644
--- a/docs/2.x/administration/crypto.html
+++ b/docs/2.x/security/crypto.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,17 +238,55 @@
         
           
         
+          
+        
       
         
           
+        
+          
+        
+          
+        
+          
+        
+          
             <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="#collapsesecurity" aria-expanded="true" aria-controls="collapsesecurity">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+      
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
                   Administration
                 </a>
               </h4>
             </div>
-            <div id="collapseadministration" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
+            <div id="collapseadministration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
               <div class="panel-body">
                 
                 
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
@@ -334,19 +370,19 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; On Disk Encryption</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Security &nbsp;&gt;&gt;&nbsp; On Disk 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>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/administration/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/crypto.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/administration/ssl">SSL</a>.  For information on cryptographic client-server authentication see the section on <a href="/docs/2.x/administration/kerberos">Kerberos</a>.</p>
+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>
 
 <h2 id="configuration">Configuration</h2>
 
@@ -441,7 +477,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/administration/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/crypto.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/development/security.html b/docs/2.x/security/features.html
similarity index 94%
rename from docs/2.x/development/security.html
rename to docs/2.x/security/features.html
index dcec804..71c7624 100644
--- a/docs/2.x/development/security.html
+++ b/docs/2.x/security/features.html
@@ -25,7 +25,7 @@
 <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs/jq-2.2.3/dt-1.10.12/datatables.min.css">
 <link href="/css/accumulo.css" rel="stylesheet" type="text/css">
 
-<title>Accumulo Documentation - Security</title>
+<title>Accumulo Documentation - Security Features</title>
 
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -201,12 +203,12 @@
           
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
-                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="true" aria-controls="collapsedevelopment">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
                   Development
                 </a>
               </h4>
             </div>
-            <div id="collapsedevelopment" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
+            <div id="collapsedevelopment" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
               <div class="panel-body">
                 
                 
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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="true" aria-controls="collapsesecurity">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
@@ -334,14 +370,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Development &nbsp;&gt;&gt;&nbsp; Security</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Security &nbsp;&gt;&gt;&nbsp; Security Features</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
-      <div class="col-md-10"><h1>Security</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/development/security.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <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>
 
     <p>Accumulo extends the BigTable data model to implement a security mechanism
@@ -513,7 +549,7 @@ Authorizations mechanism.</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/development/security.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/features.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/kerberos.html b/docs/2.x/security/kerberos.html
similarity index 97%
rename from docs/2.x/administration/kerberos.html
rename to docs/2.x/security/kerberos.html
index c343a3b..857357a 100644
--- a/docs/2.x/administration/kerberos.html
+++ b/docs/2.x/security/kerberos.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,17 +238,55 @@
         
           
         
+          
+        
       
         
           
+        
+          
+        
+          
+        
+          
+        
+          
             <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="#collapsesecurity" aria-expanded="true" aria-controls="collapsesecurity">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+      
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
                   Administration
                 </a>
               </h4>
             </div>
-            <div id="collapseadministration" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
+            <div id="collapseadministration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
               <div class="panel-body">
                 
                 
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
@@ -334,14 +370,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Kerberos</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Security &nbsp;&gt;&gt;&nbsp; Kerberos</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>Kerberos</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/kerberos.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/kerberos.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <h2 id="overview">Overview</h2>
@@ -955,7 +991,7 @@ when I attempt to use the “Recent Traces” page on the Monitor UI I get a sta
 
     <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/kerberos.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/kerberos.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/ssl.html b/docs/2.x/security/ssl.html
similarity index 93%
rename from docs/2.x/administration/ssl.html
rename to docs/2.x/security/ssl.html
index 31996a5..79784dd 100644
--- a/docs/2.x/administration/ssl.html
+++ b/docs/2.x/security/ssl.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,17 +238,55 @@
         
           
         
+          
+        
       
         
           
+        
+          
+        
+          
+        
+          
+        
+          
             <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="#collapsesecurity" aria-expanded="true" aria-controls="collapsesecurity">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+      
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
                   Administration
                 </a>
               </h4>
             </div>
-            <div id="collapseadministration" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
+            <div id="collapseadministration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
               <div class="panel-body">
                 
                 
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
@@ -334,14 +370,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; SSL</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Security &nbsp;&gt;&gt;&nbsp; SSL</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/administration/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" 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>
 
     <p>Accumulo, through Thrift’s TSSLTransport, provides the ability to encrypt
@@ -469,7 +505,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/administration/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/ssl.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 9ce1bd8..1bf9f7b 100644
--- a/docs/2.x/troubleshooting/advanced.html
+++ b/docs/2.x/troubleshooting/advanced.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="true" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/troubleshooting/basic.html b/docs/2.x/troubleshooting/basic.html
index a5b6177..5035515 100644
--- a/docs/2.x/troubleshooting/basic.html
+++ b/docs/2.x/troubleshooting/basic.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="true" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/troubleshooting/performance.html b/docs/2.x/troubleshooting/performance.html
index 2942e23..cc93a0d 100644
--- a/docs/2.x/troubleshooting/performance.html
+++ b/docs/2.x/troubleshooting/performance.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="true" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</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 ff119cb..7f99cf1 100644
--- a/docs/2.x/troubleshooting/system-metadata-tables.html
+++ b/docs/2.x/troubleshooting/system-metadata-tables.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="true" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/troubleshooting/tools.html b/docs/2.x/troubleshooting/tools.html
index 491fa53..20203e3 100644
--- a/docs/2.x/troubleshooting/tools.html
+++ b/docs/2.x/troubleshooting/tools.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,6 +238,44 @@
         
           
         
+          
+        
+      
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+            <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">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
       
         
           
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,6 +335,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="true" aria-controls="collapsetroubleshooting">
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.x/administration/tracing.html b/docs/2.x/troubleshooting/tracing.html
similarity index 95%
rename from docs/2.x/administration/tracing.html
rename to docs/2.x/troubleshooting/tracing.html
index 2511aba..f63b6a6 100644
--- a/docs/2.x/administration/tracing.html
+++ b/docs/2.x/troubleshooting/tracing.html
@@ -194,6 +194,8 @@
         
           
         
+          
+        
       
         
           
@@ -222,8 +224,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
@@ -238,17 +238,55 @@
         
           
         
+          
+        
       
         
           
+        
+          
+        
+          
+        
+          
+        
+          
             <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="#collapsesecurity" aria-expanded="false" aria-controls="collapsesecurity">
+                  Security
+                </a>
+              </h4>
+            </div>
+            <div id="collapsesecurity" class="panel-collapse collapse" 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/crypto">On Disk Encryption</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/ssl">SSL</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+      
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
                   Administration
                 </a>
               </h4>
             </div>
-            <div id="collapseadministration" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
+            <div id="collapseadministration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
               <div class="panel-body">
                 
                 
@@ -260,16 +298,10 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
@@ -278,8 +310,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
-                
               </div>
             </div>
           
@@ -292,6 +322,8 @@
         
           
         
+          
+        
       
         
           
@@ -303,14 +335,16 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
-                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="false" aria-controls="collapsetroubleshooting">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsetroubleshooting" aria-expanded="true" aria-controls="collapsetroubleshooting">
                   Troubleshooting
                 </a>
               </h4>
             </div>
-            <div id="collapsetroubleshooting" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+            <div id="collapsetroubleshooting" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
               <div class="panel-body">
                 
                 
@@ -324,6 +358,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tracing">Tracing</a></div>
+                
               </div>
             </div>
           
@@ -334,14 +370,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Tracing</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Troubleshooting &nbsp;&gt;&gt;&nbsp; Tracing</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>Tracing</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/tracing.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/troubleshooting/tracing.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <p>It can be difficult to determine why some operations are taking longer
@@ -690,7 +726,7 @@ Time  Start  Service@Location       Name
 
     <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/tracing.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/troubleshooting/tracing.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/feed.xml b/feed.xml
index d238aa9..b0da6a7 100644
--- a/feed.xml
+++ b/feed.xml
@@ -6,8 +6,8 @@
 </description>
     <link>https://accumulo.apache.org/</link>
     <atom:link href="https://accumulo.apache.org/feed.xml" rel="self" type="application/rss+xml"/>
-    <pubDate>Thu, 18 Oct 2018 16:58:20 -0400</pubDate>
-    <lastBuildDate>Thu, 18 Oct 2018 16:58:20 -0400</lastBuildDate>
+    <pubDate>Thu, 18 Oct 2018 18:40:16 -0400</pubDate>
+    <lastBuildDate>Thu, 18 Oct 2018 18:40:16 -0400</lastBuildDate>
     <generator>Jekyll v3.7.3</generator>
     
     
diff --git a/index.html b/index.html
index b2c1ff7..7cbfc8b 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/development/security#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/features#security-label-expressions">security label</a> which limits query results based off user authorizations.</p>
       </div>
     </div>
     <div class="row">
diff --git a/search_data.json b/search_data.json
index 783fa4b..44f5b70 100644
--- a/search_data.json
+++ b/search_data.json
@@ -14,13 +14,6 @@
       "categories": "administration"
     },
   
-    "docs-2-x-administration-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/administration/crypto",
-      "categories": "administration"
-    },
-  
     "docs-2-x-administration-fate": {
       "title": "FATE",
       "content"	 : "Accumulo must implement a number of distributed, multi-step operations to supportthe client API. Creating a new table is a simple example of an atomic client callwhich requires multiple steps in the implementation: get a unique table ID, configuredefault table permissions, populate information in ZooKeeper to record the table’sexistence, create directories in HDFS for the table’s data, etc. Implementing thesesteps in a way that is tolerant to node failure and other co [...]
@@ -35,13 +28,6 @@
       "categories": "administration"
     },
   
-    "docs-2-x-administration-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/administration/kerberos",
-      "categories": "administration"
-    },
-  
     "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 [...]
@@ -77,20 +63,6 @@
       "categories": "administration"
     },
   
-    "docs-2-x-administration-ssl": {
-      "title": "SSL",
-      "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/administration/ssl",
-      "categories": "administration"
-    },
-  
-    "docs-2-x-administration-tracing": {
-      "title": "Tracing",
-      "content"	 : "It can be difficult to determine why some operations are taking longerthan expected. For example, you may be looking up items with very lowlatency, but sometimes the lookups take much longer. Determining thecause of the delay is difficult because the system is distributed, andthe typical lookup is fast.Accumulo has been instrumented to record the time that variousoperations take when tracing is turned on. The fact that tracing isenabled follows all the requests made o [...]
-      "url": " /docs/2.x/administration/tracing",
-      "categories": "administration"
-    },
-  
     "docs-2-x-administration-upgrading": {
       "title": "Upgrading Accumulo",
       "content"	 : "Upgrading from 1.7 to 1.8Upgrades from 1.7 to 1.8 are possible with little effort as no changes were made at the data layer and RPC changes were made in a backwards-compatible way. The recommended way is to stop Accumulo 1.7, perform the Accumulo upgrade to 1.8, and then start 1.8. Like previous versions, after 1.8 is started on a 1.7 instance, a one-time upgrade will happen by the Master which will prevent a downgrade back to 1.7. Upgrades are still one way. Upgrades [...]
@@ -147,13 +119,6 @@
       "categories": "development"
     },
   
-    "docs-2-x-development-security": {
-      "title": "Security",
-      "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/development/security",
-      "categories": "development"
-    },
-  
     "docs-2-x-development-summaries": {
       "title": "Summary Statistics",
       "content"	 : "OverviewAccumulo has the ability to generate summary statistics about data in a tableusing user defined functions.  Currently these statistics are only generated fordata written to files.  Data recently written to Accumulo that is still inmemory will not contribute to summary statistics.This feature can be used to inform a user about what data is in their table.Summary statistics can also be used by compaction strategies to make decisionsabout which files to compact.S [...]
@@ -224,6 +189,34 @@
       "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",
+      "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",
+      "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",
+      "categories": "security"
+    },
+  
+    "docs-2-x-security-ssl": {
+      "title": "SSL",
+      "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",
+      "categories": "security"
+    },
+  
     "docs-2-x-troubleshooting-advanced": {
       "title": "Advanced Troubleshooting",
       "content"	 : "Tablet server locksMy tablet server lost its lock.  Why?The primary reason a tablet server loses its lock is that it has been pushed into swap.A large java program (like the tablet server) may have a large portionof its memory image unused.  The operation system will favor pushingthis allocated, but unused memory into swap so that the memory can bere-used as a disk buffer.  When the java virtual machine decides toaccess this memory, the OS will begin flushing disk buf [...]
@@ -259,6 +252,13 @@
       "categories": "troubleshooting"
     },
   
+    "docs-2-x-troubleshooting-tracing": {
+      "title": "Tracing",
+      "content"	 : "It can be difficult to determine why some operations are taking longerthan expected. For example, you may be looking up items with very lowlatency, but sometimes the lookups take much longer. Determining thecause of the delay is difficult because the system is distributed, andthe typical lookup is fast.Accumulo has been instrumented to record the time that variousoperations take when tracing is turned on. The fact that tracing isenabled follows all the requests made o [...]
+      "url": " /docs/2.x/troubleshooting/tracing",
+      "categories": "troubleshooting"
+    },
+  
   
     "release-accumulo-2-0-0-alpha-1": {
       "title": "Apache Accumulo 2.0.0-alpha-1",


Mime
View raw message