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:1cd420c
Date Mon, 22 Oct 2018 17:30:47 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 05d4c93  Jekyll build from master:1cd420c
05d4c93 is described below

commit 05d4c93c5f006c5fd1e2b3bf57c152d8bd1b7726
Author: Mike Walch <mwalch@apache.org>
AuthorDate: Mon Oct 22 13:29:42 2018 -0400

    Jekyll build from master:1cd420c
    
    Created configuration section in docs (#123)
    
    * Move overview, server & client properties files
---
 contributor/making-release.html                    |   8 +-
 docs/2.x/administration/caching.html               |  62 +++++++++---
 docs/2.x/administration/fate.html                  |  52 ++++++++--
 docs/2.x/administration/in-depth-install.html      | 108 ++++++++++++++-------
 docs/2.x/administration/monitoring-metrics.html    |  66 ++++++++++---
 docs/2.x/administration/multivolume.html           |  56 +++++++++--
 docs/2.x/administration/replication.html           |  80 +++++++++++----
 docs/2.x/administration/scan-executors.html        |  56 +++++++++--
 docs/2.x/administration/upgrading.html             |  52 ++++++++--
 .../client-properties.html                         |  62 +++++++++---
 .../overview.html}                                 |  88 ++++++++++++-----
 .../server-properties.html}                        |  76 ++++++++++++---
 docs/2.x/development/development_tools.html        |  52 ++++++++--
 docs/2.x/development/high_speed_ingest.html        |  52 ++++++++--
 docs/2.x/development/iterators.html                |  52 ++++++++--
 docs/2.x/development/mapreduce.html                |  52 ++++++++--
 docs/2.x/development/proxy.html                    |  52 ++++++++--
 docs/2.x/development/sampling.html                 |  52 ++++++++--
 docs/2.x/development/summaries.html                |  64 +++++++++---
 docs/2.x/getting-started/clients.html              |  66 ++++++++++---
 docs/2.x/getting-started/design.html               |  52 ++++++++--
 docs/2.x/getting-started/features.html             |  52 ++++++++--
 docs/2.x/getting-started/glossary.html             |  52 ++++++++--
 docs/2.x/getting-started/quick-install.html        |  68 ++++++++++---
 docs/2.x/getting-started/shell.html                |  52 ++++++++--
 docs/2.x/getting-started/table_configuration.html  |  70 ++++++++++---
 docs/2.x/getting-started/table_design.html         |  52 ++++++++--
 docs/2.x/security/crypto.html                      |  56 +++++++++--
 docs/2.x/security/features.html                    |  52 ++++++++--
 docs/2.x/security/kerberos.html                    |  58 +++++++++--
 docs/2.x/security/ssl.html                         |  74 ++++++++++----
 docs/2.x/troubleshooting/advanced.html             |  52 ++++++++--
 docs/2.x/troubleshooting/basic.html                |  52 ++++++++--
 docs/2.x/troubleshooting/performance.html          |  58 +++++++++--
 .../troubleshooting/system-metadata-tables.html    |  52 ++++++++--
 docs/2.x/troubleshooting/tools.html                |  52 ++++++++--
 docs/2.x/troubleshooting/tracing.html              |  72 +++++++++++---
 feed.xml                                           |   4 +-
 redirects.json                                     |   2 +-
 search_data.json                                   |  38 ++++----
 40 files changed, 1836 insertions(+), 392 deletions(-)

diff --git a/contributor/making-release.html b/contributor/making-release.html
index 89fdfdf..ed881d4 100644
--- a/contributor/making-release.html
+++ b/contributor/making-release.html
@@ -287,9 +287,9 @@ for two markdown files that should be changed in the Accumulo repo and copied/mi
 </code></pre></div>    </div>
   </li>
   <li>
-    <p><code class="highlighter-rouge">properties.md</code> and <code class="highlighter-rouge">client-properties.md</code> should be copied after it is generated by the Accumulo build.</p>
+    <p><code class="highlighter-rouge">server-properties.md</code> and <code class="highlighter-rouge">client-properties.md</code> should be copied after it is generated by the Accumulo build.</p>
 
-    <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> cp /path/to/accumulo/core/target/generated-docs/{,client-}properties.md /path/to/accumulo-website/_docs-2-x/administration/properties.md
+    <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> cp /path/to/accumulo/core/target/generated-docs/*-properties.md /path/to/accumulo-website/_docs-2-x/configuration/
 </code></pre></div>    </div>
   </li>
 </ol>
@@ -316,13 +316,13 @@ the directory name:</p>
 releases.</p>
   </li>
   <li>
-    <p>Copy <code class="highlighter-rouge">properties.md</code> and <code class="highlighter-rouge">client-properties.md</code>, and mirror <code class="highlighter-rouge">INSTALL.md</code>.</p>
+    <p>Copy <code class="highlighter-rouge">server-properties.md</code> and <code class="highlighter-rouge">client-properties.md</code>, and mirror <code class="highlighter-rouge">INSTALL.md</code>.</p>
   </li>
 </ol>
 
 <p>Once a collection is created for a major release, developers can make documentation updates like normal website updates.</p>
 
-<p><strong>For 2.x minor &amp; bugfix releases,</strong> copy <code class="highlighter-rouge">properties.md</code> and <code class="highlighter-rouge">client-properties.md</code>, and mirror <code class="highlighter-rouge">INSTALL.md</code>.</p>
+<p><strong>For 2.x minor &amp; bugfix releases,</strong> copy <code class="highlighter-rouge">server-properties.md</code> and <code class="highlighter-rouge">client-properties.md</code>, and mirror <code class="highlighter-rouge">INSTALL.md</code>.</p>
 
 <p><strong>For 1.x minor &amp; bugfix releases,</strong> copy <code class="highlighter-rouge">accumulo_user_manual.html</code> generated for release to the <code class="highlighter-rouge">1.x/</code> directory in the <a href="https://github.com/apache/accumulo-website">accumulo-website repo</a>.</p>
 
diff --git a/docs/2.x/administration/caching.html b/docs/2.x/administration/caching.html
index 57fe091..724de50 100644
--- a/docs/2.x/administration/caching.html
+++ b/docs/2.x/administration/caching.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="true" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
@@ -399,12 +439,12 @@ for tables where read performance is critical.</p>
 <p>The index and data block caches are configured for tables by the following properties:</p>
 
 <ul>
-  <li><a href="/docs/2.x/administration/properties#table_cache_block_enable">table.cache.block.enable</a> - enables data block cache on the table (default is <code class="highlighter-rouge">false</code>)</li>
-  <li><a href="/docs/2.x/administration/properties#table_cache_index_enable">table.cache.index.enable</a> - enables index block cache on the table (default is <code class="highlighter-rouge">true</code>)</li>
+  <li><a href="/docs/2.x/configuration/server-properties#table_cache_block_enable">table.cache.block.enable</a> - enables data block cache on the table (default is <code class="highlighter-rouge">false</code>)</li>
+  <li><a href="/docs/2.x/configuration/server-properties#table_cache_index_enable">table.cache.index.enable</a> - enables index block cache on the table (default is <code class="highlighter-rouge">true</code>)</li>
 </ul>
 
 <p>While the index block cache is enabled by default for all Accumulo tables, users must enable the data block cache by
-setting <a href="/docs/2.x/administration/properties#table_cache_block_enable">table.cache.block.enable</a> to <code class="highlighter-rouge">true</code> in the shell:</p>
+setting <a href="/docs/2.x/configuration/server-properties#table_cache_block_enable">table.cache.block.enable</a> to <code class="highlighter-rouge">true</code> in the shell:</p>
 
 <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>config -t mytable -s table.cache.block.enable=true
 </code></pre></div></div>
@@ -418,8 +458,8 @@ setting <a href="/docs/2.x/administration/properties#table_cache_block_enable">t
 their defaults by setting the following properties:</p>
 
 <ul>
-  <li><a href="/docs/2.x/administration/properties#tserver_cache_data_size">tserver.cache.data.size</a></li>
-  <li><a href="/docs/2.x/administration/properties#tserver_cache_index_size">tserver.cache.index.size</a></li>
+  <li><a href="/docs/2.x/configuration/server-properties#tserver_cache_data_size">tserver.cache.data.size</a></li>
+  <li><a href="/docs/2.x/configuration/server-properties#tserver_cache_index_size">tserver.cache.index.size</a></li>
 </ul>
 
 
diff --git a/docs/2.x/administration/fate.html b/docs/2.x/administration/fate.html
index d6b92e9..f96f291 100644
--- a/docs/2.x/administration/fate.html
+++ b/docs/2.x/administration/fate.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="true" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
diff --git a/docs/2.x/administration/in-depth-install.html b/docs/2.x/administration/in-depth-install.html
index 1ae7a38..f7aa2dc 100644
--- a/docs/2.x/administration/in-depth-install.html
+++ b/docs/2.x/administration/in-depth-install.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="true" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
@@ -427,32 +467,32 @@ their value in accumulo.properties.</p>
     <tr>
       <td>4560</td>
       <td>Accumulo monitor (for centralized log display)</td>
-      <td><a href="/docs/2.x/administration/properties#monitor_port_log4j">monitor.port.log4j</a></td>
+      <td><a href="/docs/2.x/configuration/server-properties#monitor_port_log4j">monitor.port.log4j</a></td>
     </tr>
     <tr>
       <td>9995</td>
       <td>Accumulo HTTP monitor</td>
-      <td><a href="/docs/2.x/administration/properties#monitor_port_client">monitor.port.client</a></td>
+      <td><a href="/docs/2.x/configuration/server-properties#monitor_port_client">monitor.port.client</a></td>
     </tr>
     <tr>
       <td>9997</td>
       <td>Tablet Server</td>
-      <td><a href="/docs/2.x/administration/properties#tserver_port_client">tserver.port.client</a></td>
+      <td><a href="/docs/2.x/configuration/server-properties#tserver_port_client">tserver.port.client</a></td>
     </tr>
     <tr>
       <td>9998</td>
       <td>Accumulo GC</td>
-      <td><a href="/docs/2.x/administration/properties#gc_port_client">gc.port.client</a></td>
+      <td><a href="/docs/2.x/configuration/server-properties#gc_port_client">gc.port.client</a></td>
     </tr>
     <tr>
       <td>9999</td>
       <td>Master Server</td>
-      <td><a href="/docs/2.x/administration/properties#master_port_client">master.port.client</a></td>
+      <td><a href="/docs/2.x/configuration/server-properties#master_port_client">master.port.client</a></td>
     </tr>
     <tr>
       <td>12234</td>
       <td>Accumulo Tracer</td>
-      <td><a href="/docs/2.x/administration/properties#trace_port_client">trace.port.client</a></td>
+      <td><a href="/docs/2.x/configuration/server-properties#trace_port_client">trace.port.client</a></td>
     </tr>
     <tr>
       <td>42424</td>
@@ -462,12 +502,12 @@ their value in accumulo.properties.</p>
     <tr>
       <td>10001</td>
       <td>Master Replication service</td>
-      <td><a href="/docs/2.x/administration/properties#master_replication_coordinator_port">master.replication.coordinator.port</a></td>
+      <td><a href="/docs/2.x/configuration/server-properties#master_replication_coordinator_port">master.replication.coordinator.port</a></td>
     </tr>
     <tr>
       <td>10002</td>
       <td>TabletServer Replication service</td>
-      <td><a href="/docs/2.x/administration/properties#replication_receipt_service_port">replication.receipt.service.port</a></td>
+      <td><a href="/docs/2.x/configuration/server-properties#replication_receipt_service_port">replication.receipt.service.port</a></td>
     </tr>
   </tbody>
 </table>
@@ -600,18 +640,18 @@ also locate the native maps shared library by setting <code class="highlighter-r
 <h4 id="native-maps-configuration">Native Maps Configuration</h4>
 
 <p>As mentioned, Accumulo will use the native libraries if they are found in the expected
-location and <a href="/docs/2.x/administration/properties#tserver_memory_maps_native_enabled">tserver.memory.maps.native.enabled</a> is set to <code class="highlighter-rouge">true</code> (which is the default).
+location and <a href="/docs/2.x/configuration/server-properties#tserver_memory_maps_native_enabled">tserver.memory.maps.native.enabled</a> is set to <code class="highlighter-rouge">true</code> (which is the default).
 Using the native maps over JVM Maps nets a noticeable improvement in ingest rates; however,
 certain configuration variables are important to modify when increasing the size of the
 native map.</p>
 
-<p>To adjust the size of the native map, modify the value of <a href="/docs/2.x/administration/properties#tserver_memory_maps_max">tserver.memory.maps.max</a>. When increasing
+<p>To adjust the size of the native map, modify the value of <a href="/docs/2.x/configuration/server-properties#tserver_memory_maps_max">tserver.memory.maps.max</a>. When increasing
 this value, it is also important to adjust the values below:</p>
 
 <ul>
-  <li><a href="/docs/2.x/administration/properties#table_compaction_minor_logs_threshold">table.compaction.minor.logs.threshold</a> - maximum number of write-ahead log files that a tablet can
+  <li><a href="/docs/2.x/configuration/server-properties#table_compaction_minor_logs_threshold">table.compaction.minor.logs.threshold</a> - maximum number of write-ahead log files that a tablet can
 reference before they will be automatically minor compacted</li>
-  <li><a href="/docs/2.x/administration/properties#tserver_walog_max_size">tserver.walog.max.size</a> - maximum size of a write-ahead log.</li>
+  <li><a href="/docs/2.x/configuration/server-properties#tserver_walog_max_size">tserver.walog.max.size</a> - maximum size of a write-ahead log.</li>
 </ul>
 
 <p>The maximum size of the native maps for a server should be less than the product of the write-ahead
@@ -625,8 +665,8 @@ maps can be completely saturated.</p>
 
 <p>Subsequently, when increasing the size of the write-ahead logs, it can also be important
 to increase the HDFS block size that Accumulo uses when creating the files for the write-ahead log.
-This is controlled via <a href="/docs/2.x/administration/properties#tserver_wal_blocksize">tserver.wal.blocksize</a>. A basic recommendation is that when
-<a href="/docs/2.x/administration/properties#tserver_walog_max_size">tserver.walog.max.size</a> is larger than 2GB in size, set <a href="/docs/2.x/administration/properties#tserver_wal_blocksize">tserver.wal.blocksize</a> to 2GB.
+This is controlled via <a href="/docs/2.x/configuration/server-properties#tserver_wal_blocksize">tserver.wal.blocksize</a>. A basic recommendation is that when
+<a href="/docs/2.x/configuration/server-properties#tserver_walog_max_size">tserver.walog.max.size</a> is larger than 2GB in size, set <a href="/docs/2.x/configuration/server-properties#tserver_wal_blocksize">tserver.wal.blocksize</a> to 2GB.
 Increasing the block size to a value larger than 2GB can result in decreased write
 performance to the write-ahead log file which will slow ingest.</p>
 
@@ -649,16 +689,16 @@ of errors.</p>
 <p>Specify appropriate values for the following properties in <code class="highlighter-rouge">accumulo.properties</code>:</p>
 
 <ul>
-  <li><a href="/docs/2.x/administration/properties#instance_zookeeper_host">instance.zookeeper.host</a> - Enables Accumulo to find ZooKeeper. Accumulo uses ZooKeeper
+  <li><a href="/docs/2.x/configuration/server-properties#instance_zookeeper_host">instance.zookeeper.host</a> - Enables Accumulo to find ZooKeeper. Accumulo uses ZooKeeper
 to coordinate settings between processes and helps finalize TabletServer failure.</li>
-  <li><a href="/docs/2.x/administration/properties#instance_secret">instance.secret</a> - The instance needs a secret to enable secure communication between servers.
+  <li><a href="/docs/2.x/configuration/server-properties#instance_secret">instance.secret</a> - The instance needs a secret to enable secure communication between servers.
 Configure your secret and make sure that the <code class="highlighter-rouge">accumulo.properties</code> file is not readable to other users.
-For alternatives to storing the <a href="/docs/2.x/administration/properties#instance_secret">instance.secret</a> in plaintext, please read the
+For alternatives to storing the <a href="/docs/2.x/configuration/server-properties#instance_secret">instance.secret</a> in plaintext, please read the
 <a href="#sensitive-configuration-values">Sensitive Configuration Values</a> section.</li>
 </ul>
 
 <p>Some settings can be modified via the Accumulo shell and take effect immediately, but
-some settings require a process restart to take effect. See the <a href="/docs/2.x/administration/configuration-management">configuration management</a>
+some settings require a process restart to take effect. See the <a href="/docs/2.x/configuration/overview">configuration overview</a>
 documentation for details.</p>
 
 <h3 id="hostnames-in-configuration-files">Hostnames in configuration files</h3>
@@ -687,7 +727,7 @@ where that command is run.</p>
 <h3 id="sensitive-configuration-values">Sensitive Configuration Values</h3>
 
 <p>Accumulo has a number of properties that can be specified via the accumulo.properties
-file which are sensitive in nature, <a href="/docs/2.x/administration/properties#instance_secret">instance.secret</a> and <code class="highlighter-rouge">trace.token.property.password</code>
+file which are sensitive in nature, <a href="/docs/2.x/configuration/server-properties#instance_secret">instance.secret</a> and <code class="highlighter-rouge">trace.token.property.password</code>
 are two common examples. Both of these properties, if compromised, have the ability
 to result in data being leaked to users who should not have access to that data.</p>
 
@@ -698,14 +738,14 @@ is a candidate for use with these CredentialProviders. For version of Hadoop whi
 these classes, the feature will just be unavailable for use.</p>
 
 <p>A comma separated list of CredentialProviders can be configured using the Accumulo Property
-<a href="/docs/2.x/administration/properties#general_security_credential_provider_paths">general.security.credential.provider.paths</a>. Each configured URL will be consulted
+<a href="/docs/2.x/configuration/server-properties#general_security_credential_provider_paths">general.security.credential.provider.paths</a>. Each configured URL will be consulted
 when the Configuration object for accumulo.properties is accessed.</p>
 
 <h3 id="using-a-javakeystorecredentialprovider-for-storage">Using a JavaKeyStoreCredentialProvider for storage</h3>
 
 <p>One of the implementations provided in Hadoop-2.6.0 is a Java KeyStore CredentialProvider.
 Each entry in the KeyStore is the Accumulo Property key name. For example, to store the
-<a href="/docs/2.x/administration/properties#instance_secret">instance.secret</a>, the following command can be used:</p>
+<a href="/docs/2.x/configuration/server-properties#instance_secret">instance.secret</a>, the following command can be used:</p>
 
 <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>hadoop credential create instance.secret --provider jceks://file/etc/accumulo/conf/accumulo.jceks
 </code></pre></div></div>
@@ -720,7 +760,7 @@ Each entry in the KeyStore is the Accumulo Property key name. For example, to st
 <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>general.security.credential.provider.paths=jceks://file/path/to/accumulo/conf/accumulo.jceks
 </code></pre></div></div>
 
-<p>This configuration will then transparently extract the <a href="/docs/2.x/administration/properties#instance_secret">instance.secret</a> from
+<p>This configuration will then transparently extract the <a href="/docs/2.x/configuration/server-properties#instance_secret">instance.secret</a> from
 the configured KeyStore and alleviates a human readable storage of the sensitive
 property.</p>
 
@@ -732,14 +772,14 @@ will expect the KeyStore in the same location.</p>
 
 <p>Accumulo clients are configured in a different way than Accumulo servers. <a href="/docs/2.x/getting-started/clients#creating-an-accumulo-client">Accumulo clients
 are created</a> using Java builder methods or a <code class="highlighter-rouge">accumulo-client.properties</code>
-file containing <a href="/docs/2.x/development/client-properties">client properties</a>.</p>
+file containing <a href="/docs/2.x/configuration/client-properties">client properties</a>.</p>
 
 <h3 id="custom-table-tags">Custom Table Tags</h3>
 
 <p>Accumulo has the ability for users to add custom tags to tables.  This allows
 applications to set application-level metadata about a table.  These tags can be
 anything from a table description, administrator notes, date created, etc.
-This is done by naming and setting a property with a prefix <a href="/docs/2.x/administration/properties#table_custom_prefix">table.custom.*</a>.</p>
+This is done by naming and setting a property with a prefix <a href="/docs/2.x/configuration/server-properties#table_custom_prefix">table.custom.*</a>.</p>
 
 <p>Currently, table properties are stored in ZooKeeper. This means that the number
 and size of custom properties should be restricted on the order of 10’s of properties
@@ -751,14 +791,14 @@ consideration. There is no enforcement of these warnings via the API.</p>
 <h3 id="configuring-the-classloader">Configuring the ClassLoader</h3>
 
 <p>Accumulo builds its Java classpath in <code class="highlighter-rouge">accumulo-env.sh</code>.  After an Accumulo application has started, it will load classes from the locations
-specified in the deprecated <a href="/docs/2.x/administration/properties#general_classpaths">general.classpaths</a> property. Additionally, Accumulo will load classes from the locations specified in the
-<a href="/docs/2.x/administration/properties#general_dynamic_classpaths">general.dynamic.classpaths</a> property and will monitor and reload them if they change. The reloading feature is useful during the development
+specified in the deprecated <a href="/docs/2.x/configuration/server-properties#general_classpaths">general.classpaths</a> property. Additionally, Accumulo will load classes from the locations specified in the
+<a href="/docs/2.x/configuration/server-properties#general_dynamic_classpaths">general.dynamic.classpaths</a> property and will monitor and reload them if they change. The reloading feature is useful during the development
 and testing of iterators as new or modified iterator classes can be deployed to Accumulo without having to restart the database.</p>
 
 <p>Accumulo also has an alternate configuration for the classloader which will allow it to load classes from remote locations. This mechanism
 uses Apache Commons VFS which enables locations such as http and hdfs to be used. This alternate configuration also uses the
-<a href="/docs/2.x/administration/properties#general_classpaths">general.classpaths</a> property in the same manner described above. It differs in that you need to configure the
-<a href="/docs/2.x/administration/properties#general_vfs_classpaths">general.vfs.classpaths</a> property instead of the <a href="/docs/2.x/administration/properties#general_dynamic_classpaths">general.dynamic.classpaths</a> property. As in the default configuration, this alternate
+<a href="/docs/2.x/configuration/server-properties#general_classpaths">general.classpaths</a> property in the same manner described above. It differs in that you need to configure the
+<a href="/docs/2.x/configuration/server-properties#general_vfs_classpaths">general.vfs.classpaths</a> property instead of the <a href="/docs/2.x/configuration/server-properties#general_dynamic_classpaths">general.dynamic.classpaths</a> property. As in the default configuration, this alternate
 configuration will also monitor the vfs locations for changes and reload if necessary.</p>
 
 <p>The Accumulo classpath can be viewed in human readable format by running <code class="highlighter-rouge">accumulo classpath -d</code>.</p>
diff --git a/docs/2.x/administration/monitoring-metrics.html b/docs/2.x/administration/monitoring-metrics.html
index 52fb007..8161a17 100644
--- a/docs/2.x/administration/monitoring-metrics.html
+++ b/docs/2.x/administration/monitoring-metrics.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="true" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
@@ -420,10 +460,10 @@ is strongly recommended that the Monitor is not exposed to any publicly-accessib
 <p>SSL may be enabled for the monitor page by setting the following properties in the <code class="highlighter-rouge">accumulo.properties</code> file:</p>
 
 <ul>
-  <li><a href="/docs/2.x/administration/properties#monitor_ssl_keyStore">monitor.ssl.keyStore</a></li>
-  <li><a href="/docs/2.x/administration/properties#monitor_ssl_keyStorePassword">monitor.ssl.keyStorePassword</a></li>
-  <li><a href="/docs/2.x/administration/properties#monitor_ssl_trustStore">monitor.ssl.trustStore</a></li>
-  <li><a href="/docs/2.x/administration/properties#monitor_ssl_trustStorePassword">monitor.ssl.trustStorePassword</a></li>
+  <li><a href="/docs/2.x/configuration/server-properties#monitor_ssl_keyStore">monitor.ssl.keyStore</a></li>
+  <li><a href="/docs/2.x/configuration/server-properties#monitor_ssl_keyStorePassword">monitor.ssl.keyStorePassword</a></li>
+  <li><a href="/docs/2.x/configuration/server-properties#monitor_ssl_trustStore">monitor.ssl.trustStore</a></li>
+  <li><a href="/docs/2.x/configuration/server-properties#monitor_ssl_trustStorePassword">monitor.ssl.trustStorePassword</a></li>
 </ul>
 
 <p>If the Accumulo conf directory has been configured (in particular the <code class="highlighter-rouge">accumulo-env.sh</code> file must be set up), the 
@@ -434,8 +474,8 @@ Java <code class="highlighter-rouge">keytool</code> command, whose usage can be
 <p>If desired, the SSL ciphers allowed for connections can be controlled via the following properties in <code class="highlighter-rouge">accumulo.properties</code>:</p>
 
 <ul>
-  <li><a href="/docs/2.x/administration/properties#monitor_ssl_include_ciphers">monitor.ssl.include.ciphers</a></li>
-  <li><a href="/docs/2.x/administration/properties#monitor_ssl_exclude_ciphers">monitor.ssl.exclude.ciphers</a></li>
+  <li><a href="/docs/2.x/configuration/server-properties#monitor_ssl_include_ciphers">monitor.ssl.include.ciphers</a></li>
+  <li><a href="/docs/2.x/configuration/server-properties#monitor_ssl_exclude_ciphers">monitor.ssl.exclude.ciphers</a></li>
 </ul>
 
 <p>If SSL is enabled, the monitor URL can only be accessed via https.
@@ -450,7 +490,7 @@ An Accumulo user name and password must be entered for access to the shell.</p>
 <h3 id="legacy-metrics">Legacy Metrics</h3>
 
 <p>Accumulo has a legacy metrics library that can be exposes metrics using JMX endpoints or file-based logging. These metrics can
-be enabled by setting <a href="/docs/2.x/administration/properties#general_legacy_metrics">general.legacy.metrics</a> to <code class="highlighter-rouge">true</code> in <code class="highlighter-rouge">accumulo.properties</code> and placing the <code class="highlighter-rouge">accumulo-metrics.xml</code>
+be enabled by setting <a href="/docs/2.x/configuration/server-properties#general_legacy_metrics">general.legacy.metrics</a> to <code class="highlighter-rouge">true</code> in <code class="highlighter-rouge">accumulo.properties</code> and placing the <code class="highlighter-rouge">accumulo-metrics.xml</code>
 configuration file on the classpath (which is typically done by placing the file in the <code class="highlighter-rouge">conf/</code> directory). A template for
 <code class="highlighter-rouge">accumulo-metrics.xml</code> can be found in <code class="highlighter-rouge">conf/templates</code> of the Accumulo tarball.</p>
 
diff --git a/docs/2.x/administration/multivolume.html b/docs/2.x/administration/multivolume.html
index 839fd4e..3723491 100644
--- a/docs/2.x/administration/multivolume.html
+++ b/docs/2.x/administration/multivolume.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="true" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
@@ -400,7 +440,7 @@ routinely runs in less than a minute, the NameNode is performing well.</p>
 
 <p>However, if you do begin to experience slow-down and poor GC
 performance, Accumulo can be configured to use multiple NameNode
-servers.  The configuration <a href="/docs/2.x/administration/properties#instance_volumes">instance.volumes</a> should be set to a
+servers.  The configuration <a href="/docs/2.x/configuration/server-properties#instance_volumes">instance.volumes</a> should be set to a
 comma-separated list, using full URI references to different NameNode
 servers:</p>
 
@@ -418,7 +458,7 @@ the same way they were before 1.6.</p>
 moved to host2), then Accumulo will no longer function.  Even if Hadoop and
 Accumulo configurations are changed, the fully qualified URIs stored in
 Accumulo will still contain the old URI.  To handle this Accumulo has the
-configuration property <a href="/docs/2.x/administration/properties#instance_volumes_replacements">instance.volumes.replacements</a> for replacing URI stored
+configuration property <a href="/docs/2.x/configuration/server-properties#instance_volumes_replacements">instance.volumes.replacements</a> for replacing URI stored
 in its metadata.  The example configuration below will replace ns1 with nsA and
 ns2 with nsB in Accumulo metadata. For this property to take affect, Accumulo will
 need to be restarted.</p>
diff --git a/docs/2.x/administration/replication.html b/docs/2.x/administration/replication.html
index 1f9a1ab..959a0c5 100644
--- a/docs/2.x/administration/replication.html
+++ b/docs/2.x/administration/replication.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="true" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
@@ -427,7 +467,7 @@ into the following sections.</p>
 
 <p>Each system involved in replication (even the primary) needs a name that uniquely
 identifies it across all peers in the replication graph. This should be considered
-fixed for an instance, and set using <a href="/docs/2.x/administration/properties#replication_name">replication.name</a> in <code class="highlighter-rouge">accumulo.properties</code>.</p>
+fixed for an instance, and set using <a href="/docs/2.x/configuration/server-properties#replication_name">replication.name</a> in <code class="highlighter-rouge">accumulo.properties</code>.</p>
 
 <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code># Unique name for this system used by replication
 replication.name=primary
@@ -501,7 +541,7 @@ Monitor server, using the <code class="highlighter-rouge">Replication</code> lin
 <h2 id="work-assignment">Work Assignment</h2>
 
 <p>Depending on the schema of a table, different implementations of the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/WorkAssigner.html">WorkAssigner</a>
-used could be configured. The implementation is controlled via the property <a href="/docs/2.x/administration/properties#replication_work_assigner">replication.work.assigner</a>
+used could be configured. The implementation is controlled via the property <a href="/docs/2.x/configuration/server-properties#replication_work_assigner">replication.work.assigner</a>
 and the full class name for the implementation. This can be configured via the shell or <code class="highlighter-rouge">accumulo.properties</code>.</p>
 
 <p>Two implementations of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/WorkAssigner.html">WorkAssigner</a> are provided:</p>
@@ -540,7 +580,7 @@ with the Master on the peer to request the address of a TabletServer on the peer
 this TabletServer will use to replicate the data.</p>
 
 <p>The TabletServer on the primary will then replicate data in batches of a configurable
-size (<a href="/docs/2.x/administration/properties#replication_max_unit_size">replication.max.unit.size</a>). The TabletServer on the peer will report how many
+size (<a href="/docs/2.x/configuration/server-properties#replication_max_unit_size">replication.max.unit.size</a>). The TabletServer on the peer will report how many
 records were applied back to the primary, which will be used to record how many records
 were successfully replicated. The TabletServer on the primary will continue to replicate
 data in these batches until no more data can be read from the file.</p>
@@ -551,16 +591,16 @@ data in these batches until no more data can be read from the file.</p>
 the implementation of various components operate.</p>
 
 <ul>
-  <li><a href="/docs/2.x/administration/properties#replication_max_work_queue">replication.max.work.queue</a> - Maximum number of files queued for replication at one time</li>
-  <li><a href="/docs/2.x/administration/properties#replication_work_assignment_sleep">replication.work.assignment.sleep</a> - Time between invocations of the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/WorkAssigner.html">WorkAssigner</a></li>
-  <li><a href="/docs/2.x/administration/properties#replication_worker_threads">replication.worker.threads</a> - Size of threadpool used to replicate data to peers</li>
-  <li><a href="/docs/2.x/administration/properties#replication_receipt_service_port">replication.receipt.service.port</a> - Thrift service port to listen for replication requests, can use ‘0’ for a random port</li>
-  <li><a href="/docs/2.x/administration/properties#replication_work_attempts">replication.work.attempts</a> - Number of attempts to replicate to a peer before aborting the attempt</li>
-  <li><a href="/docs/2.x/administration/properties#replication_receiver_min_threads">replication.receiver.min.threads</a> - Minimum number of idle threads for handling incoming replication</li>
-  <li><a href="/docs/2.x/administration/properties#replication_receiver_threadcheck_time">replication.receiver.threadcheck.time</a> - Time between attempting adjustments of thread pool for incoming replications</li>
-  <li><a href="/docs/2.x/administration/properties#replication_max_unit_size">replication.max.unit.size</a> - Maximum amount of data to be replicated in one RPC</li>
-  <li><a href="/docs/2.x/administration/properties#replication_work_assigner">replication.work.assigner</a> - <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/WorkAssigner.html">WorkAssigner</a> implementation</li>
-  <li><a href="/docs/2.x/administration/properties#tserver_replication_batchwriter_replayer_memory">tserver.replication.batchwriter.replayer.memory</a> - Size of BatchWriter cache to use in applying replication requests</li>
+  <li><a href="/docs/2.x/configuration/server-properties#replication_max_work_queue">replication.max.work.queue</a> - Maximum number of files queued for replication at one time</li>
+  <li><a href="/docs/2.x/configuration/server-properties#replication_work_assignment_sleep">replication.work.assignment.sleep</a> - Time between invocations of the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/WorkAssigner.html">WorkAssigner</a></li>
+  <li><a href="/docs/2.x/configuration/server-properties#replication_worker_threads">replication.worker.threads</a> - Size of threadpool used to replicate data to peers</li>
+  <li><a href="/docs/2.x/configuration/server-properties#replication_receipt_service_port">replication.receipt.service.port</a> - Thrift service port to listen for replication requests, can use ‘0’ for a random port</li>
+  <li><a href="/docs/2.x/configuration/server-properties#replication_work_attempts">replication.work.attempts</a> - Number of attempts to replicate to a peer before aborting the attempt</li>
+  <li><a href="/docs/2.x/configuration/server-properties#replication_receiver_min_threads">replication.receiver.min.threads</a> - Minimum number of idle threads for handling incoming replication</li>
+  <li><a href="/docs/2.x/configuration/server-properties#replication_receiver_threadcheck_time">replication.receiver.threadcheck.time</a> - Time between attempting adjustments of thread pool for incoming replications</li>
+  <li><a href="/docs/2.x/configuration/server-properties#replication_max_unit_size">replication.max.unit.size</a> - Maximum amount of data to be replicated in one RPC</li>
+  <li><a href="/docs/2.x/configuration/server-properties#replication_work_assigner">replication.work.assigner</a> - <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/WorkAssigner.html">WorkAssigner</a> implementation</li>
+  <li><a href="/docs/2.x/configuration/server-properties#tserver_replication_batchwriter_replayer_memory">tserver.replication.batchwriter.replayer.memory</a> - Size of BatchWriter cache to use in applying replication requests</li>
 </ul>
 
 <h2 id="example-practical-configuration">Example Practical Configuration</h2>
@@ -622,7 +662,7 @@ root@peer&gt; tables -l
 
 <h4 id="define-the-peer-as-a-replication-peer-to-the-primary">Define the Peer as a replication peer to the Primary</h4>
 
-<p>We’re defining the instance with <a href="/docs/2.x/administration/properties#replication_name">replication.name</a> of <code class="highlighter-rouge">peer</code> as a peer. We provide the implementation of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/ReplicaSystem.html">ReplicaSystem</a>
+<p>We’re defining the instance with <a href="/docs/2.x/configuration/server-properties#replication_name">replication.name</a> of <code class="highlighter-rouge">peer</code> as a peer. We provide the implementation of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/ReplicaSystem.html">ReplicaSystem</a>
 that we want to use, and the configuration for the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/AccumuloReplicaSystem.html">AccumuloReplicaSystem</a>. In this case, the configuration is the Accumulo
 Instance name for <code class="highlighter-rouge">peer</code> and the ZooKeeper quorum string. The configuration key is of the form
 <code class="highlighter-rouge">replication.peer.$peer_name</code>.</p>
diff --git a/docs/2.x/administration/scan-executors.html b/docs/2.x/administration/scan-executors.html
index 8b6ac79..719553f 100644
--- a/docs/2.x/administration/scan-executors.html
+++ b/docs/2.x/administration/scan-executors.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="true" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
@@ -396,7 +436,7 @@ prioritizer can reorder queued work.</p>
 
 <p>By default, Accumulo sets <code class="highlighter-rouge">tserver.scan.executors.default.threads=16</code> which
 creates the default scan executor.  To configure additional scan executors,
-chose a unique name and configure <a href="/docs/2.x/administration/properties#tserver_scan_executors_prefix">tserver.scan.executors.*</a>.  Setting
+chose a unique name and configure <a href="/docs/2.x/configuration/server-properties#tserver_scan_executors_prefix">tserver.scan.executors.*</a>.  Setting
 the following causes each tablet server to create a scan executor with the
 specified threads.</p>
 
@@ -412,7 +452,7 @@ tserver.scan.executors.&lt;name&gt;.prioritizer=&lt;class name&gt;
 tserver.scan.executors.&lt;name&gt;.prioritizer.opts.&lt;key&gt;=&lt;value&gt;
 </code></pre></div></div>
 
-<p>After creating an executor, configure <a href="/docs/2.x/administration/properties#table_scan_dispatcher">table.scan.dispatcher</a> to use it.  A
+<p>After creating an executor, configure <a href="/docs/2.x/configuration/server-properties#table_scan_dispatcher">table.scan.dispatcher</a> to use it.  A
 dispatcher is Java subclass of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/spi/scan/ScanDispatcher.html">ScanDispatcher</a>
 that decides which scan executor should service a table.  Set the following table
 property to configure a dispatcher.</p>
diff --git a/docs/2.x/administration/upgrading.html b/docs/2.x/administration/upgrading.html
index 5ea6833..b514e30 100644
--- a/docs/2.x/administration/upgrading.html
+++ b/docs/2.x/administration/upgrading.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="true" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
diff --git a/docs/2.x/development/client-properties.html b/docs/2.x/configuration/client-properties.html
similarity index 93%
rename from docs/2.x/development/client-properties.html
rename to docs/2.x/configuration/client-properties.html
index c94a4fc..0aa5c7c 100644
--- a/docs/2.x/development/client-properties.html
+++ b/docs/2.x/configuration/client-properties.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,14 +203,16 @@
           
         
           
+        
+          
             <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">
                 
                 
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="true" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" 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/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
@@ -370,14 +410,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Development &nbsp;&gt;&gt;&nbsp; Client Properties</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Configuration &nbsp;&gt;&gt;&nbsp; Client Properties</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>Client Properties</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/client-properties.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/configuration/client-properties.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <!-- WARNING: Do not edit this file. It is a generated file that is copied from Accumulo build (from core/target/generated-docs) -->
@@ -557,7 +597,7 @@
 
     <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/client-properties.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/configuration/client-properties.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/configuration-management.html b/docs/2.x/configuration/overview.html
similarity index 85%
rename from docs/2.x/administration/configuration-management.html
rename to docs/2.x/configuration/overview.html
index 587689f..fb9a090 100644
--- a/docs/2.x/administration/configuration-management.html
+++ b/docs/2.x/configuration/overview.html
@@ -25,7 +25,7 @@
 <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs/jq-2.2.3/dt-1.10.12/datatables.min.css">
 <link href="/css/accumulo.css" rel="stylesheet" type="text/css">
 
-<title>Accumulo Documentation - Configuration Management</title>
+<title>Accumulo Documentation - Configuration Overview</title>
 
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,22 +283,54 @@
       
         
           
+        
+          
             <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">
-                  Administration
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="true" aria-controls="collapseconfiguration">
+                  Configuration
                 </a>
               </h4>
             </div>
-            <div id="collapseadministration" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
+            <div id="collapseconfiguration" 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/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
+                  Administration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseadministration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
@@ -370,26 +410,26 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Configuration Management</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Configuration &nbsp;&gt;&gt;&nbsp; Configuration Overview</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
-      <div class="col-md-10"><h1>Configuration Management</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/configuration-management.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-10"><h1>Configuration Overview</h1></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/configuration/overview.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <p>Configuration is managed differently for Accumulo clients and servers.</p>
 
 <h2 id="client-configuration">Client Configuration</h2>
 
-<p><a href="/docs/2.x/getting-started/clients#creating-an-accumulo-client">Accumulo clients</a> are created using builder methods or <code class="highlighter-rouge">accumulo-client.properties</code>
-which is configured using <a href="/docs/2.x/development/client-properties">client properties</a>.</p>
+<p><a href="/docs/2.x/getting-started/clients#creating-an-accumulo-client">Accumulo clients</a> are created using a Java builder methods, Java properties containing
+<a href="/docs/2.x/configuration/client-properties">client properties</a>, or an <code class="highlighter-rouge">accumulo-client.properties</code> file containing <a href="/docs/2.x/configuration/client-properties">client properties</a>.</p>
 
 <h2 id="server-configuration">Server Configuration</h2>
 
-<p>Accumulo services (i.e master, tablet server, monitor, etc) are configured using <a href="/docs/2.x/administration/properties">server properties</a> whose values can be
+<p>Accumulo services (i.e master, tablet server, monitor, etc) are configured by <a href="/docs/2.x/configuration/server-properties">server properties</a> whose values can be
 set in the following locations (with increasing precedence):</p>
 
 <ol>
@@ -404,35 +444,35 @@ set in the following locations (with increasing precedence):</p>
 
 <h3 id="default-values">Default values</h3>
 
-<p>All <a href="/docs/2.x/administration/properties">server properties</a> have a default value that is listed for each property on the <a href="/docs/2.x/administration/properties">properties</a> page. Default values are set in the source code.
+<p>All <a href="/docs/2.x/configuration/server-properties">server properties</a> have a default value that is listed for each property on the <a href="/docs/2.x/configuration/server-properties">properties</a> page. Default values are set in the source code.
 While default values have the lowest precedence, they are usually optimal.  However, there are cases where a change can increase query and ingest performance.</p>
 
 <h3 id="accumuloproperties">accumulo.properties</h3>
 
-<p>Setting <a href="/docs/2.x/administration/properties">server properties</a> in accumulo.properties will override their default value. If you are running Accumulo on a cluster, any updates to accumulo.properties must
+<p>Setting <a href="/docs/2.x/configuration/server-properties">server properties</a> in accumulo.properties will override their default value. If you are running Accumulo on a cluster, any updates to accumulo.properties must
 be synced across the cluster. Accumulo processes (master, tserver, etc) read their local accumulo.properties on start up so processes must be restarted to apply changes.
 Certain properties can only be set in accumulo.properties. These properties have <strong>zk mutable: no</strong> in their description. Setting properties in accumulo.properties allows you
 to configure tablet servers with different settings.</p>
 
 <h3 id="zookeeper">Zookeeper</h3>
 
-<p>Many <a href="/docs/2.x/administration/properties">server properties</a> can be set in Zookeeper using the Accumulo API or shell. These properties can identified by <strong>zk mutable: yes</strong> in their description on
-the <a href="/docs/2.x/administration/properties">properties page</a>. Zookeeper properties can be applied on a per-table or system-wide basis. Per-table properties take precedence over system-wide
+<p>Many <a href="/docs/2.x/configuration/server-properties">server properties</a> can be set in Zookeeper using the Accumulo API or shell. These properties can identified by <strong>zk mutable: yes</strong> in their description on
+the <a href="/docs/2.x/configuration/server-properties">properties page</a>. Zookeeper properties can be applied on a per-table or system-wide basis. Per-table properties take precedence over system-wide
 properties. While most properties set in Zookeeper take effect immediately, some require a restart of the process which is indicated in <strong>zk mutable</strong> section
 of their description.</p>
 
 <h4 id="zookeeper-system-properties">Zookeeper System properties</h4>
 
-<p>System properties consist of all <a href="/docs/2.x/administration/properties">properties</a> with <strong>zk mutable: yes</strong> in their description. They are set with the following shell command:</p>
+<p>System properties consist of all <a href="/docs/2.x/configuration/server-properties">properties</a> with <strong>zk mutable: yes</strong> in their description. They are set with the following shell command:</p>
 
 <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>config -s PROPERTY=VALUE
 </code></pre></div></div>
 
-<p>If a <a href="/docs/2.x/administration/properties#table_prefix">table.*</a> property is set using this method, the value will apply to all tables except those configured on per-table basis (which have higher precedence).</p>
+<p>If a <a href="/docs/2.x/configuration/server-properties#table_prefix">table.*</a> property is set using this method, the value will apply to all tables except those configured on per-table basis (which have higher precedence).</p>
 
 <h4 id="zookeeper-table-properties">Zookeeper Table properties</h4>
 
-<p>Table properties consist of all properties with the <a href="/docs/2.x/administration/properties#table_prefix">table.*</a> prefix.</p>
+<p>Table properties consist of all properties with the <a href="/docs/2.x/configuration/server-properties#table_prefix">table.*</a> prefix.</p>
 
 <p>Table properties are configured for a table namespace (i.e group of tables) or on a per-table basis.</p>
 
@@ -450,7 +490,7 @@ of their description.</p>
 
 <h4 id="zookeeper-considerations">Zookeeper Considerations</h4>
 
-<p>Any <a href="/docs/2.x/administration/properties">properties</a> that are set in Zookeeper should consider the limitations of Zookeeper itself with respect to the
+<p>Any <a href="/docs/2.x/configuration/server-properties">properties</a> that are set in Zookeeper should consider the limitations of Zookeeper itself with respect to the
 number of nodes and the size of the node data. Custom table properties and options for Iterators configured on tables
 are two areas in which there aren’t any fail safes built into the API that can prevent the user from making this mistake.</p>
 
@@ -498,7 +538,7 @@ default  | table.failures.ignore ..................... | false
 
     <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/configuration-management.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/configuration/overview.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.x/administration/properties.html b/docs/2.x/configuration/server-properties.html
similarity index 96%
rename from docs/2.x/administration/properties.html
rename to docs/2.x/configuration/server-properties.html
index fe13be4..e52236e 100644
--- a/docs/2.x/administration/properties.html
+++ b/docs/2.x/configuration/server-properties.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,22 +283,54 @@
       
         
           
+        
+          
             <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">
-                  Administration
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="true" aria-controls="collapseconfiguration">
+                  Configuration
                 </a>
               </h4>
             </div>
-            <div id="collapseadministration" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
+            <div id="collapseconfiguration" 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/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
+                  Administration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseadministration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
@@ -370,14 +410,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Server Properties</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Configuration &nbsp;&gt;&gt;&nbsp; Server Properties</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>Server Properties</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/properties.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/configuration/server-properties.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <!-- WARNING: Do not edit this file. It is a generated file that is copied from Accumulo build (from core/target/generated-docs) -->
@@ -426,7 +466,7 @@
     </tr>
     <tr>
       <td><a name="general_classpaths" class="prop"></a> general.classpaths</td>
-      <td><strong>Deprecated.</strong> <del>This property is deprecated. The class path should instead be configured by the launch environment (for example, accumulo-env.sh). A list of all of the places to look for a class. Order does matter, as it will look for the jar starting in the first location to the last. Supports full regex on filename alone.</del><br /><del><strong>type:</strong> STRING</del>, <del><strong>zk mutable:</strong> no</del>, <del><strong>default value:</strong> empt [...]
+      <td><strong>Deprecated.</strong> <del>This property is deprecated since 2.0.0. The class path should instead be configured by the launch environment (for example, accumulo-env.sh). A list of all of the places to look for a class. Order does matter, as it will look for the jar starting in the first location to the last. Supports full regex on filename alone.</del><br /><del><strong>type:</strong> STRING</del>, <del><strong>zk mutable:</strong> no</del>, <del><strong>default value:</ [...]
     </tr>
     <tr>
       <td><a name="general_custom_prefix" class="prop"></a> <strong>general.custom.</strong>*</td>
@@ -518,11 +558,11 @@
     </tr>
     <tr>
       <td><a name="instance_dfs_dir" class="prop"></a> instance.dfs.dir</td>
-      <td><strong>Deprecated.</strong> <del>HDFS directory in which accumulo instance will run. Do not change after accumulo is initialized.</del><br /><del><strong>type:</strong> ABSOLUTEPATH</del>, <del><strong>zk mutable:</strong> no</del>, <del><strong>default value:</strong> <code class="highlighter-rouge">/accumulo</code></del></td>
+      <td><strong>Deprecated.</strong> <del>This property is deprecated since 1.6.0. HDFS directory in which accumulo instance will run. Do not change after accumulo is initialized.</del><br /><del><strong>type:</strong> ABSOLUTEPATH</del>, <del><strong>zk mutable:</strong> no</del>, <del><strong>default value:</strong> <code class="highlighter-rouge">/accumulo</code></del></td>
     </tr>
     <tr>
       <td><a name="instance_dfs_uri" class="prop"></a> instance.dfs.uri</td>
-      <td><strong>Deprecated.</strong> <del>A url accumulo should use to connect to DFS. If this is empty, accumulo will obtain this information from the hadoop configuration. This property will only be used when creating new files if instance.volumes is empty. After an upgrade to 1.6.0 Accumulo will start using absolute paths to reference files. Files created before a 1.6.0 upgrade are referenced via relative paths. Relative paths will always be resolved using this config (if empty usin [...]
+      <td><strong>Deprecated.</strong> <del>This property is deprecated since 1.6.0. A url accumulo should use to connect to DFS. If this is empty, accumulo will obtain this information from the hadoop configuration. This property will only be used when creating new files if instance.volumes is empty. After an upgrade to 1.6.0 Accumulo will start using absolute paths to reference files. Files created before a 1.6.0 upgrade are referenced via relative paths. Relative paths will always be  [...]
     </tr>
     <tr>
       <td><a name="instance_rpc_sasl_allowed_host_impersonation" class="prop"></a> instance.rpc.sasl.allowed.host.impersonation</td>
@@ -689,6 +729,10 @@
       <td>A comma-separate list of allowed SSL protocols<br /><strong>type:</strong> STRING, <strong>zk mutable:</strong> no, <strong>default value:</strong> <code class="highlighter-rouge">TLSv1.2</code></td>
     </tr>
     <tr>
+      <td><a name="monitor_ssl_keyPassword" class="prop"></a> monitor.ssl.keyPassword</td>
+      <td>Optional: the password for the private key in the keyStore. When not provided, this defaults to the keystore password.<br /><strong>type:</strong> STRING, <strong>zk mutable:</strong> no, <strong>default value:</strong> empty</td>
+    </tr>
+    <tr>
       <td><a name="monitor_ssl_keyStore" class="prop"></a> monitor.ssl.keyStore</td>
       <td>The keystore for enabling monitor SSL.<br /><strong>type:</strong> PATH, <strong>zk mutable:</strong> no, <strong>default value:</strong> empty</td>
     </tr>
@@ -1046,7 +1090,7 @@
     </tr>
     <tr>
       <td><a name="table_walog_enabled" class="prop"></a> table.walog.enabled</td>
-      <td><strong>Deprecated.</strong> <del>This setting is deprecated.  Use table.durability=none instead.</del><br /><del><strong>type:</strong> BOOLEAN</del>, <del><strong>zk mutable:</strong> yes</del>, <del><strong>default value:</strong> <code class="highlighter-rouge">true</code></del></td>
+      <td><strong>Deprecated.</strong> <del>This setting is deprecated since 1.7.0. Use table.durability=none instead.</del><br /><del><strong>type:</strong> BOOLEAN</del>, <del><strong>zk mutable:</strong> yes</del>, <del><strong>default value:</strong> <code class="highlighter-rouge">true</code></del></td>
     </tr>
     <tr>
       <td><a name="trace_prefix" class="prop"></a> <strong>trace.</strong>*</td>
@@ -1322,7 +1366,7 @@
     </tr>
     <tr>
       <td><a name="tserver_wal_sync_method" class="prop"></a> tserver.wal.sync.method</td>
-      <td><strong>Deprecated.</strong> <del>This property is deprecated. Use table.durability instead.</del><br /><del><strong>type:</strong> STRING</del>, <del><strong>zk mutable:</strong> yes</del>, <del><strong>default value:</strong> <code class="highlighter-rouge">hsync</code></del></td>
+      <td><strong>Deprecated.</strong> <del>This property is deprecated since 1.7.0. Use table.durability instead.</del><br /><del><strong>type:</strong> STRING</del>, <del><strong>zk mutable:</strong> yes</del>, <del><strong>default value:</strong> <code class="highlighter-rouge">hsync</code></del></td>
     </tr>
     <tr>
       <td><a name="tserver_walog_max_age" class="prop"></a> tserver.walog.max.age</td>
@@ -1427,7 +1471,7 @@
 
     <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/properties.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/configuration/server-properties.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/development_tools.html b/docs/2.x/development/development_tools.html
index 84e28e5..881f223 100644
--- a/docs/2.x/development/development_tools.html
+++ b/docs/2.x/development/development_tools.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <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">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
diff --git a/docs/2.x/development/high_speed_ingest.html b/docs/2.x/development/high_speed_ingest.html
index a8190d3..d6321a8 100644
--- a/docs/2.x/development/high_speed_ingest.html
+++ b/docs/2.x/development/high_speed_ingest.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <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">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
diff --git a/docs/2.x/development/iterators.html b/docs/2.x/development/iterators.html
index 4bb6fce..8a9e406 100644
--- a/docs/2.x/development/iterators.html
+++ b/docs/2.x/development/iterators.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <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">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
diff --git a/docs/2.x/development/mapreduce.html b/docs/2.x/development/mapreduce.html
index e7d49cc..247b675 100644
--- a/docs/2.x/development/mapreduce.html
+++ b/docs/2.x/development/mapreduce.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <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">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
diff --git a/docs/2.x/development/proxy.html b/docs/2.x/development/proxy.html
index a64bb31..11c138f 100644
--- a/docs/2.x/development/proxy.html
+++ b/docs/2.x/development/proxy.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <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">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
diff --git a/docs/2.x/development/sampling.html b/docs/2.x/development/sampling.html
index 638bb6b..535a203 100644
--- a/docs/2.x/development/sampling.html
+++ b/docs/2.x/development/sampling.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <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">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
diff --git a/docs/2.x/development/summaries.html b/docs/2.x/development/summaries.html
index bcb83a5..ce4fe24 100644
--- a/docs/2.x/development/summaries.html
+++ b/docs/2.x/development/summaries.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <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">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
@@ -424,12 +464,12 @@ information.</p>
 <p>The following tablet server and table properties configure summarization.</p>
 
 <ul>
-  <li><a href="/docs/2.x/administration/properties#tserver_cache_summary_size">tserver.cache.summary.size</a></li>
-  <li><a href="/docs/2.x/administration/properties#tserver_summary_partition_threads">tserver.summary.partition.threads</a></li>
-  <li><a href="/docs/2.x/administration/properties#tserver_summary_remote_threads">tserver.summary.remote.threads</a></li>
-  <li><a href="/docs/2.x/administration/properties#tserver_summary_retrieval_threads">tserver.summary.retrieval.threads</a></li>
-  <li><a href="/docs/2.x/administration/properties#table_summarizer_prefix">table.summarizer.*</a>)</li>
-  <li><a href="/docs/2.x/administration/properties#table_file_summary_maxSize">table.file.summary.maxSize</a></li>
+  <li><a href="/docs/2.x/configuration/server-properties#tserver_cache_summary_size">tserver.cache.summary.size</a></li>
+  <li><a href="/docs/2.x/configuration/server-properties#tserver_summary_partition_threads">tserver.summary.partition.threads</a></li>
+  <li><a href="/docs/2.x/configuration/server-properties#tserver_summary_remote_threads">tserver.summary.remote.threads</a></li>
+  <li><a href="/docs/2.x/configuration/server-properties#tserver_summary_retrieval_threads">tserver.summary.retrieval.threads</a></li>
+  <li><a href="/docs/2.x/configuration/server-properties#table_summarizer_prefix">table.summarizer.*</a>)</li>
+  <li><a href="/docs/2.x/configuration/server-properties#table_file_summary_maxSize">table.file.summary.maxSize</a></li>
 </ul>
 
 <h2 id="permissions">Permissions</h2>
diff --git a/docs/2.x/getting-started/clients.html b/docs/2.x/getting-started/clients.html
index e9cf359..4b5b966 100644
--- a/docs/2.x/getting-started/clients.html
+++ b/docs/2.x/getting-started/clients.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="true" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
@@ -434,14 +474,14 @@ of the tarball distribution):
 </ol>
 
 <p>If a <code class="highlighter-rouge">accumulo-client.properties</code> file or a Java Properties object is used to create a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a>, the following
-<a href="/docs/2.x/development/client-properties">client properties</a> must be set:</p>
+<a href="/docs/2.x/configuration/client-properties">client properties</a> must be set:</p>
 
 <ul>
-  <li><a href="/docs/2.x/development/client-properties#instance_name">instance.name</a> - Name of Accumulo instance to connect to</li>
-  <li><a href="/docs/2.x/development/client-properties#instance_zookeepers">instance.zookeepers</a> - ZooKeeper connection information for this Accumulo instance</li>
-  <li><a href="/docs/2.x/development/client-properties#auth_type">auth.type</a> - Authentication method. Possible values are <code class="highlighter-rouge">password</code>, <code class="highlighter-rouge">kerberos</code>, or authentication token class (i.e <code class="highlighter-rouge">PasswordToken</code>, <code class="highlighter-rouge">org.apache.accumulo.core.client.security.tokens.PasswordToken</code>)</li>
-  <li><a href="/docs/2.x/development/client-properties#auth_principal">auth.principal</a> - Accumulo principal/username</li>
-  <li><a href="/docs/2.x/development/client-properties#auth_token">auth.token</a> - Token associated with <code class="highlighter-rouge">auth.type</code>. See table for mapping below:</li>
+  <li><a href="/docs/2.x/configuration/client-properties#instance_name">instance.name</a> - Name of Accumulo instance to connect to</li>
+  <li><a href="/docs/2.x/configuration/client-properties#instance_zookeepers">instance.zookeepers</a> - ZooKeeper connection information for this Accumulo instance</li>
+  <li><a href="/docs/2.x/configuration/client-properties#auth_type">auth.type</a> - Authentication method. Possible values are <code class="highlighter-rouge">password</code>, <code class="highlighter-rouge">kerberos</code>, or authentication token class (i.e <code class="highlighter-rouge">PasswordToken</code>, <code class="highlighter-rouge">org.apache.accumulo.core.client.security.tokens.PasswordToken</code>)</li>
+  <li><a href="/docs/2.x/configuration/client-properties#auth_principal">auth.principal</a> - Accumulo principal/username</li>
+  <li><a href="/docs/2.x/configuration/client-properties#auth_token">auth.token</a> - Token associated with <code class="highlighter-rouge">auth.type</code>. See table for mapping below:</li>
 </ul>
 
 <table>
@@ -602,7 +642,7 @@ These levels are:</p>
 <ol>
   <li>The default durability of a table can be set in the Accumulo shell</li>
   <li>When creating a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a>, the default durability can be overridden using <code class="highlighter-rouge">withBatchWriterConfig()</code>
-or by setting <a href="/docs/2.x/development/client-properties#batch_writer_durability">batch.writer.durability</a> in <code class="highlighter-rouge">accumulo-client.properties</code>.</li>
+or by setting <a href="/docs/2.x/configuration/client-properties#batch_writer_durability">batch.writer.durability</a> in <code class="highlighter-rouge">accumulo-client.properties</code>.</li>
   <li>
     <p>When a BatchWriter or ConditionalWriter is created, the durability settings above will be overridden
 by the <code class="highlighter-rouge">BatchWriterConfig</code> that is passed in.</p>
diff --git a/docs/2.x/getting-started/design.html b/docs/2.x/getting-started/design.html
index 0bb8c32..edf4677 100644
--- a/docs/2.x/getting-started/design.html
+++ b/docs/2.x/getting-started/design.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="true" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
diff --git a/docs/2.x/getting-started/features.html b/docs/2.x/getting-started/features.html
index 3a33684..3415f86 100644
--- a/docs/2.x/getting-started/features.html
+++ b/docs/2.x/getting-started/features.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="true" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
diff --git a/docs/2.x/getting-started/glossary.html b/docs/2.x/getting-started/glossary.html
index d8427ba..a31ebd1 100644
--- a/docs/2.x/getting-started/glossary.html
+++ b/docs/2.x/getting-started/glossary.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="true" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
diff --git a/docs/2.x/getting-started/quick-install.html b/docs/2.x/getting-started/quick-install.html
index 7d253ec..b221b8d 100644
--- a/docs/2.x/getting-started/quick-install.html
+++ b/docs/2.x/getting-started/quick-install.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="true" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
@@ -419,18 +459,18 @@ monitor, etc). Follow these steps to set it up:</p>
 <ol>
   <li>
     <p>Run <code class="highlighter-rouge">accumulo-util build-native</code> to build native code.  If this command fails, disable
-native maps by setting <a href="/docs/2.x/administration/properties#tserver_memory_maps_native_enabled">tserver.memory.maps.native.enabled</a> to <code class="highlighter-rouge">false</code>.</p>
+native maps by setting <a href="/docs/2.x/configuration/server-properties#tserver_memory_maps_native_enabled">tserver.memory.maps.native.enabled</a> to <code class="highlighter-rouge">false</code>.</p>
   </li>
   <li>
-    <p>Set <a href="/docs/2.x/administration/properties#instance_volumes">instance.volumes</a> to HDFS location where Accumulo will store data. If your namenode
+    <p>Set <a href="/docs/2.x/configuration/server-properties#instance_volumes">instance.volumes</a> to HDFS location where Accumulo will store data. If your namenode
 is running at 192.168.1.9:8020 and you want to store data in <code class="highlighter-rouge">/accumulo</code> in HDFS, then set
-<a href="/docs/2.x/administration/properties#instance_volumes">instance.volumes</a> to <code class="highlighter-rouge">hdfs://192.168.1.9:8020/accumulo</code>.</p>
+<a href="/docs/2.x/configuration/server-properties#instance_volumes">instance.volumes</a> to <code class="highlighter-rouge">hdfs://192.168.1.9:8020/accumulo</code>.</p>
   </li>
   <li>
-    <p>Set <a href="/docs/2.x/administration/properties#instance_zookeeper_host">instance.zookeeper.host</a> to the location of your Zookeepers</p>
+    <p>Set <a href="/docs/2.x/configuration/server-properties#instance_zookeeper_host">instance.zookeeper.host</a> to the location of your Zookeepers</p>
   </li>
   <li>
-    <p>(Optional) Change <a href="/docs/2.x/administration/properties#instance_secret">instance.secret</a> (which is used by Accumulo processes to communicate)
+    <p>(Optional) Change <a href="/docs/2.x/configuration/server-properties#instance_secret">instance.secret</a> (which is used by Accumulo processes to communicate)
 from the default. This value should match on all servers.</p>
   </li>
 </ol>
@@ -491,12 +531,12 @@ clients to simplify connecting to Accumulo. Below are steps to configure it.</p>
 
 <ol>
   <li>
-    <p>Set <a href="/docs/2.x/development/client-properties#instance_name">instance.name</a> and <a href="/docs/2.x/development/client-properties#instance_zookeepers">instance.zookeepers</a> to the Accumulo instance and zookeeper connection
+    <p>Set <a href="/docs/2.x/configuration/client-properties#instance_name">instance.name</a> and <a href="/docs/2.x/configuration/client-properties#instance_zookeepers">instance.zookeepers</a> to the Accumulo instance and zookeeper connection
 string of your instance.</p>
   </li>
   <li>
-    <p>Pick an authentication type and set <a href="/docs/2.x/development/client-properties#auth_type">auth.type</a> accordingly.  The most common <code class="highlighter-rouge">auth.type</code>
-is <code class="highlighter-rouge">password</code> which requires <a href="/docs/2.x/development/client-properties#auth_principal">auth.principal</a> to be set and <a href="/docs/2.x/development/client-properties#auth_token">auth.token</a> to be set the password
+    <p>Pick an authentication type and set <a href="/docs/2.x/configuration/client-properties#auth_type">auth.type</a> accordingly.  The most common <code class="highlighter-rouge">auth.type</code>
+is <code class="highlighter-rouge">password</code> which requires <a href="/docs/2.x/configuration/client-properties#auth_principal">auth.principal</a> to be set and <a href="/docs/2.x/configuration/client-properties#auth_token">auth.token</a> to be set the password
 of <code class="highlighter-rouge">auth.principal</code>. For the Accumulo shell, <code class="highlighter-rouge">auth.token</code> can be commented out and the shell will
 prompt you for the password of <code class="highlighter-rouge">auth.principal</code> at login.</p>
   </li>
diff --git a/docs/2.x/getting-started/shell.html b/docs/2.x/getting-started/shell.html
index dd8a315..0d4d8c7 100644
--- a/docs/2.x/getting-started/shell.html
+++ b/docs/2.x/getting-started/shell.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="true" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
diff --git a/docs/2.x/getting-started/table_configuration.html b/docs/2.x/getting-started/table_configuration.html
index 8452b4c..7166dcc 100644
--- a/docs/2.x/getting-started/table_configuration.html
+++ b/docs/2.x/getting-started/table_configuration.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="true" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
@@ -383,7 +423,7 @@
     <p>Accumulo tables have a few options that can be configured to alter the default
 behavior of Accumulo as well as improve performance based on the data stored.
 These include locality groups, constraints, bloom filters, iterators, and block
-cache.  See the <a href="/docs/2.x/administration/properties">configuration properties documentation</a> for
+cache.  See the <a href="/docs/2.x/configuration/server-properties">configuration properties documentation</a> for
 a complete list of available configuration options.</p>
 
 <h2 id="locality-groups">Locality Groups</h2>
@@ -470,7 +510,7 @@ change to an existing constraint class requires Accumulo to be restarted.</p>
 bloom filters are enabled, Accumulo will create and load a small data structure into
 memory to determine whether a file contains a given key before opening the file.
 This can speed up lookups considerably. Bloom filters can be enabled on a table by
-setting the <a href="/docs/2.x/administration/properties#table_bloom_enabled">table.bloom.enabled</a> property to <code class="highlighter-rouge">true</code> in the shell:</p>
+setting the <a href="/docs/2.x/configuration/server-properties#table_bloom_enabled">table.bloom.enabled</a> property to <code class="highlighter-rouge">true</code> in the shell:</p>
 
 <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>user@myinstance&gt; config -t mytable -s table.bloom.enabled=true
 </code></pre></div></div>
@@ -725,7 +765,7 @@ added to tablets directly by bulk import. In the background tablet servers run
 major compactions to merge multiple files into one. The tablet server has to
 decide which tablets to compact and which files within a tablet to compact.
 This decision is made using the compaction ratio, which is configurable on a
-per table basis by the <a href="/docs/2.x/administration/properties#table_compaction_major_ratio">table.compaction.major.ratio</a> property.</p>
+per table basis by the <a href="/docs/2.x/configuration/server-properties#table_compaction_major_ratio">table.compaction.major.ratio</a> property.</p>
 
 <p>Increasing this ratio will result in more files per tablet and less compaction
 work. More files per tablet means more higher query latency. So adjusting
@@ -740,8 +780,8 @@ remaining files are considered for compaction. This is repeated until a
 compaction is triggered or there are no files left to consider.</p>
 
 <p>The number of background threads tablet servers use to run major and minor
-compactions is configured by the <a href="/docs/2.x/administration/properties#tserver_compaction_major_concurrent_max">tserver.compaction.major.concurrent.max</a>
-and <a href="/docs/2.x/administration/properties#tserver_compaction_minor_concurrent_max">tserver.compaction.minor.concurrent.max</a> properties respectively.</p>
+compactions is configured by the <a href="/docs/2.x/configuration/server-properties#tserver_compaction_major_concurrent_max">tserver.compaction.major.concurrent.max</a>
+and <a href="/docs/2.x/configuration/server-properties#tserver_compaction_minor_concurrent_max">tserver.compaction.minor.concurrent.max</a> properties respectively.</p>
 
 <p>The numbers of major and minor compactions running and queued is visible on the
 Accumulo monitor page. This allows you to see if compactions are backing up
@@ -763,7 +803,7 @@ alleviate backups by lowering the amount of major compaction work that needs to
 be done.</p>
 
 <p>Another option to deal with the files per tablet growing too large is to adjust
-the <a href="/docs/2.x/administration/properties#table_file_max">table.file.max</a> property. When a tablet reaches this number of files and needs
+the <a href="/docs/2.x/configuration/server-properties#table_file_max">table.file.max</a> property. When a tablet reaches this number of files and needs
 to flush its in-memory data to disk, it will choose to do a merging minor compaction.
 A merging minor compaction will merge the tablet’s smallest file with the data in memory at
 minor compaction time. Therefore the number of files will not grow beyond this
@@ -796,11 +836,11 @@ This will only compact tablets that overlap the given row range.</p>
 <h3 id="compaction-strategies">Compaction Strategies</h3>
 
 <p>The default behavior of major compactions is defined in the class <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/2.0.0-alpha-1/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategy.html">DefaultCompactionStrategy</a>.
-This behavior can be changed by overriding <a href="/docs/2.x/administration/properties#table_majc_compaction_strategy">table.majc.compaction.strategy</a> with a fully
+This behavior can be changed by overriding <a href="/docs/2.x/configuration/server-properties#table_majc_compaction_strategy">table.majc.compaction.strategy</a> with a fully
 qualified class name.</p>
 
 <p>Custom compaction strategies can have additional properties that are specified with the
-<a href="/docs/2.x/administration/properties#table_majc_compaction_strategy_opts_prefix">table.majc.compaction.strategy.opts.*</a> prefix.</p>
+<a href="/docs/2.x/configuration/server-properties#table_majc_compaction_strategy_opts_prefix">table.majc.compaction.strategy.opts.*</a> prefix.</p>
 
 <p>Accumulo provides a few classes that can be used as an alternative compaction strategy. These classes are located in the 
 <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/2.0.0-alpha-1/org/apache/accumulo/tserver/compaction/package-summary.html">org.apache.accumulo.tserver.compaction</a> package. <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/2.0.0-alpha-1/org/apache/accumulo/tserver/compaction/EverythingCompactionStrategy.html">EverythingCompactionStrategy</a>
@@ -809,7 +849,7 @@ will simply compact all files. This is the strategy used by the user <code class
 <p><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/2.0.0-alpha-1/org/apache/accumulo/tserver/compaction/TwoTierCompactionStrategy.html">TwoTierCompactionStrategy</a> is a hybrid compaction strategy that supports two types of compression. If the total size of
 files being compacted is larger than <code class="highlighter-rouge">table.majc.compaction.strategy.opts.file.large.compress.threshold</code> than a larger 
 compression type will be used. The larger compression type is specified in <code class="highlighter-rouge">table.majc.compaction.strategy.opts.file.large.compress.type</code>. 
-Otherwise, the configured table compression will be used. To use this strategy with minor compactions set <a href="/docs/2.x/administration/properties#table_file_compress_type">table.file.compress.type</a> to <code class="highlighter-rouge">snappy</code> 
+Otherwise, the configured table compression will be used. To use this strategy with minor compactions set <a href="/docs/2.x/configuration/server-properties#table_file_compress_type">table.file.compress.type</a> to <code class="highlighter-rouge">snappy</code> 
 and set a different compress type in <code class="highlighter-rouge">table.majc.compaction.strategy.opts.file.large.compress.type</code> for larger files.</p>
 
 <h2 id="pre-splitting-tables">Pre-splitting tables</h2>
diff --git a/docs/2.x/getting-started/table_design.html b/docs/2.x/getting-started/table_design.html
index bb781b7..1b454cb 100644
--- a/docs/2.x/getting-started/table_design.html
+++ b/docs/2.x/getting-started/table_design.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="true" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
diff --git a/docs/2.x/security/crypto.html b/docs/2.x/security/crypto.html
index d1a1f51..0c5f94e 100644
--- a/docs/2.x/security/crypto.html
+++ b/docs/2.x/security/crypto.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
@@ -389,13 +429,13 @@ For information on encrypting data over the wire see the section on <a href="/do
 <p>To encrypt all tables on disk, encryption must be enabled before an Accumulo instance is initialized.  If on disk 
 encryption is enabled on an existing cluster, only files created after it is enabled will be encrypted 
 (root and metadata tables will not be encrypted in this case) and existing data won’t be encrypted until compaction.  To configure on disk encryption, add the 
-<a href="/docs/2.x/administration/properties#instance_crypto_service">instance.crypto.service</a> property to your <code class="highlighter-rouge">accumulo.properties</code> file.  The value of this property is the
+<a href="/docs/2.x/configuration/server-properties#instance_crypto_service">instance.crypto.service</a> property to your <code class="highlighter-rouge">accumulo.properties</code> file.  The value of this property is the
 class name of the service which will perform crypto on RFiles and WALs.</p>
 <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>instance.crypto.service=org.apache.accumulo.core.security.crypto.impl.AESCryptoService
 </code></pre></div></div>
 <p>Out of the box, Accumulo provides the <code class="highlighter-rouge">AESCryptoService</code> for basic encryption needs.  This class provides AES encryption 
 with Galois/Counter Mode (GCM) for RFiles and Cipher Block Chaining (CBC) mode for WALs.  The additional property
-below is required by this crypto service to be set using the <a href="/docs/2.x/administration/properties#instance_crypto_opts_prefix">instance.crypto.opts.*</a> prefix.</p>
+below is required by this crypto service to be set using the <a href="/docs/2.x/configuration/server-properties#instance_crypto_opts_prefix">instance.crypto.opts.*</a> prefix.</p>
 <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>instance.crypto.opts.key.location=file:///secure/path/to/crypto-key-file
 </code></pre></div></div>
 <p>This property tells the crypto service where to find the file containing the key encryption key. The key file can be 16 or 32 bytes.
diff --git a/docs/2.x/security/features.html b/docs/2.x/security/features.html
index 71c7624..24036fc 100644
--- a/docs/2.x/security/features.html
+++ b/docs/2.x/security/features.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
diff --git a/docs/2.x/security/kerberos.html b/docs/2.x/security/kerberos.html
index 857357a..6f6ad39 100644
--- a/docs/2.x/security/kerberos.html
+++ b/docs/2.x/security/kerberos.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
@@ -759,9 +799,9 @@ below in <code class="highlighter-rouge">accumulo-client.properties</code> which
 the <code class="highlighter-rouge">--config-file</code> command line option.</p>
 
 <ul>
-  <li><a href="/docs/2.x/development/client-properties#sasl_enabled">sasl.enabled</a> = true</li>
-  <li><a href="/docs/2.x/development/client-properties#sasl_qop">sasl.qop</a> = auth</li>
-  <li><a href="/docs/2.x/development/client-properties#sasl_kerberos_server_primary">sasl.kerberos.server.primary</a> = accumulo</li>
+  <li><a href="/docs/2.x/configuration/client-properties#sasl_enabled">sasl.enabled</a> = true</li>
+  <li><a href="/docs/2.x/configuration/client-properties#sasl_qop">sasl.qop</a> = auth</li>
+  <li><a href="/docs/2.x/configuration/client-properties#sasl_kerberos_server_primary">sasl.kerberos.server.primary</a> = accumulo</li>
 </ul>
 
 <p>Each of these properties <em>must</em> match the configuration of the accumulo servers; this is
diff --git a/docs/2.x/security/ssl.html b/docs/2.x/security/ssl.html
index 79784dd..107c2d1 100644
--- a/docs/2.x/security/ssl.html
+++ b/docs/2.x/security/ssl.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
@@ -409,15 +449,15 @@ these files already exist.</p>
 <p>In <code class="highlighter-rouge">accumulo.properties</code>, the following properties are required:</p>
 
 <ul>
-  <li><a href="/docs/2.x/administration/properties#rpc_javax_net_ssl_keyStore">rpc.javax.net.ssl.keyStore</a>  = <em>The path on the local filesystem to the keystore containing the server’s certificate</em></li>
-  <li><a href="/docs/2.x/administration/properties#rpc_javax_net_ssl_keyStorePassword">rpc.javax.net.ssl.keyStorePassword</a> = <em>The password for the keystore containing the server’s certificate</em></li>
-  <li><a href="/docs/2.x/administration/properties#rpc_javax_net_ssl_trustStore">rpc.javax.net.ssl.trustStore</a> = <em>The path on the local filesystem to the keystore containing the certificate authority’s public key</em></li>
-  <li><a href="/docs/2.x/administration/properties#rpc_javax_net_ssl_trustStorePassword">rpc.javax.net.ssl.trustStorePassword</a> = <em>The password for the keystore containing the certificate authority’s public key</em></li>
-  <li><a href="/docs/2.x/administration/properties#instance_rpc_ssl_enabled">instance.rpc.ssl.enabled</a> = <em>true</em></li>
+  <li><a href="/docs/2.x/configuration/server-properties#rpc_javax_net_ssl_keyStore">rpc.javax.net.ssl.keyStore</a>  = <em>The path on the local filesystem to the keystore containing the server’s certificate</em></li>
+  <li><a href="/docs/2.x/configuration/server-properties#rpc_javax_net_ssl_keyStorePassword">rpc.javax.net.ssl.keyStorePassword</a> = <em>The password for the keystore containing the server’s certificate</em></li>
+  <li><a href="/docs/2.x/configuration/server-properties#rpc_javax_net_ssl_trustStore">rpc.javax.net.ssl.trustStore</a> = <em>The path on the local filesystem to the keystore containing the certificate authority’s public key</em></li>
+  <li><a href="/docs/2.x/configuration/server-properties#rpc_javax_net_ssl_trustStorePassword">rpc.javax.net.ssl.trustStorePassword</a> = <em>The password for the keystore containing the certificate authority’s public key</em></li>
+  <li><a href="/docs/2.x/configuration/server-properties#instance_rpc_ssl_enabled">instance.rpc.ssl.enabled</a> = <em>true</em></li>
 </ul>
 
 <p>Optionally, SSL client-authentication (two-way SSL) can also be enabled by setting
-<a href="/docs/2.x/administration/properties#instance_rpc_ssl_clientAuth">instance.rpc.ssl.clientAuth</a> <code class="highlighter-rouge">true</code> in <code class="highlighter-rouge">accumulo.properties</code>.
+<a href="/docs/2.x/configuration/server-properties#instance_rpc_ssl_clientAuth">instance.rpc.ssl.clientAuth</a> <code class="highlighter-rouge">true</code> in <code class="highlighter-rouge">accumulo.properties</code>.
 This requires that each client has access to  valid certificate to set up a secure connection
 to the servers. By default, Accumulo uses one-way SSL which does not require clients to have
 their own certificate.</p>
@@ -430,17 +470,17 @@ client</a> using <code class="highlighter-rouge">accumulo-client.properties</cod
 the properties to connect to an Accumulo instance using SSL:</p>
 
 <ul>
-  <li><a href="/docs/2.x/development/client-properties#ssl_enabled">ssl.enabled</a> to <code class="highlighter-rouge">true</code></li>
-  <li><a href="/docs/2.x/development/client-properties#ssl_truststore_path">ssl.truststore.path</a></li>
-  <li><a href="/docs/2.x/development/client-properties#ssl_truststore_password">ssl.truststore.password</a></li>
+  <li><a href="/docs/2.x/configuration/client-properties#ssl_enabled">ssl.enabled</a> to <code class="highlighter-rouge">true</code></li>
+  <li><a href="/docs/2.x/configuration/client-properties#ssl_truststore_path">ssl.truststore.path</a></li>
+  <li><a href="/docs/2.x/configuration/client-properties#ssl_truststore_password">ssl.truststore.password</a></li>
 </ul>
 
 <p>If two-way SSL is enabled for the Accumulo instance (by setting [instance.rpc.ssl.clientAuth] to <code class="highlighter-rouge">true</code> in <code class="highlighter-rouge">accumulo.properties</code>),
 Accumulo clients must also define their own certificate by setting the following properties:</p>
 
 <ul>
-  <li><a href="/docs/2.x/development/client-properties#ssl_keystore_path">ssl.keystore.path</a></li>
-  <li><a href="/docs/2.x/development/client-properties#ssl_keystore_password">ssl.keystore.password</a></li>
+  <li><a href="/docs/2.x/configuration/client-properties#ssl_keystore_path">ssl.keystore.path</a></li>
+  <li><a href="/docs/2.x/configuration/client-properties#ssl_keystore_password">ssl.keystore.password</a></li>
 </ul>
 
 <h2 id="generating-ssl-material-using-openssl">Generating SSL material using OpenSSL</h2>
diff --git a/docs/2.x/troubleshooting/advanced.html b/docs/2.x/troubleshooting/advanced.html
index 1bf9f7b..623383d 100644
--- a/docs/2.x/troubleshooting/advanced.html
+++ b/docs/2.x/troubleshooting/advanced.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
diff --git a/docs/2.x/troubleshooting/basic.html b/docs/2.x/troubleshooting/basic.html
index 5035515..8399f2a 100644
--- a/docs/2.x/troubleshooting/basic.html
+++ b/docs/2.x/troubleshooting/basic.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
diff --git a/docs/2.x/troubleshooting/performance.html b/docs/2.x/troubleshooting/performance.html
index cc93a0d..bd7a8a4 100644
--- a/docs/2.x/troubleshooting/performance.html
+++ b/docs/2.x/troubleshooting/performance.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
@@ -396,10 +436,10 @@
 files per tablet. Less files reduces the latency of reads.</p>
   </li>
   <li>
-    <p>Decrease the size of <a href="/docs/2.x/getting-started/design#rfile">data blocks in RFiles</a> by lowering <a href="/docs/2.x/administration/properties#table_file_compress_blocksize">table.file.compress.blocksize</a> which can result
+    <p>Decrease the size of <a href="/docs/2.x/getting-started/design#rfile">data blocks in RFiles</a> by lowering <a href="/docs/2.x/configuration/server-properties#table_file_compress_blocksize">table.file.compress.blocksize</a> which can result
 in better random seek performance. However, this can increase the size of indexes in the RFile. If the indexes
 are too large to fit in cache, this can hinder performance. Also, as the index size increases the depth of the
-index tree in each file may increase. Increasing <a href="/docs/2.x/administration/properties#table_file_compress_blocksize_index">table.file.compress.blocksize.index</a> can reduce the depth of
+index tree in each file may increase. Increasing <a href="/docs/2.x/configuration/server-properties#table_file_compress_blocksize_index">table.file.compress.blocksize.index</a> can reduce the depth of
 the tree.</p>
   </li>
 </ol>
@@ -425,7 +465,7 @@ which improves ingest performance.</p>
     <p>On large Accumulo clusters, use <a href="/docs/2.x/administration/multivolume">multiple HDFS volumes</a> to increase write performance.</p>
   </li>
   <li>
-    <p>Change the compression format used by <a href="/docs/2.x/getting-started/design#rfile">blocks in RFiles</a> by setting <a href="/docs/2.x/administration/properties#table_file_compress_type">table.file.compress.type</a> to
+    <p>Change the compression format used by <a href="/docs/2.x/getting-started/design#rfile">blocks in RFiles</a> by setting <a href="/docs/2.x/configuration/server-properties#table_file_compress_type">table.file.compress.type</a> to
 <code class="highlighter-rouge">snappy</code>. This increases write speed at the expense of using more disk space.</p>
   </li>
 </ol>
diff --git a/docs/2.x/troubleshooting/system-metadata-tables.html b/docs/2.x/troubleshooting/system-metadata-tables.html
index 7f99cf1..c71a4e8 100644
--- a/docs/2.x/troubleshooting/system-metadata-tables.html
+++ b/docs/2.x/troubleshooting/system-metadata-tables.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
diff --git a/docs/2.x/troubleshooting/tools.html b/docs/2.x/troubleshooting/tools.html
index 20203e3..9759037 100644
--- a/docs/2.x/troubleshooting/tools.html
+++ b/docs/2.x/troubleshooting/tools.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
diff --git a/docs/2.x/troubleshooting/tracing.html b/docs/2.x/troubleshooting/tracing.html
index f63b6a6..593f074 100644
--- a/docs/2.x/troubleshooting/tracing.html
+++ b/docs/2.x/troubleshooting/tracing.html
@@ -159,6 +159,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
@@ -201,6 +203,8 @@
           
         
           
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsedevelopment" aria-expanded="false" aria-controls="collapsedevelopment">
@@ -226,8 +230,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
-                
               </div>
             </div>
           
@@ -251,6 +253,8 @@
           
         
           
+        
+          
             <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">
@@ -279,6 +283,42 @@
       
         
           
+        
+          
+            <div class="panel-heading" role="tab" id="headingOne">
+              <h4 class="panel-title">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseconfiguration" aria-expanded="false" aria-controls="collapseconfiguration">
+                  Configuration
+                </a>
+              </h4>
+            </div>
+            <div id="collapseconfiguration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+              <div class="panel-body">
+                
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/overview">Configuration Overview</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/client-properties">Client Properties</a></div>
+                
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/configuration/server-properties">Server Properties</a></div>
+                
+              </div>
+            </div>
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+          
+        
+      
+        
+          
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
@@ -292,10 +332,6 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
-                
-                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
-                
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
@@ -324,6 +360,8 @@
         
           
         
+          
+        
       
         
           
@@ -337,6 +375,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">
@@ -403,20 +443,20 @@ other table.</p>
 
 <p>To collect traces, Accumulo needs at least one tracer server running. If you are using <code class="highlighter-rouge">accumulo-cluster</code> to start your cluster,
 configure your server in <code class="highlighter-rouge">conf/tracers</code>. The server collects traces from clients and writes them to the <code class="highlighter-rouge">trace</code> table. The Accumulo
-user that the tracer connects to Accumulo with can be configured with the following properties (see the <a href="/docs/2.x/administration/configuration-management">configuration management</a> 
+user that the tracer connects to Accumulo with can be configured with the following properties (see the <a href="/docs/2.x/configuration/overview">configuration overview</a> 
 page for setting Accumulo server properties)</p>
 
 <ul>
-  <li><a href="/docs/2.x/administration/properties#trace_user">trace.user</a></li>
-  <li><a href="/docs/2.x/administration/properties#trace_token_property_password">trace.token.property.password</a></li>
+  <li><a href="/docs/2.x/configuration/server-properties#trace_user">trace.user</a></li>
+  <li><a href="/docs/2.x/configuration/server-properties#trace_token_property_password">trace.token.property.password</a></li>
 </ul>
 
 <p>Other tracer configuration properties include</p>
 
 <ul>
-  <li><a href="/docs/2.x/administration/properties#trace_port_client">trace.port.client</a> - port tracer listens on</li>
-  <li><a href="/docs/2.x/administration/properties#trace_table">trace.table</a> - table tracer writes to</li>
-  <li><a href="/docs/2.x/administration/properties#trace_zookeeper_path">trace.zookeeper.path</a> - zookeeper path where tracers register</li>
+  <li><a href="/docs/2.x/configuration/server-properties#trace_port_client">trace.port.client</a> - port tracer listens on</li>
+  <li><a href="/docs/2.x/configuration/server-properties#trace_table">trace.table</a> - table tracer writes to</li>
+  <li><a href="/docs/2.x/configuration/server-properties#trace_zookeeper_path">trace.zookeeper.path</a> - zookeeper path where tracers register</li>
 </ul>
 
 <p>The zookeeper path is configured to /tracers by default.  If
@@ -431,10 +471,10 @@ configured is org.apache.accumulo.core.trace.ZooTraceClient, which
 sends spans to an Accumulo Tracer process, as discussed in the
 previous section. This default can be changed to a different span
 receiver, or additional span receivers can be added in a
-comma-separated list, by modifying the property <a href="/docs/2.x/administration/properties#trace_span_receivers">trace.span.receivers</a>.</p>
+comma-separated list, by modifying the property <a href="/docs/2.x/configuration/server-properties#trace_span_receivers">trace.span.receivers</a>.</p>
 
 <p>Individual span receivers may require their own configuration
-parameters, which are grouped under the <a href="/docs/2.x/administration/properties#trace_span_receiver_prefix">trace.span.receiver.*</a>
+parameters, which are grouped under the <a href="/docs/2.x/configuration/server-properties#trace_span_receiver_prefix">trace.span.receiver.*</a>
 prefix.  ZooTraceClient uses the following properties.  The first
 three properties are populated from other Accumulo properties,
 while the remaining ones should be prefixed with
@@ -448,8 +488,8 @@ tracer.queue.size - max queue size (default 5000)
 tracer.span.min.ms - minimum span length to store (in ms, default 1)
 </code></pre></div></div>
 
-<p>To configure an Accumulo client for tracing, set <a href="/docs/2.x/development/client-properties#trace_span_receivers">trace.span.receivers</a> and <a href="/docs/2.x/development/client-properties#trace_zookeeper_path">trace.zookeeper.path</a>
-in <code class="highlighter-rouge">accumulo-client.properties</code>. Also, any <a href="/docs/2.x/administration/properties#trace_span_receiver_prefix">trace.span.receiver.*</a> properties set in <code class="highlighter-rouge">accumulo.properties</code> should be set in
+<p>To configure an Accumulo client for tracing, set <a href="/docs/2.x/configuration/client-properties#trace_span_receivers">trace.span.receivers</a> and <a href="/docs/2.x/configuration/client-properties#trace_zookeeper_path">trace.zookeeper.path</a>
+in <code class="highlighter-rouge">accumulo-client.properties</code>. Also, any <a href="/docs/2.x/configuration/server-properties#trace_span_receiver_prefix">trace.span.receiver.*</a> properties set in <code class="highlighter-rouge">accumulo.properties</code> should be set in
 <code class="highlighter-rouge">accumulo-client.properties</code>.</p>
 
 <p>Hadoop can also be configured to send traces to Accumulo, as of
diff --git a/feed.xml b/feed.xml
index b0da6a7..01926e9 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 18:40:16 -0400</pubDate>
-    <lastBuildDate>Thu, 18 Oct 2018 18:40:16 -0400</lastBuildDate>
+    <pubDate>Mon, 22 Oct 2018 13:29:32 -0400</pubDate>
+    <lastBuildDate>Mon, 22 Oct 2018 13:29:32 -0400</lastBuildDate>
     <generator>Jekyll v3.7.3</generator>
     
     
diff --git a/redirects.json b/redirects.json
index 38538e9..87ee136 100644
--- a/redirects.json
+++ b/redirects.json
@@ -1 +1 @@
-{"/release_notes/1.5.1.html":"https://accumulo.apache.org/release/accumulo-1.5.1/","/release_notes/1.6.0.html":"https://accumulo.apache.org/release/accumulo-1.6.0/","/release_notes/1.6.1.html":"https://accumulo.apache.org/release/accumulo-1.6.1/","/release_notes/1.6.2.html":"https://accumulo.apache.org/release/accumulo-1.6.2/","/release_notes/1.7.0.html":"https://accumulo.apache.org/release/accumulo-1.7.0/","/release_notes/1.5.3.html":"https://accumulo.apache.org/release/accumulo-1.5.3/" [...]
\ No newline at end of file
+{"/release_notes/1.5.1.html":"https://accumulo.apache.org/release/accumulo-1.5.1/","/release_notes/1.6.0.html":"https://accumulo.apache.org/release/accumulo-1.6.0/","/release_notes/1.6.1.html":"https://accumulo.apache.org/release/accumulo-1.6.1/","/release_notes/1.6.2.html":"https://accumulo.apache.org/release/accumulo-1.6.2/","/release_notes/1.7.0.html":"https://accumulo.apache.org/release/accumulo-1.7.0/","/release_notes/1.5.3.html":"https://accumulo.apache.org/release/accumulo-1.5.3/" [...]
\ No newline at end of file
diff --git a/search_data.json b/search_data.json
index 44f5b70..c28d6d0 100644
--- a/search_data.json
+++ b/search_data.json
@@ -7,13 +7,6 @@
       "categories": "administration"
     },
   
-    "docs-2-x-administration-configuration-management": {
-      "title": "Configuration Management",
-      "content"	 : "Configuration is managed differently for Accumulo clients and servers.Client ConfigurationAccumulo clients are created using builder methods or accumulo-client.propertieswhich is configured using client properties.Server ConfigurationAccumulo services (i.e master, tablet server, monitor, etc) are configured using server properties whose values can beset in the following locations (with increasing precedence):  Default values  accumulo.properties (overrides defaults)   [...]
-      "url": " /docs/2.x/administration/configuration-management",
-      "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 [...]
@@ -23,7 +16,7 @@
   
     "docs-2-x-administration-in-depth-install": {
       "title": "In-depth Installation",
-      "content"	 : "This document provides detailed instructions for installing Accumulo. For basicinstructions, see the quick installation guide.HardwareBecause we are running essentially two or three systems simultaneously layeredacross the cluster: HDFS, Accumulo and MapReduce, it is typical for hardware toconsist of 4 to 8 cores, and 8 to 32 GB RAM. This is so each running process can haveat least one core and 2 - 4 GB each.One core running HDFS can typically keep 2 to 4 disks busy,  [...]
+      "content"	 : "This document provides detailed instructions for installing Accumulo. For basicinstructions, see the quick installation guide.HardwareBecause we are running essentially two or three systems simultaneously layeredacross the cluster: HDFS, Accumulo and MapReduce, it is typical for hardware toconsist of 4 to 8 cores, and 8 to 32 GB RAM. This is so each running process can haveat least one core and 2 - 4 GB each.One core running HDFS can typically keep 2 to 4 disks busy,  [...]
       "url": " /docs/2.x/administration/in-depth-install",
       "categories": "administration"
     },
@@ -42,13 +35,6 @@
       "categories": "administration"
     },
   
-    "docs-2-x-administration-properties": {
-      "title": "Server Properties",
-      "content"	 : "Below are properties set in accumulo.properties or the Accumulo shell that configure Accumulo servers (i.e tablet server, master, etc). Properties labeled ‘Experimental’ could be part of an incomplete feature or have a higher risk of changing in the future.            Property      Description                   gc.*      Properties in this category affect the behavior of the accumulo garbage collector.               gc.cycle.delay      Time between garbage collection  [...]
-      "url": " /docs/2.x/administration/properties",
-      "categories": "administration"
-    },
-  
     "docs-2-x-administration-replication": {
       "title": "Replication",
       "content"	 : "OverviewReplication is a feature of Accumulo which provides a mechanism to automaticallycopy data to other systems, typically for the purpose of disaster recovery,high availability, or geographic locality. It is best to consider this featureas a framework for automatic replication instead of the ability to copy datafrom to another Accumulo instance as copying to another Accumulo cluster isonly an implementation detail. The local Accumulo cluster is hereby referredto a [...]
@@ -70,11 +56,25 @@
       "categories": "administration"
     },
   
-    "docs-2-x-development-client-properties": {
+    "docs-2-x-configuration-client-properties": {
       "title": "Client Properties",
       "content"	 : "Below are properties set in accumulo-client.properties that configure Accumulo clients. All properties have been part of the API since 2.0.0 (unless otherwise specified):            Property      Default value      Since      Description                   instance.name      empty             Name of Accumulo instance to connect to               instance.zookeepers      localhost:2181             Zookeeper connection information for Accumulo instance               inst [...]
-      "url": " /docs/2.x/development/client-properties",
-      "categories": "development"
+      "url": " /docs/2.x/configuration/client-properties",
+      "categories": "configuration"
+    },
+  
+    "docs-2-x-configuration-overview": {
+      "title": "Configuration Overview",
+      "content"	 : "Configuration is managed differently for Accumulo clients and servers.Client ConfigurationAccumulo clients are created using a Java builder methods, Java properties containingclient properties, or an accumulo-client.properties file containing client properties.Server ConfigurationAccumulo services (i.e master, tablet server, monitor, etc) are configured by server properties whose values can beset in the following locations (with increasing precedence):  Default values [...]
+      "url": " /docs/2.x/configuration/overview",
+      "categories": "configuration"
+    },
+  
+    "docs-2-x-configuration-server-properties": {
+      "title": "Server Properties",
+      "content"	 : "Below are properties set in accumulo.properties or the Accumulo shell that configure Accumulo servers (i.e tablet server, master, etc). Properties labeled ‘Experimental’ could be part of an incomplete feature or have a higher risk of changing in the future.            Property      Description                   gc.*      Properties in this category affect the behavior of the accumulo garbage collector.               gc.cycle.delay      Time between garbage collection  [...]
+      "url": " /docs/2.x/configuration/server-properties",
+      "categories": "configuration"
     },
   
     "docs-2-x-development-development-tools": {
@@ -254,7 +254,7 @@
   
     "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 [...]
+      "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"
     },


Mime
View raw message