You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mw...@apache.org on 2018/07/11 16:37:25 UTC

[accumulo-website] branch asf-site updated: Jekyll build from master:8a7aa58

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 53dd1a6  Jekyll build from master:8a7aa58
53dd1a6 is described below

commit 53dd1a6539bbb55c39dce0fc429ba526bde149ce
Author: Mike Walch <mw...@apache.org>
AuthorDate: Wed Jul 11 12:36:28 2018 -0400

    Jekyll build from master:8a7aa58
    
    Update auto-generated properties.md
    
    Also fixed minor issue in summaries.md
---
 README.md                                          |  40 +++--
 docs/2.0/administration/caching.html               |   2 +
 .../administration/configuration-management.html   |   2 +
 docs/2.0/administration/fate.html                  |   2 +
 docs/2.0/administration/in-depth-install.html      |   2 +
 docs/2.0/administration/kerberos.html              |   2 +
 docs/2.0/administration/monitoring-metrics.html    |   2 +
 docs/2.0/administration/multivolume.html           |   2 +
 docs/2.0/administration/properties.html            | 136 +++++++--------
 docs/2.0/administration/replication.html           |   2 +
 .../scan-executors.html}                           | 191 ++++++++++-----------
 docs/2.0/administration/ssl.html                   |   2 +
 docs/2.0/administration/tracing.html               |   2 +
 docs/2.0/administration/upgrading.html             |   2 +
 docs/2.0/development/client-properties.html        |   2 +
 docs/2.0/development/development_tools.html        |   2 +
 docs/2.0/development/high_speed_ingest.html        |   6 +-
 docs/2.0/development/iterators.html                |   2 +
 docs/2.0/development/mapreduce.html                |  12 +-
 docs/2.0/development/proxy.html                    |   2 +
 docs/2.0/development/sampling.html                 |   8 +-
 docs/2.0/development/security.html                 |   2 +
 docs/2.0/development/summaries.html                |  16 +-
 docs/2.0/getting-started/clients.html              |   2 +
 docs/2.0/getting-started/design.html               |   2 +
 docs/2.0/getting-started/quick-install.html        |   2 +
 docs/2.0/getting-started/shell.html                |   2 +
 docs/2.0/getting-started/table_configuration.html  |  11 +-
 docs/2.0/getting-started/table_design.html         |   2 +
 docs/2.0/troubleshooting/advanced.html             |   2 +
 docs/2.0/troubleshooting/basic.html                |   2 +
 docs/2.0/troubleshooting/performance.html          |   2 +
 .../troubleshooting/system-metadata-tables.html    |   2 +
 docs/2.0/troubleshooting/tools.html                |   2 +
 feed.xml                                           |   4 +-
 search_data.json                                   |  13 +-
 36 files changed, 274 insertions(+), 215 deletions(-)

diff --git a/README.md b/README.md
index fcbb75d..5d6d528 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,32 @@ You can just build static HTML files which are viewable in `_config.yml`:
     cd accumulo-website
     bundle exec jekyll build
 
+## Custom liquid tags
+
+Custom liquid tags are used to make linking to javadocs, properties, and documents easier.
+The source for these tags is at [_plugins/links.rb](_plugins/links.rb).
+
+| Tag   | Description            | Options                                                                         | Examples                                             | 
+| ----- | ---------------------- | ------------------------------------------------------------------------------- | ---------------------------------------------------- |
+| jlink | Creates Javadoc link   | Link text will be class name by default. Use `-f` for full package + class name | `{% jlink -f org.apache.accumulo.core.client.Connector %}` |
+| jurl  | Creates Javadoc URL    | None                                                                            | `{% jurl org.apache.accumulo.core.client.Connector %}`     |
+| plink | Creates Property link  | Assumes server property by default. Use `-c` to link to client properties       | `{% plink -c instance.name %}`                             |
+| purl  | Creates Property URL   | Default is servery property. Use `-c` to link to client properties              | `{% purl instance.volumes %}`                             |
+| dlink | Creates Documentation link | None                                                                            | `{% dlink getting-stared/clients %}`                   |
+| durl  | Creates Documentation URL  | None                                                                            | `{% durl troubleshooting/performance %}`                   |
+
+## Updating property documentation
+
+Building Accumulo  generates `properties.md` and `client-properties.md`.  To
+regenertate these, do the following.
+
+```
+cd <accumulo source dir>
+mvn package -DskipTests
+cp ./core/target/generated-docs/properties.md <accumulo website source>/_docs-2-0/administration
+cp ./core/target/generated-docs/client-properties.md <accumulo website source>/_docs-2-0/administration
+```
+
 ## Update the production website
 
 For Apache Accumulo committers, the `asf-site` branch needs to be updated with the generated
@@ -72,19 +98,5 @@ the given file into your `.git/hook` directory:
 
     cp ./_devtools/git-hooks/post-commit .git/hooks/
 
-## Custom liquid tags
-
-Custom liquid tags are used to make linking to javadocs, properties, and documents easier.
-The source for these tags is at [_plugins/links.rb](_plugins/links.rb).
-
-| Tag   | Description            | Options                                                                         | Examples                                             | 
-| ----- | ---------------------- | ------------------------------------------------------------------------------- | ---------------------------------------------------- |
-| jlink | Creates Javadoc link   | Link text will be class name by default. Use `-f` for full package + class name | `{% jlink -f org.apache.accumulo.core.client.Connector %}` |
-| jurl  | Creates Javadoc URL    | None                                                                            | `{% jurl org.apache.accumulo.core.client.Connector %}`     |
-| plink | Creates Property link  | Assumes server property by default. Use `-c` to link to client properties       | `{% plink -c instance.name %}`                             |
-| purl  | Creates Property URL   | Default is servery property. Use `-c` to link to client properties              | `{% plink instance.volumes %}`                             |
-| dlink | Creates Documentation link | None                                                                            | `{% dlink getting-stared/clients %}`                   |
-| durl  | Creates Documentation URL  | None                                                                            | `{% durl troubleshooting/performance %}`                   |
-
 [Jekyll]: https://jekyllrb.com/
 [Bundler]: https://bundler.io/
diff --git a/docs/2.0/administration/caching.html b/docs/2.0/administration/caching.html
index d1badac..74e92e0 100644
--- a/docs/2.0/administration/caching.html
+++ b/docs/2.0/administration/caching.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/administration/configuration-management.html b/docs/2.0/administration/configuration-management.html
index bb6490a..309c0fb 100644
--- a/docs/2.0/administration/configuration-management.html
+++ b/docs/2.0/administration/configuration-management.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/administration/fate.html b/docs/2.0/administration/fate.html
index 722deaf..173c800 100644
--- a/docs/2.0/administration/fate.html
+++ b/docs/2.0/administration/fate.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/administration/in-depth-install.html b/docs/2.0/administration/in-depth-install.html
index bff43f5..48d23ab 100644
--- a/docs/2.0/administration/in-depth-install.html
+++ b/docs/2.0/administration/in-depth-install.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/administration/kerberos.html b/docs/2.0/administration/kerberos.html
index 331a03f..cead737 100644
--- a/docs/2.0/administration/kerberos.html
+++ b/docs/2.0/administration/kerberos.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/administration/monitoring-metrics.html b/docs/2.0/administration/monitoring-metrics.html
index 0542375..e26b1bc 100644
--- a/docs/2.0/administration/monitoring-metrics.html
+++ b/docs/2.0/administration/monitoring-metrics.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/administration/multivolume.html b/docs/2.0/administration/multivolume.html
index 5ed4d7c..7227365 100644
--- a/docs/2.0/administration/multivolume.html
+++ b/docs/2.0/administration/multivolume.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/administration/properties.html b/docs/2.0/administration/properties.html
index 5f713c4..e77bee0 100644
--- a/docs/2.0/administration/properties.html
+++ b/docs/2.0/administration/properties.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
@@ -452,7 +454,7 @@
     </tr>
     <tr>
       <td><a name="general_vfs_context_classpath_prefix" class="prop"></a> <strong>general.vfs.context.classpath.</strong>*</td>
-      <td>Properties in this category are define a classpath. These properties start  with the category prefix, followed by a context name. The value is a comma seperated list of URIs. Supports full regex on filename alone. For example, general.vfs.context.classpath.cx1=hdfs://nn1:9902/mylibdir/*.jar. You can enable post delegation for a context, which will load classes from the context first instead of the parent first. Do this by setting general.vfs.context.classpath.<name>.delegation= [...]
+      <td>Properties in this category are define a classpath. These properties start  with the category prefix, followed by a context name. The value is a comma seperated list of URIs. Supports full regex on filename alone. For example, general.vfs.context.classpath.cx1=hdfs://nn1:9902/mylibdir/*.jar. You can enable post delegation for a context, which will load classes from the context first instead of the parent first. Do this by setting <code class="highlighter-rouge">general.vfs.cont [...]
     </tr>
     <tr>
       <td><a name="instance_prefix" class="prop"></a> <strong>instance.</strong>*</td>
@@ -479,10 +481,6 @@
       <td>Configures Thrift RPCs to require SASL with GSSAPI which supports Kerberos authentication. Mutually exclusive with SSL RPC configuration.<br /><strong>type:</strong> BOOLEAN, <strong>zk mutable:</strong> no, <strong>default value:</strong> <code class="highlighter-rouge">false</code></td>
     </tr>
     <tr>
-      <td><a name="instance_rpc_sasl_impersonation_prefix" class="prop"></a> <strong>instance.rpc.sasl.impersonation.</strong>*</td>
-      <td><strong>Deprecated.</strong> <del>Prefix that allows configuration of users that are allowed to impersonate other users</del></td>
-    </tr>
-    <tr>
       <td><a name="instance_rpc_ssl_clientAuth" class="prop"></a> instance.rpc.ssl.clientAuth</td>
       <td>Require clients to present certs signed by a trusted root<br /><strong>type:</strong> BOOLEAN, <strong>zk mutable:</strong> no, <strong>default value:</strong> <code class="highlighter-rouge">false</code></td>
     </tr>
@@ -492,19 +490,19 @@
     </tr>
     <tr>
       <td><a name="instance_secret" class="prop"></a> instance.secret</td>
-      <td>A secret unique to a given instance that all servers must know in order to communicate with one another.It should be changed prior to the initialization of Accumulo. To change it after Accumulo has been initialized, use the ChangeSecret tool and then update accumulo-site.xml everywhere. Before using the ChangeSecret tool, make sure Accumulo is not running and you are logged in as the user that controls Accumulo files in HDFS.  To use the ChangeSecret tool, run the command: ./bi [...]
+      <td>A secret unique to a given instance that all servers must know in order to communicate with one another. It should be changed prior to the initialization of Accumulo. To change it after Accumulo has been initialized, use the ChangeSecret tool and then update accumulo-site.xml everywhere. Before using the ChangeSecret tool, make sure Accumulo is not running and you are logged in as the user that controls Accumulo files in HDFS. To use the ChangeSecret tool, run the command: ./bi [...]
     </tr>
     <tr>
       <td><a name="instance_security_authenticator" class="prop"></a> instance.security.authenticator</td>
-      <td>The authenticator class that accumulo will use to determine if a user has privilege to perform an action<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> no, <strong>default value:</strong> <code class="highlighter-rouge">org.apache.accumulo.server.security.handler.ZKAuthenticator</code></td>
+      <td>The authenticator class that accumulo will use to determine if a user has privilege to perform an action<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> no, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/1.9.1/org/apache/accumulo/server/security/handler/ZKAuthenticator.html">org.apache.accumulo.server.security.handler.ZKAuthenticator</a></td>
     </tr>
     <tr>
       <td><a name="instance_security_authorizor" class="prop"></a> instance.security.authorizor</td>
-      <td>The authorizor class that accumulo will use to determine what labels a user has privilege to see<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> no, <strong>default value:</strong> <code class="highlighter-rouge">org.apache.accumulo.server.security.handler.ZKAuthorizor</code></td>
+      <td>The authorizor class that accumulo will use to determine what labels a user has privilege to see<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> no, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/1.9.1/org/apache/accumulo/server/security/handler/ZKAuthorizor.html">org.apache.accumulo.server.security.handler.ZKAuthorizor</a></td>
     </tr>
     <tr>
       <td><a name="instance_security_permissionHandler" class="prop"></a> instance.security.permissionHandler</td>
-      <td>The permission handler class that accumulo will use to determine if a user has privilege to perform an action<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> no, <strong>default value:</strong> <code class="highlighter-rouge">org.apache.accumulo.server.security.handler.ZKPermHandler</code></td>
+      <td>The permission handler class that accumulo will use to determine if a user has privilege to perform an action<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> no, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/1.9.1/org/apache/accumulo/server/security/handler/ZKPermHandler.html">org.apache.accumulo.server.security.handler.ZKPermHandler</a></td>
     </tr>
     <tr>
       <td><a name="instance_volumes" class="prop"></a> instance.volumes</td>
@@ -567,14 +565,6 @@
       <td>When a tablet server’s lock is deleted, it takes time for it to completely quit. This delay gives it time before log recoveries begin.<br /><strong>type:</strong> TIMEDURATION, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">10s</code></td>
     </tr>
     <tr>
-      <td><a name="master_recovery_max_age" class="prop"></a> master.recovery.max.age</td>
-      <td>Recovery files older than this age will be removed.<br /><strong>type:</strong> TIMEDURATION, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">60m</code></td>
-    </tr>
-    <tr>
-      <td><a name="master_recovery_time_max" class="prop"></a> master.recovery.time.max</td>
-      <td>The maximum time to attempt recovery before giving up<br /><strong>type:</strong> TIMEDURATION, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">30m</code></td>
-    </tr>
-    <tr>
       <td><a name="master_replication_coordinator_minthreads" class="prop"></a> master.replication.coordinator.minthreads</td>
       <td>Minimum number of threads dedicated to answering coordinator requests<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">4</code></td>
     </tr>
@@ -600,41 +590,25 @@
     </tr>
     <tr>
       <td><a name="master_status_threadpool_size" class="prop"></a> master.status.threadpool.size</td>
-      <td>The number of threads to use when fetching the tablet server status for balancing.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">1</code></td>
+      <td>The number of threads to use when fetching the tablet server status for balancing.  Zero indicates an unlimited number of threads will be used.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">0</code></td>
     </tr>
     <tr>
       <td><a name="master_tablet_balancer" class="prop"></a> master.tablet.balancer</td>
-      <td>The balancer class that accumulo will use to make tablet assignment and migration decisions.<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">org.apache.accumulo.server.master.balancer.TableLoadBalancer</code></td>
+      <td>The balancer class that accumulo will use to make tablet assignment and migration decisions.<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/1.9.1/org/apache/accumulo/server/master/balancer/TableLoadBalancer.html">org.apache.accumulo.server.master.balancer.TableLoadBalancer</a></td>
     </tr>
     <tr>
       <td><a name="master_walog_closer_implementation" class="prop"></a> master.walog.closer.implementation</td>
-      <td>A class that implements a mechanism to steal write access to a write-ahead log<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">org.apache.accumulo.server.master.recovery.HadoopLogCloser</code></td>
+      <td>A class that implements a mechanism to steal write access to a write-ahead log<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/1.9.1/org/apache/accumulo/server/master/recovery/HadoopLogCloser.html">org.apache.accumulo.server.master.recovery.HadoopLogCloser</a></td>
     </tr>
     <tr>
       <td><a name="monitor_prefix" class="prop"></a> <strong>monitor.</strong>*</td>
       <td>Properties in this category affect the behavior of the monitor web server.</td>
     </tr>
     <tr>
-      <td><a name="monitor_banner_background" class="prop"></a> monitor.banner.background</td>
-      <td><strong>Deprecated.</strong> <del>The background color of the banner text displayed on the monitor page.</del><br /><del><strong>type:</strong> STRING</del>, <del><strong>zk mutable:</strong> yes</del>, <del><strong>default value:</strong> <code class="highlighter-rouge">#304065</code></del></td>
-    </tr>
-    <tr>
-      <td><a name="monitor_banner_color" class="prop"></a> monitor.banner.color</td>
-      <td><strong>Deprecated.</strong> <del>The color of the banner text displayed on the monitor page.</del><br /><del><strong>type:</strong> STRING</del>, <del><strong>zk mutable:</strong> yes</del>, <del><strong>default value:</strong> <code class="highlighter-rouge">#c4c4c4</code></del></td>
-    </tr>
-    <tr>
-      <td><a name="monitor_banner_text" class="prop"></a> monitor.banner.text</td>
-      <td><strong>Deprecated.</strong> <del>The banner text displayed on the monitor page.</del><br /><del><strong>type:</strong> STRING</del>, <del><strong>zk mutable:</strong> yes</del>, <del><strong>default value:</strong> empty</del></td>
-    </tr>
-    <tr>
       <td><a name="monitor_lock_check_interval" class="prop"></a> monitor.lock.check.interval</td>
       <td>The amount of time to sleep between checking for the Montior ZooKeeper lock<br /><strong>type:</strong> TIMEDURATION, <strong>zk mutable:</strong> no, <strong>default value:</strong> <code class="highlighter-rouge">5s</code></td>
     </tr>
     <tr>
-      <td><a name="monitor_log_date_format" class="prop"></a> monitor.log.date.format</td>
-      <td>The SimpleDateFormat string used to configure the date shown on the ‘Recent Logs’ monitor page<br /><strong>type:</strong> STRING, <strong>zk mutable:</strong> no, <strong>default value:</strong> <code class="highlighter-rouge">yyyy/MM/dd HH:mm:ss,SSS</code></td>
-    </tr>
-    <tr>
       <td><a name="monitor_port_client" class="prop"></a> monitor.port.client</td>
       <td>The listening port for the monitor’s http service<br /><strong>type:</strong> PORT, <strong>zk mutable:</strong> no, <strong>default value:</strong> <code class="highlighter-rouge">9995</code></td>
     </tr>
@@ -644,11 +618,11 @@
     </tr>
     <tr>
       <td><a name="monitor_resources_external" class="prop"></a> monitor.resources.external</td>
-      <td>A JSON Map of Strings. Each String should be an HTML tag of an external resource (JS or CSS) to be imported by the Monitor. <br />Be sure to wrap with CDATA tags. If this value is set, all of the external resources in the &lt;head&gt; tag of the Monitor will be replaced with <br />the tags set here. Be sure the jquery tag is first since other scripts will depend on it. The resources that are used by default can be seen in accumulo/server/monitor/src/main/resources/templates/def [...]
+      <td>A JSON Map of Strings. Each String should be an HTML tag of an external resource (JS or CSS) to be imported by the Monitor. Be sure to wrap with CDATA tags. If this value is set, all of the external resources in the <code class="highlighter-rouge">&lt;head&gt;</code> tag of the Monitor will be replaced with the tags set here. Be sure the jquery tag is first since other scripts will depend on it. The resources that are used by default can be seen in accumulo/server/monitor/src/m [...]
     </tr>
     <tr>
       <td><a name="monitor_ssl_exclude_ciphers" class="prop"></a> monitor.ssl.exclude.ciphers</td>
-      <td>A comma-separated list of disallowed SSL Ciphers, see mmonitor.ssl.include.ciphers to allow ciphers<br /><strong>type:</strong> STRING, <strong>zk mutable:</strong> no, <strong>default value:</strong> empty</td>
+      <td>A comma-separated list of disallowed SSL Ciphers, see monitor.ssl.include.ciphers to allow ciphers<br /><strong>type:</strong> STRING, <strong>zk mutable:</strong> no, <strong>default value:</strong> empty</td>
     </tr>
     <tr>
       <td><a name="monitor_ssl_include_ciphers" class="prop"></a> monitor.ssl.include.ciphers</td>
@@ -656,7 +630,7 @@
     </tr>
     <tr>
       <td><a name="monitor_ssl_include_protocols" class="prop"></a> monitor.ssl.include.protocols</td>
-      <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,TLSv1.1,TLSv1.2</code></td>
+      <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_keyStore" class="prop"></a> monitor.ssl.keyStore</td>
@@ -740,7 +714,7 @@
     </tr>
     <tr>
       <td><a name="replication_work_assigner" class="prop"></a> replication.work.assigner</td>
-      <td>Replication WorkAssigner implementation to use<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">org.apache.accumulo.master.replication.UnorderedWorkAssigner</code></td>
+      <td>Replication WorkAssigner implementation to use<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-master/1.9.1/org/apache/accumulo/master/replication/UnorderedWorkAssigner.html">org.apache.accumulo.master.replication.UnorderedWorkAssigner</a></td>
     </tr>
     <tr>
       <td><a name="replication_work_assignment_sleep" class="prop"></a> replication.work.assignment.sleep</td>
@@ -800,11 +774,11 @@
     </tr>
     <tr>
       <td><a name="rpc_ssl_client_protocol" class="prop"></a> rpc.ssl.client.protocol</td>
-      <td>The protocol used to connect to a secure server, must be in the list of enabled protocols on the server side (rpc.ssl.server.enabled.protocols)<br /><strong>type:</strong> STRING, <strong>zk mutable:</strong> no, <strong>default value:</strong> <code class="highlighter-rouge">TLSv1</code></td>
+      <td>The protocol used to connect to a secure server, must be in the list of enabled protocols on the server side (rpc.ssl.server.enabled.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="rpc_ssl_server_enabled_protocols" class="prop"></a> rpc.ssl.server.enabled.protocols</td>
-      <td>Comma separated list of protocols that can be used to accept connections<br /><strong>type:</strong> STRING, <strong>zk mutable:</strong> no, <strong>default value:</strong> <code class="highlighter-rouge">TLSv1,TLSv1.1,TLSv1.2</code></td>
+      <td>Comma separated list of protocols that can be used to accept connections<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="rpc_useJsse" class="prop"></a> rpc.useJsse</td>
@@ -832,7 +806,7 @@
     </tr>
     <tr>
       <td><a name="table_bloom_key_functor" class="prop"></a> table.bloom.key.functor</td>
-      <td>A function that can transform the key prior to insertion and check of bloom filter. org.apache.accumulo.core.file.keyfunctor.RowFunctor,,org.apache.accumulo.core.file.keyfunctor.ColumnFamilyFunctor, and org.apache.accumulo.core.file.keyfunctor.ColumnQualifierFunctor are allowable values. One can extend any of the above mentioned classes to perform specialized parsing of the key. <br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</st [...]
+      <td>A function that can transform the key prior to insertion and check of bloom filter. org.apache.accumulo.core.file.keyfunctor.RowFunctor, org.apache.accumulo.core.file.keyfunctor.ColumnFamilyFunctor, and org.apache.accumulo.core.file.keyfunctor.ColumnQualifierFunctor are allowable values. One can extend any of the above mentioned classes to perform specialized parsing of the key. <br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</st [...]
     </tr>
     <tr>
       <td><a name="table_bloom_load_threshold" class="prop"></a> table.bloom.load.threshold</td>
@@ -876,7 +850,7 @@
     </tr>
     <tr>
       <td><a name="table_constraint_prefix" class="prop"></a> <strong>table.constraint.</strong>*</td>
-      <td>Properties in this category are per-table properties that add constraints to a table. These properties start with the category prefix, followed by a number, and their values correspond to a fully qualified Java class that implements the Constraint interface.<br />For example:<br />table.constraint.1 = org.apache.accumulo.core.constraints.MyCustomConstraint<br />and:<br />table.constraint.2 = my.package.constraints.MySecondConstraint</td>
+      <td>Properties in this category are per-table properties that add constraints to a table. These properties start with the category prefix, followed by a number, and their values correspond to a fully qualified Java class that implements the Constraint interface.<br />For example:<br />table.constraint.1 = org.apache.accumulo.core.constraints.MyCustomConstraint<br />and:<br /> table.constraint.2 = my.package.constraints.MySecondConstraint</td>
     </tr>
     <tr>
       <td><a name="table_custom_prefix" class="prop"></a> <strong>table.custom.</strong>*</td>
@@ -904,7 +878,7 @@
     </tr>
     <tr>
       <td><a name="table_file_compress_type" class="prop"></a> table.file.compress.type</td>
-      <td>Compression algorithm used on index and data blocks before they are written. Possible values: gz, snappy, lzo, none<br /><strong>type:</strong> STRING, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">gz</code></td>
+      <td>Compression algorithm used on index and data blocks before they are written. Possible values: zstd, gz, snappy, lzo, none<br /><strong>type:</strong> STRING, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">gz</code></td>
     </tr>
     <tr>
       <td><a name="table_file_max" class="prop"></a> table.file.max</td>
@@ -916,7 +890,7 @@
     </tr>
     <tr>
       <td><a name="table_file_summary_maxSize" class="prop"></a> table.file.summary.maxSize</td>
-      <td>The maximum size summary that will be stored. The number of RFiles that had summary data exceeding this threshold is reported by Summary.getFileStatistics().getLarge().  When adjusting this consider the expected number RFiles with summaries on each tablet server and the summary cache size.<br /><strong>type:</strong> BYTES, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">256K</code></td>
+      <td>The maximum size summary that will be stored. The number of RFiles that had summary data exceeding this threshold is reported by Summary.getFileStatistics().getLarge(). When adjusting this consider the expected number RFiles with summaries on each tablet server and the summary cache size.<br /><strong>type:</strong> BYTES, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">256K</code></td>
     </tr>
     <tr>
       <td><a name="table_file_type" class="prop"></a> table.file.type</td>
@@ -928,7 +902,7 @@
     </tr>
     <tr>
       <td><a name="table_group_prefix" class="prop"></a> <strong>table.group.</strong>*</td>
-      <td>Properties in this category are per-table properties that define locality groups in a table. These properties start with the category prefix, followed by a name, followed by a period, and followed by a property for that group.<br />For example table.group.group1=x,y,z sets the column families for a group called group1. Once configured, group1 can be enabled by adding it to the list of groups in the table.groups.enabled property.<br />Additional group options may be specified fo [...]
+      <td>Properties in this category are per-table properties that define locality groups in a table. These properties start with the category prefix, followed by a name, followed by a period, and followed by a property for that group.<br />For example table.group.group1=x,y,z sets the column families for a group called group1. Once configured, group1 can be enabled by adding it to the list of groups in the table.groups.enabled property.<br />Additional group options may be specified fo [...]
     </tr>
     <tr>
       <td><a name="table_groups_enabled" class="prop"></a> table.groups.enabled</td>
@@ -940,7 +914,7 @@
     </tr>
     <tr>
       <td><a name="table_iterator_prefix" class="prop"></a> <strong>table.iterator.</strong>*</td>
-      <td>Properties in this category specify iterators that are applied at various stages (scopes) of interaction with a table. These properties start with the category prefix, followed by a scope (minc, majc, scan, etc.), followed by a period, followed by a name, as in table.iterator.scan.vers, or table.iterator.scan.custom. The values for these properties are a number indicating the ordering in which it is applied, and a class name such as:<br /> table.iterator.scan.vers = 10,org.apac [...]
+      <td>Properties in this category specify iterators that are applied at various stages (scopes) of interaction with a table. These properties start with the category prefix, followed by a scope (minc, majc, scan, etc.), followed by a period, followed by a name, as in table.iterator.scan.vers, or table.iterator.scan.custom. The values for these properties are a number indicating the ordering in which it is applied, and a class name such as:<br />table.iterator.scan.vers = 10,org.apach [...]
     </tr>
     <tr>
       <td><a name="table_iterator_majc_prefix" class="prop"></a> <strong>table.iterator.majc.</strong>*</td>
@@ -956,7 +930,7 @@
     </tr>
     <tr>
       <td><a name="table_majc_compaction_strategy" class="prop"></a> table.majc.compaction.strategy</td>
-      <td>A customizable major compaction strategy.<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">org.apache.accumulo.tserver.compaction.DefaultCompactionStrategy</code></td>
+      <td>A customizable major compaction strategy.<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/1.9.1/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategy.html">org.apache.accumulo.tserver.compaction.DefaultCompactionStrategy</a></td>
     </tr>
     <tr>
       <td><a name="table_majc_compaction_strategy_opts_prefix" class="prop"></a> <strong>table.majc.compaction.strategy.opts.</strong>*</td>
@@ -972,11 +946,19 @@
     </tr>
     <tr>
       <td><a name="table_sampler" class="prop"></a> table.sampler</td>
-      <td>The name of a class that implements org.apache.accumulo.core.Sampler.  Setting this option enables storing a sample of data which can be scanned.  Always having a current sample can useful for query optimization and data comprehension.   After enabling sampling for an existing table, a compaction is needed to compute the sample for existing data.  The compact command in the shell has an option to only compact RFiles without sample data.<br /><strong>type:</strong> CLASSNAME, <s [...]
+      <td>The name of a class that implements org.apache.accumulo.core.Sampler. Setting this option enables storing a sample of data which can be scanned. Always having a current sample can useful for query optimization and data comprehension. After enabling sampling for an existing table, a compaction is needed to compute the sample for existing data. The compact command in the shell has an option to only compact RFiles without sample data.<br /><strong>type:</strong> CLASSNAME, <strong [...]
     </tr>
     <tr>
       <td><a name="table_sampler_opt_prefix" class="prop"></a> <strong>table.sampler.opt.</strong>*</td>
-      <td>The property is used to set options for a sampler.  If a sample had two options like hasher and modulous, then the two properties table.sampler.opt.hasher=${hash algorithm} and table.sampler.opt.modulous=${mod} would be set.</td>
+      <td>The property is used to set options for a sampler. If a sample had two options like hasher and modulous, then the two properties table.sampler.opt.hasher=${hash algorithm} and table.sampler.opt.modulous=${mod} would be set.</td>
+    </tr>
+    <tr>
+      <td><a name="table_scan_dispatcher" class="prop"></a> table.scan.dispatcher</td>
+      <td>This class is used to dynamically dispatch scans to configured scan executors.  Configured classes must implement <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.1/org/apache/accumulo/core/spi/scan/ScanDispatcher.html">ScanDispatcher</a> See <a href="/docs/2.0/administration/scan-executors">scan executors</a> for an overview of why and how to use this property. This property is ignored for the root and metadata table.  The metadata table always dispatch [...]
+    </tr>
+    <tr>
+      <td><a name="table_scan_dispatcher_opts_prefix" class="prop"></a> <strong>table.scan.dispatcher.opts.</strong>*</td>
+      <td>Options for the table scan dispatcher</td>
     </tr>
     <tr>
       <td><a name="table_scan_max_memory" class="prop"></a> table.scan.max.memory</td>
@@ -984,7 +966,7 @@
     </tr>
     <tr>
       <td><a name="table_security_scan_visibility_default" class="prop"></a> table.security.scan.visibility.default</td>
-      <td>The security label that will be assumed at scan time if an entry does not have a visibility set.<br />Note: An empty security label is displayed as []. The scan results will show an empty visibility even if the visibility from this setting is applied to the entry.<br />CAUTION: If a particular key has an empty security label AND its table’s default visibility is also empty, access will ALWAYS be granted for users with permission to that table. Additionally, if this field is cha [...]
+      <td>The security label that will be assumed at scan time if an entry does not have a visibility expression.<br />Note: An empty security label is displayed as []. The scan results will show an empty visibility even if the visibility from this setting is applied to the entry.<br />CAUTION: If a particular key has an empty security label AND its table’s default visibility is also empty, access will ALWAYS be granted for users with permission to that table. Additionally, if this field [...]
     </tr>
     <tr>
       <td><a name="table_split_endrow_size_max" class="prop"></a> table.split.endrow.size.max</td>
@@ -996,11 +978,11 @@
     </tr>
     <tr>
       <td><a name="table_summarizer_prefix" class="prop"></a> <strong>table.summarizer.</strong>*</td>
-      <td>Prefix for configuring summarizers for a table.  Using this prefix multiple summarizers can be configured with options for each one. Each summarizer configured should have a unique id, this id can be anything. To add a summarizer set table.summarizer.<unique>=<summarizer class="" name="">.  If the summarizer has options, then for each option set table.summarizer.<unique>.opt.<key>=<value>.</value></key></unique></summarizer></unique></td>
+      <td>Prefix for configuring summarizers for a table. Using this prefix multiple summarizers can be configured with options for each one. Each summarizer configured should have a unique id, this id can be anything. To add a summarizer set <code class="highlighter-rouge">table.summarizer.&lt;unique id&gt;=&lt;summarizer class name&gt;.</code> If the summarizer has options, then for each option set <code class="highlighter-rouge">table.summarizer.&lt;unique id&gt;.opt.&lt;key&gt;=&lt;v [...]
     </tr>
     <tr>
       <td><a name="table_suspend_duration" class="prop"></a> table.suspend.duration</td>
-      <td>For tablets belonging to this table: When a tablet server dies, allow the tablet server this duration to revive before reassigning its tabletsto other tablet servers.<br /><strong>type:</strong> TIMEDURATION, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">0s</code></td>
+      <td>For tablets belonging to this table: When a tablet server dies, allow the tablet server this duration to revive before reassigning its tablets to other tablet servers.<br /><strong>type:</strong> TIMEDURATION, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">0s</code></td>
     </tr>
     <tr>
       <td><a name="table_walog_enabled" class="prop"></a> table.walog.enabled</td>
@@ -1036,7 +1018,7 @@
     </tr>
     <tr>
       <td><a name="trace_token_type" class="prop"></a> trace.token.type</td>
-      <td>An AuthenticationToken type supported by the authorizer<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> no, <strong>default value:</strong> <code class="highlighter-rouge">org.apache.accumulo.core.client.security.tokens.PasswordToken</code></td>
+      <td>An AuthenticationToken type supported by the authorizer<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> no, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.1/org/apache/accumulo/core/client/security/tokens/PasswordToken.html">org.apache.accumulo.core.client.security.tokens.PasswordToken</a></td>
     </tr>
     <tr>
       <td><a name="trace_user" class="prop"></a> trace.user</td>
@@ -1051,16 +1033,12 @@
       <td>Properties in this category affect the behavior of the tablet servers</td>
     </tr>
     <tr>
-      <td><a name="tserver_archive_walogs" class="prop"></a> tserver.archive.walogs</td>
-      <td>Keep copies of the WALOGs for debugging purposes<br /><strong>type:</strong> BOOLEAN, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">false</code></td>
-    </tr>
-    <tr>
       <td><a name="tserver_assignment_concurrent_max" class="prop"></a> tserver.assignment.concurrent.max</td>
       <td>The number of threads available to load tablets. Recoveries are still performed serially.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">2</code></td>
     </tr>
     <tr>
       <td><a name="tserver_assignment_duration_warning" class="prop"></a> tserver.assignment.duration.warning</td>
-      <td>The amount of time an assignment can run  before the server will print a warning along with the current stack trace. Meant to help debug stuck assignments<br /><strong>type:</strong> TIMEDURATION, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">10m</code></td>
+      <td>The amount of time an assignment can run before the server will print a warning along with the current stack trace. Meant to help debug stuck assignments<br /><strong>type:</strong> TIMEDURATION, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">10m</code></td>
     </tr>
     <tr>
       <td><a name="tserver_bloom_load_concurrent_max" class="prop"></a> tserver.bloom.load.concurrent.max</td>
@@ -1152,7 +1130,7 @@
     </tr>
     <tr>
       <td><a name="tserver_memory_manager" class="prop"></a> tserver.memory.manager</td>
-      <td>An implementation of MemoryManger that accumulo will use.<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">org.apache.accumulo.server.tabletserver.LargestFirstMemoryManager</code></td>
+      <td>An implementation of MemoryManger that accumulo will use.<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/1.9.1/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.html">org.apache.accumulo.server.tabletserver.LargestFirstMemoryManager</a></td>
     </tr>
     <tr>
       <td><a name="tserver_memory_maps_max" class="prop"></a> tserver.memory.maps.max</td>
@@ -1164,7 +1142,7 @@
     </tr>
     <tr>
       <td><a name="tserver_metadata_readahead_concurrent_max" class="prop"></a> tserver.metadata.readahead.concurrent.max</td>
-      <td>The maximum number of concurrent metadata read ahead that will execute.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">8</code></td>
+      <td><strong>Deprecated.</strong> <del>This property is deprecated since 2.0.0, use tserver.scan.executors.meta.threads instead. The maximum number of concurrent metadata read ahead that will execute.</del><br /><del><strong>type:</strong> COUNT</del>, <del><strong>zk mutable:</strong> yes</del>, <del><strong>default value:</strong> <code class="highlighter-rouge">8</code></del></td>
     </tr>
     <tr>
       <td><a name="tserver_migrations_concurrent_max" class="prop"></a> tserver.migrations.concurrent.max</td>
@@ -1175,10 +1153,6 @@
       <td>When enabled the tserver will monitor file systems and kill itself when one switches from rw to ro. This is usually and indication that Linux has detected a bad disk.<br /><strong>type:</strong> BOOLEAN, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">true</code></td>
     </tr>
     <tr>
-      <td><a name="tserver_mutation_queue_max" class="prop"></a> tserver.mutation.queue.max</td>
-      <td><strong>Deprecated.</strong> <del>This setting is deprecated. See tserver.total.mutation.queue.max. The amount of memory to use to store write-ahead-log mutations-per-session before flushing them. Since the buffer is per write session, consider the max number of concurrent writer when configuring. When using Hadoop 2, Accumulo will call hsync() on the WAL . For a small number of concurrent writers, increasing this buffer size decreases the frequncy of hsync calls. For a large n [...]
-    </tr>
-    <tr>
       <td><a name="tserver_port_client" class="prop"></a> tserver.port.client</td>
       <td>The port used for handling client connections on the tablet servers<br /><strong>type:</strong> PORT, <strong>zk mutable:</strong> yes but requires restart of the tserver, <strong>default value:</strong> <code class="highlighter-rouge">9997</code></td>
     </tr>
@@ -1188,7 +1162,7 @@
     </tr>
     <tr>
       <td><a name="tserver_readahead_concurrent_max" class="prop"></a> tserver.readahead.concurrent.max</td>
-      <td>The maximum number of concurrent read ahead that will execute. This effectively limits the number of long running scans that can run concurrently per tserver.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">16</code></td>
+      <td><strong>Deprecated.</strong> <del>This property is deprecated since 2.0.0, use tserver.scan.executors.default.threads instead. The maximum number of concurrent read ahead that will execute. This effectively limits the number of long running scans that can run concurrently per tserver.”</del><br /><del><strong>type:</strong> COUNT</del>, <del><strong>zk mutable:</strong> yes</del>, <del><strong>default value:</strong> <code class="highlighter-rouge">16</code></del></td>
     </tr>
     <tr>
       <td><a name="tserver_recovery_concurrent_max" class="prop"></a> tserver.recovery.concurrent.max</td>
@@ -1200,13 +1174,29 @@
     </tr>
     <tr>
       <td><a name="tserver_replication_default_replayer" class="prop"></a> tserver.replication.default.replayer</td>
-      <td>Default AccumuloReplicationReplayer implementation<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">org.apache.accumulo.tserver.replication.BatchWriterReplicationReplayer</code></td>
+      <td>Default AccumuloReplicationReplayer implementation<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/1.9.1/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayer.html">org.apache.accumulo.tserver.replication.BatchWriterReplicationReplayer</a></td>
     </tr>
     <tr>
       <td><a name="tserver_replication_replayer_prefix" class="prop"></a> <strong>tserver.replication.replayer.</strong>*</td>
       <td>Allows configuration of implementation used to apply replicated data</td>
     </tr>
     <tr>
+      <td><a name="tserver_scan_executors_prefix" class="prop"></a> <strong>tserver.scan.executors.</strong>*</td>
+      <td>Prefix for defining executors to service scans. See <a href="/docs/2.0/administration/scan-executors">scan executors</a> for an overview of why and how to use this property. For each executor the number of threads, thread priority, and an optional prioritizer can be configured. To configure a new executor, set <code class="highlighter-rouge">tserver.scan.executors.&lt;name&gt;.threads=&lt;number&gt;</code>.  Optionally, can also set <code class="highlighter-rouge">tserver.scan. [...]
+    </tr>
+    <tr>
+      <td><a name="tserver_scan_executors_default_prioritizer" class="prop"></a> tserver.scan.executors.default.prioritizer</td>
+      <td>Prioritizer for the default scan executor.  Defaults to none which results in FIFO priority.  Set to a class that implements org.apache.accumulo.core.spi.scan.ScanPrioritizer to configure one.<br /><strong>type:</strong> STRING, <strong>zk mutable:</strong> yes, <strong>default value:</strong> empty</td>
+    </tr>
+    <tr>
+      <td><a name="tserver_scan_executors_default_threads" class="prop"></a> tserver.scan.executors.default.threads</td>
+      <td>The number of threads for the scan executor that tables use by default.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">16</code></td>
+    </tr>
+    <tr>
+      <td><a name="tserver_scan_executors_meta_threads" class="prop"></a> tserver.scan.executors.meta.threads</td>
+      <td>The number of threads for the metadata table scan executor.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">8</code></td>
+    </tr>
+    <tr>
       <td><a name="tserver_scan_files_open_max" class="prop"></a> tserver.scan.files.open.max</td>
       <td>Maximum total RFiles that all tablets in a tablet server can open for scans. <br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes but requires restart of the tserver, <strong>default value:</strong> <code class="highlighter-rouge">100</code></td>
     </tr>
@@ -1240,11 +1230,11 @@
     </tr>
     <tr>
       <td><a name="tserver_summary_partition_threads" class="prop"></a> tserver.summary.partition.threads</td>
-      <td>Summary data must be retrieved from RFiles.  For a large number of RFiles, the files are broken into partitions of 100K files.  This setting determines how many of these groups of 100K RFiles will be processed concurrently.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">10</code></td>
+      <td>Summary data must be retrieved from RFiles. For a large number of RFiles, the files are broken into partitions of 100K files. This setting determines how many of these groups of 100K RFiles will be processed concurrently.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">10</code></td>
     </tr>
     <tr>
       <td><a name="tserver_summary_remote_threads" class="prop"></a> tserver.summary.remote.threads</td>
-      <td>For a partitioned group of 100K RFiles, those files are grouped by tablet server.  Then a remote tablet server is asked to gather summary data.  This setting determines how many concurrent request are made per partition.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">128</code></td>
+      <td>For a partitioned group of 100K RFiles, those files are grouped by tablet server. Then a remote tablet server is asked to gather summary data. This setting determines how many concurrent request are made per partition.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">128</code></td>
     </tr>
     <tr>
       <td><a name="tserver_summary_retrieval_threads" class="prop"></a> tserver.summary.retrieval.threads</td>
@@ -1284,15 +1274,15 @@
     </tr>
     <tr>
       <td><a name="tserver_walog_maximum_wait_duration" class="prop"></a> tserver.walog.maximum.wait.duration</td>
-      <td>The maximum amount of time to wait after a failure to create a write-ahead log.<br /><strong>type:</strong> TIMEDURATION, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">5m</code></td>
+      <td>The maximum amount of time to wait after a failure to create or write a write-ahead log.<br /><strong>type:</strong> TIMEDURATION, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">5m</code></td>
     </tr>
     <tr>
       <td><a name="tserver_walog_tolerated_creation_failures" class="prop"></a> tserver.walog.tolerated.creation.failures</td>
-      <td>The maximum number of failures tolerated when creating a new write-ahead log within the period specified by tserver.walog.failures.period. Exceeding this number of failures in the period causes the TabletServer to exit.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">50</code></td>
+      <td>The maximum number of failures tolerated when creating a new write-ahead log. Negative values will allow unlimited creation failures. Exceeding this number of failures consecutively trying to create a new write-ahead log causes the TabletServer to exit.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">50</code></td>
     </tr>
     <tr>
       <td><a name="tserver_walog_tolerated_wait_increment" class="prop"></a> tserver.walog.tolerated.wait.increment</td>
-      <td>The amount of time to wait between failures to create a WALog.<br /><strong>type:</strong> TIMEDURATION, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">1000ms</code></td>
+      <td>The amount of time to wait between failures to create or write a write-ahead log.<br /><strong>type:</strong> TIMEDURATION, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">1000ms</code></td>
     </tr>
     <tr>
       <td><a name="tserver_workq_threads" class="prop"></a> tserver.workq.threads</td>
diff --git a/docs/2.0/administration/replication.html b/docs/2.0/administration/replication.html
index 253b94c..1a1ebdf 100644
--- a/docs/2.0/administration/replication.html
+++ b/docs/2.0/administration/replication.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/getting-started/shell.html b/docs/2.0/administration/scan-executors.html
similarity index 70%
copy from docs/2.0/getting-started/shell.html
copy to docs/2.0/administration/scan-executors.html
index 8728490..252c9ee 100644
--- a/docs/2.0/getting-started/shell.html
+++ b/docs/2.0/administration/scan-executors.html
@@ -25,7 +25,7 @@
 <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs/jq-2.2.3/dt-1.10.12/datatables.min.css">
 <link href="/css/accumulo.css" rel="stylesheet" type="text/css">
 
-<title>Accumulo Documentation - Accumulo Shell</title>
+<title>Accumulo Documentation - Scan Executors</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>
@@ -163,12 +163,12 @@
           
             <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">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsegetting-started" aria-expanded="false" aria-controls="collapsegetting-started">
                   Getting started
                 </a>
               </h4>
             </div>
-            <div id="collapsegetting-started" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
+            <div id="collapsegetting-started" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
               <div class="panel-body">
                 
                 
@@ -241,12 +241,12 @@
           
             <div class="panel-heading" role="tab" id="headingOne">
               <h4 class="panel-title">
-                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="false" aria-controls="collapseadministration">
+                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseadministration" aria-expanded="true" aria-controls="collapseadministration">
                   Administration
                 </a>
               </h4>
             </div>
-            <div id="collapseadministration" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+            <div id="collapseadministration" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
               <div class="panel-body">
                 
                 
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
@@ -328,133 +330,122 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Getting started &nbsp;&gt;&gt;&nbsp; Accumulo Shell</p>
+    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Scan Executors</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
-      <div class="col-md-10"><h1>Accumulo Shell</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/getting-started/shell.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-10"><h1>Scan Executors</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-0/administration/scan-executors.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
-    <p>Accumulo provides a simple shell that can be used to examine the contents and
-configuration settings of tables, insert/update/delete values, and change
-configuration settings.</p>
-
-<p>The shell can be started by the following command:</p>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>accumulo shell -u [username]
+    <p>Accumulo scans operate by repeatedly fetching batches of data from a <a href="/docs/2.0/getting-started/design#tablet-server-1">tablet
+server</a>.  On the tablet server side, a thread pool fetches batches.
+In Java threads pools are called executors.  By default, a single executor per
+tablet server handles all scans in FIFO order.  For some workloads, the single
+FIFO executor is suboptimal.  For example, consider many unimportant scans
+reading lots of data mixed with a few important scans reading small amounts of
+data.  The long scans noticeably increase the latency of the short scans.
+Accumulo offers two mechanisms to help improve situations like this: multiple
+scan executors and per executor prioritizers.  Additional scan executors can
+give tables dedicated resources.  For each scan executor, an optional
+prioritizer can reorder queued work.</p>
+
+<h3 id="configuring-and-using-scan-executors">Configuring and using Scan Executors</h3>
+
+<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.0/administration/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>
+
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>tserver.scan.executors.&lt;name&gt;.threads=&lt;number&gt;
 </code></pre></div></div>
 
-<p>The shell will prompt for the corresponding password to the username specified
-and then display the following prompt:</p>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>Shell - Apache Accumulo Interactive Shell
--
-- version: 2.0.0
-- instance name: myinstance
-- instance id: 00000000-0000-0000-0000-000000000000
--
-- type 'help' for a list of available commands
--
-root@myinstance&gt;
-</code></pre></div></div>
-
-<h2 id="basic-administration">Basic Administration</h2>
-
-<p>The <code class="highlighter-rouge">tables</code> command will list all existing tables.</p>
+<p>Optionally, some of the following can be set.  The <code class="highlighter-rouge">priority</code> setting
+determines thread priority.  The <code class="highlighter-rouge">prioritizer</code> settings specifies a class that
+orders pending work.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>root@myinstance&gt; tables
-accumulo.metadata
-accumulo.root
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>tserver.scan.executors.&lt;name&gt;.priority=&lt;number 1 to 10&gt;
+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>The <code class="highlighter-rouge">createtable</code> command creates a new table.</p>
+<p>After creating an executor, configure <a href="/docs/2.0/administration/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/1.9.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>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>root@myinstance&gt; createtable mytable
-root@myinstance mytable&gt; tables
-accumulo.metadata
-accumulo.root
-mytable
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>table.scan.dispatcher=&lt;class name&gt;
 </code></pre></div></div>
 
-<p>The <code class="highlighter-rouge">deletetable</code> command deletes a table.</p>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>root@myinstance testtable&gt; deletetable testtable
-deletetable { testtable } (yes|no)? yes
-Table: [testtable] has been deleted.
-</code></pre></div></div>
-
-<p>The shell can be used to insert updates and scan tables. This is useful for inspecting tables.</p>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>root@myinstance mytable&gt; scan
-
-root@myinstance mytable&gt; insert row1 colf colq value1
-insert successful
+<p>Scan dispatcher options can be set with properties like the following.</p>
 
-root@myinstance mytable&gt; scan
-row1 colf:colq [] value1
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>table.scan.dispatcher.opts.&lt;key&gt;=&lt;value&gt;
 </code></pre></div></div>
 
-<p>The value in brackets <code class="highlighter-rouge">[]</code> would be the visibility labels. Since none were used, this is empty for this row.
-You can use the <code class="highlighter-rouge">-st</code> option to scan to see the timestamp for the cell, too.</p>
-
-<h2 id="table-maintenance">Table Maintenance</h2>
-
-<p>The <code class="highlighter-rouge">compact</code> command instructs Accumulo to schedule a compaction of the table during which
-files are consolidated and deleted entries are removed.</p>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>root@myinstance mytable&gt; compact -t mytable
-07 16:13:53,201 [shell.Shell] INFO : Compaction of table mytable started for given range
+<p>The default value for <code class="highlighter-rouge">table.scan.dispatcher</code> is <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.1/org/apache/accumulo/core/spi/scan/SimpleScanDispatcher.html">SimpleScanDispatcher</a>.
+SimpleScanDispatcher supports an <code class="highlighter-rouge">executor</code> option for choosing a scan
+executor.  If this option is not set, then SimpleScanDispatcher will dispatch
+to the scan executor named <code class="highlighter-rouge">default</code>.</p>
+
+<p>To to tie everything together, consider the following use case.</p>
+
+<ul>
+  <li>Create tables named LOW1 and LOW2 using a scan executor with a single thread.</li>
+  <li>Create a table named HIGH with a dedicated scan executor with 8 threads.</li>
+  <li>Create tables named NORM1 and NORM2 using the default scan executor.</li>
+  <li>Set the default executor to 4 threads.</li>
+</ul>
+
+<p>The following shell commands implement this use case.</p>
+
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>createtable LOW1
+createtable LOW2
+createtable HIGH
+createtable NORM1
+createtable NORM2
+config -s tserver.scan.executors.default.threads=4
+config -s tserver.scan.executors.low.threads=1
+config -s tserver.scan.executors.high.threads=8
 </code></pre></div></div>
 
-<p>If needed, the compaction can be canceled using <code class="highlighter-rouge">compact --cancel -t mytable</code>.</p>
+<p>Tablet servers should be restarted after configuring scan executors, then tables can be configured.</p>
 
-<p>The <code class="highlighter-rouge">flush</code> command instructs Accumulo to write all entries currently in memory for a given table
-to disk.</p>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>root@myinstance mytable&gt; flush -t mytable
-07 16:14:19,351 [shell.Shell] INFO : Flush of table mytable
-initiated...
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>config -t LOW1 -s table.scan.dispatcher.opts.executor=low
+config -t LOW2 -s table.scan.dispatcher.opts.executor=low
+config -t HIGH -s table.scan.dispatcher.opts.executor=high
 </code></pre></div></div>
 
-<h2 id="user-administration">User Administration</h2>
-
-<p>The Shell can be used to add, remove, and grant privileges to users.</p>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>root@myinstance mytable&gt; createuser bob
-Enter new password for 'bob': *********
-Please confirm new password for 'bob': *********
+<p>While not necessary because its the default, it would be safer to also set
+<code class="highlighter-rouge">table.scan.dispatcher=org.apache.accumulo.core.spi.scan.SimpleScanDispatcher</code>
+for each table.  This ensures things work as expected in the case where
+<code class="highlighter-rouge">table.scan.dispatcher</code> was set at the system or namespace level.</p>
 
-root@myinstance mytable&gt; authenticate bob
-Enter current password for 'bob': *********
-Valid
+<h3 id="configuring-and-using-scan-prioritizers">Configuring and using Scan Prioritizers.</h3>
 
-root@myinstance mytable&gt; grant System.CREATE_TABLE -s -u bob
+<p>When all scan executor threads are busy, incoming work is queued.  By
+default this queue has a FIFO order.  A <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.1/org/apache/accumulo/core/spi/scan/ScanPrioritizer.html">ScanPrioritizer</a> can be configured to
+reorder the queue.  Accumulo ships with the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.1/org/apache/accumulo/core/spi/scan/IdleRatioScanPrioritizer.html">IdleRatioScanPrioritizer</a> which
+orders the queue by the ratio of run time to idle time.  For example, a scan
+with a run time of 50ms and an idle time of 200ms would have a ratio of .25.
+If .25 were the lowest ratio on the queue, then it would be the next in line.
+The following configures the IdleRatioScanPrioritizer for the <code class="highlighter-rouge">default</code> scan
+executor.</p>
 
-root@myinstance mytable&gt; user bob
-Enter current password for 'bob': *********
-
-bob@myinstance mytable&gt; userpermissions
-System permissions: System.CREATE_TABLE
-Table permissions (accumulo.metadata): Table.READ
-Table permissions (mytable): NONE
-
-bob@myinstance mytable&gt; createtable bobstable
-
-bob@myinstance bobstable&gt;
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>tserver.scan.executors.default.prioritizer=org.apache.accumulo.core.spi.scan.IdleRatioScanPrioritizer
+</code></pre></div></div>
 
-bob@myinstance bobstable&gt; user root
-Enter current password for 'root': *********
+<p>Using the IdleRatioScanPrioritizer in a test with 50 long running scans and 5
+threads repeatedly doing small random lookups made a significant difference.
+In this test the average lookup time for the 5 threads went from 250ms to 5 ms.</p>
 
-root@myinstance bobstable&gt; revoke System.CREATE_TABLE -s -u bob
-</code></pre></div></div>
 
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/getting-started/shell.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/scan-executors.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/administration/ssl.html b/docs/2.0/administration/ssl.html
index 0e52159..6b0f21b 100644
--- a/docs/2.0/administration/ssl.html
+++ b/docs/2.0/administration/ssl.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/administration/tracing.html b/docs/2.0/administration/tracing.html
index 83f6ba9..0c0ff66 100644
--- a/docs/2.0/administration/tracing.html
+++ b/docs/2.0/administration/tracing.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/administration/upgrading.html b/docs/2.0/administration/upgrading.html
index 583a78e..94ab2c5 100644
--- a/docs/2.0/administration/upgrading.html
+++ b/docs/2.0/administration/upgrading.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/development/client-properties.html b/docs/2.0/development/client-properties.html
index d6ee794..889a651 100644
--- a/docs/2.0/development/client-properties.html
+++ b/docs/2.0/development/client-properties.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/development/development_tools.html b/docs/2.0/development/development_tools.html
index 62bfa0d..2f72955 100644
--- a/docs/2.0/development/development_tools.html
+++ b/docs/2.0/development/development_tools.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/development/high_speed_ingest.html b/docs/2.0/development/high_speed_ingest.html
index c5a0fa4..feba8c0 100644
--- a/docs/2.0/development/high_speed_ingest.html
+++ b/docs/2.0/development/high_speed_ingest.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
@@ -407,7 +409,7 @@ zy
 zz
 </code></pre></div></div>
 
-<p>Run the MapReduce job, using the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.1/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html">AccumuloFileOutputFormat</a> to create the files to
+<p>Run the MapReduce job, using the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.1/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html">AccumuloFileOutputFormat</a> to create the files to
 be introduced to Accumulo. Once this is complete, the files can be added to
 Accumulo via the shell:</p>
 
@@ -444,7 +446,7 @@ import file.</p>
 
 <p>It is possible to efficiently write many mutations to Accumulo in parallel via a
 MapReduce job.  Typically, a MapReduce job will process data that lives in HDFS
-and write mutations to Accumulo using <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.1/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html">AccumuloOutputFormat</a>. For more information
+and write mutations to Accumulo using <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.1/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html">AccumuloOutputFormat</a>. For more information
 on how use to use MapReduce with Accumulo, see the <a href="/docs/2.0/development/mapreduce">MapReduce documentation</a>
 and the <a href="https://github.com/apache/accumulo-examples/blob/master/docs/mapred.md">MapReduce example code</a>.</p>
 
diff --git a/docs/2.0/development/iterators.html b/docs/2.0/development/iterators.html
index 780ab69..199080e 100644
--- a/docs/2.0/development/iterators.html
+++ b/docs/2.0/development/iterators.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/development/mapreduce.html b/docs/2.0/development/mapreduce.html
index d5dd200..68c30ff 100644
--- a/docs/2.0/development/mapreduce.html
+++ b/docs/2.0/development/mapreduce.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
@@ -340,7 +342,7 @@
 
     <p>Accumulo tables can be used as the source and destination of MapReduce jobs. To
 use an Accumulo table with a MapReduce job, configure the job parameters to use
-the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.1/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html">AccumuloInputFormat</a> and <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.1/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html">AccumuloOutputFormat</a>. Accumulo specific parameters
+the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.1/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html">AccumuloInputFormat</a> and <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.1/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html">AccumuloOutputFormat</a>. Accumulo specific parameters
 can be set via these two format classes to do the following:</p>
 
 <ul>
@@ -352,7 +354,7 @@ can be set via these two format classes to do the following:</p>
 <h2 id="mapper-and-reducer-classes">Mapper and Reducer classes</h2>
 
 <p>To read from an Accumulo table create a Mapper with the following class
-parameterization and be sure to configure the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.1/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html">AccumuloInputFormat</a>.</p>
+parameterization and be sure to configure the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.1/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html">AccumuloInputFormat</a>.</p>
 
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">class</span> <span class="nc">MyMapper</span> <span class="kd">extends</span> <span class="n">Mapper</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span><span class="n">Value</span><span class="o">,</span><span class="n">WritableComparable</span><span class="o">,</span><span class="n">Writable</span><span class="o">&gt;</span> <span class="o">{</span>
     <span class="kd">public</span> <span class="kt">void</span> <span class="nf">map</span><span class="o">(</span><span class="n">Key</span> <span class="n">k</span><span class="o">,</span> <span class="n">Value</span> <span class="n">v</span><span class="o">,</span> <span class="n">Context</span> <span class="n">c</span><span class="o">)</span> <span class="o">{</span>
@@ -362,7 +364,7 @@ parameterization and be sure to configure the <a href="https://static.javadoc.io
 </code></pre></div></div>
 
 <p>To write to an Accumulo table, create a Reducer with the following class
-parameterization and be sure to configure the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.1/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html">AccumuloOutputFormat</a>. The key
+parameterization and be sure to configure the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.1/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html">AccumuloOutputFormat</a>. The key
 emitted from the Reducer identifies the table to which the mutation is sent. This
 allows a single Reducer to write to more than one table if desired. A default table
 can be configured using the AccumuloOutputFormat, in which case the output table
@@ -379,7 +381,7 @@ name does not have to be passed to the Context object within the Reducer.</p>
 
 <p>The Text object passed as the output should contain the name of the table to which
 this mutation should be applied. The Text can be null in which case the mutation
-will be applied to the default table name specified in the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.1/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html">AccumuloOutputFormat</a>
+will be applied to the default table name specified in the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.1/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html">AccumuloOutputFormat</a>
 options.</p>
 
 <h2 id="accumuloinputformat-options">AccumuloInputFormat options</h2>
@@ -419,7 +421,7 @@ options.</p>
 
 <h2 id="accumulomultitableinputformat-options">AccumuloMultiTableInputFormat options</h2>
 
-<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.1/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.html">AccumuloMultiTableInputFormat</a> allows the scanning over multiple tables
+<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.1/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.html">AccumuloMultiTableInputFormat</a> allows the scanning over multiple tables
 in a single MapReduce job. Separate ranges, columns, and iterators can be
 used for each table.</p>
 
diff --git a/docs/2.0/development/proxy.html b/docs/2.0/development/proxy.html
index 751037a..f658c72 100644
--- a/docs/2.0/development/proxy.html
+++ b/docs/2.0/development/proxy.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/development/sampling.html b/docs/2.0/development/sampling.html
index 5e70ac7..86269c5 100644
--- a/docs/2.0/development/sampling.html
+++ b/docs/2.0/development/sampling.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
@@ -386,8 +388,8 @@ information.</p>
 To see how to do this, look at the example iterator referenced in the <a href="https://github.com/apache/accumulo-examples/blob/master/docs/sample.md">sampling example</a>.
 Also, consult the javadoc on <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.1/org/apache/accumulo/core/iterators/IteratorEnvironment.html#cloneWithSamplingEnabled--">IteratorEnvironment.cloneWithSamplingEnabled()</a>.</p>
 
-<p>Map reduce jobs using the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.1/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html">AccumuloInputFormat</a> can also read sample data.  See
-the javadoc for the <code class="highlighter-rouge">setSamplerConfiguration()</code> method of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.1/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html">AccumuloInputFormat</a>.</p>
+<p>Map reduce jobs using the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.1/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html">AccumuloInputFormat</a> can also read sample data.  See
+the javadoc for the <code class="highlighter-rouge">setSamplerConfiguration()</code> method of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.1/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html">AccumuloInputFormat</a>.</p>
 
 <p>Scans over sample data will throw a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.1/org/apache/accumulo/core/client/SampleNotPresentException.html">SampleNotPresentException</a> in the following cases :</p>
 
@@ -404,7 +406,7 @@ generated with the same configuration.</p>
 
 <p>When generating rfiles to bulk import into Accumulo, those rfiles can contain
 sample data.  To use this feature, look at the javadoc of the <code class="highlighter-rouge">setSampler(...)</code>
-method of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.1/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html">AccumuloFileOutputFormat</a>.</p>
+method of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.1/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html">AccumuloFileOutputFormat</a>.</p>
 
 
 
diff --git a/docs/2.0/development/security.html b/docs/2.0/development/security.html
index e6e6b6e..e317d61 100644
--- a/docs/2.0/development/security.html
+++ b/docs/2.0/development/security.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/development/summaries.html b/docs/2.0/development/summaries.html
index dc458aa..22f7933 100644
--- a/docs/2.0/development/summaries.html
+++ b/docs/2.0/development/summaries.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
@@ -355,10 +357,9 @@ for this to be fast the, summary information should fit in cache.  There is a
 dedicated cache for summary data on each tserver with a configurable size.  In
 order for summary data to fit in cache, it should probably be small.</p>
 
-<p>For information on writing a custom summarizer see the javadoc for
-<code class="highlighter-rouge">org.apache.accumulo.core.client.summary.Summarizer</code>.  The package
-<code class="highlighter-rouge">org.apache.accumulo.core.client.summary.summarizers</code> contains summarizer
-implementations that ship with Accumulo and can be configured for use.</p>
+<p>For information on writing a custom summarizer see the javadoc of the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.1/org/apache/accumulo/core/client/summary/Summarizer.html">Summarizer</a>
+class. The package <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.1/org/apache/accumulo/core/client/summary/summarizers/package-summary.html">org.apache.accumulo.core.client.summary.summarizers</a>
+contains summarizer implementations that ship with Accumulo and can be configured for use.</p>
 
 <h2 id="inaccuracies">Inaccuracies</h2>
 
@@ -399,11 +400,10 @@ requires a special permission.  User must have the table permission
 
 <h2 id="bulk-import">Bulk import</h2>
 
-<p>When generating rfiles to bulk import into Accumulo, those rfiles can contain
+<p>When generating RFiles to bulk import into Accumulo, those RFiles can contain
 summary data.  To use this feature, look at the javadoc on the
-<code class="highlighter-rouge">AccumuloFileOutputFormat.setSummarizers(...)</code> method.  Also,
-<code class="highlighter-rouge">org.apache.accumulo.core.client.rfile.RFile</code> has options for creating RFiles
-with embedded summary data.</p>
+<code class="highlighter-rouge">AccumuloFileOutputFormat.setSummarizers(...)</code> method.  Also, the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.1/org/apache/accumulo/core/client/rfile/RFile.html">RFile</a>
+class has options for creating RFiles with embedded summary data.</p>
 
 <h2 id="examples">Examples</h2>
 
diff --git a/docs/2.0/getting-started/clients.html b/docs/2.0/getting-started/clients.html
index 12e7f99..b7ce117 100644
--- a/docs/2.0/getting-started/clients.html
+++ b/docs/2.0/getting-started/clients.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/getting-started/design.html b/docs/2.0/getting-started/design.html
index 5c21cde..b59b1b9 100644
--- a/docs/2.0/getting-started/design.html
+++ b/docs/2.0/getting-started/design.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/getting-started/quick-install.html b/docs/2.0/getting-started/quick-install.html
index 449f5e6..91613c3 100644
--- a/docs/2.0/getting-started/quick-install.html
+++ b/docs/2.0/getting-started/quick-install.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/getting-started/shell.html b/docs/2.0/getting-started/shell.html
index 8728490..58d8422 100644
--- a/docs/2.0/getting-started/shell.html
+++ b/docs/2.0/getting-started/shell.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/getting-started/table_configuration.html b/docs/2.0/getting-started/table_configuration.html
index 3b3ad14..60e4a72 100644
--- a/docs/2.0/getting-started/table_configuration.html
+++ b/docs/2.0/getting-started/table_configuration.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
@@ -752,7 +754,7 @@ 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 DefaultCompactionStrategy. 
+<p>The default behavior of major compactions is defined in the class <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/1.9.1/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategy.html">DefaultCompactionStrategy</a>.
 This behavior can be changed by overriding <a href="/docs/2.0/administration/properties#table_majc_compaction_strategy">table.majc.compaction.strategy</a> with a fully
 qualified class name.</p>
 
@@ -762,11 +764,10 @@ qualified class name.</p>
 </code></pre></div></div>
 
 <p>Accumulo provides a few classes that can be used as an alternative compaction strategy. These classes are located in the 
-<code class="highlighter-rouge">org.apache.accumulo.tserver.compaction.*</code> package. <code class="highlighter-rouge">EverythingCompactionStrategy</code> will simply compact all files. This is the 
-strategy used by the user <code class="highlighter-rouge">compact</code> command. <code class="highlighter-rouge">SizeLimitCompactionStrategy</code> compacts files no bigger than the limit set in the
-property <code class="highlighter-rouge">table.majc.compaction.strategy.opts.sizeLimit</code>.</p>
+<a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/1.9.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/1.9.1/org/apache/accumulo/tserver/compaction/EverythingCompactionStrategy.html">EverythingCompactionStrategy</a>
+will simply compact all files. This is the strategy used by the user <code class="highlighter-rouge">compact</code> command. <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/1.9.1/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.html">SizeLimitCompactionStrategy</a> compacts files no bigger than the limit set in the property <code class="highlighter-rouge">table.majc.compaction.strategy.opts.sizeLimit</code>.</p>
 
-<p><code class="highlighter-rouge">TwoTierCompactionStrategy</code> is a hybrid compaction strategy that supports two types of compression. If the total size of 
+<p><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/1.9.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.0/administration/properties#table_file_compress_type">table.file.compress.type</a> to <code class="highlighter-rouge">snappy</code> 
diff --git a/docs/2.0/getting-started/table_design.html b/docs/2.0/getting-started/table_design.html
index fec10c5..4482e16 100644
--- a/docs/2.0/getting-started/table_design.html
+++ b/docs/2.0/getting-started/table_design.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/troubleshooting/advanced.html b/docs/2.0/troubleshooting/advanced.html
index aec69e0..6685789 100644
--- a/docs/2.0/troubleshooting/advanced.html
+++ b/docs/2.0/troubleshooting/advanced.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/troubleshooting/basic.html b/docs/2.0/troubleshooting/basic.html
index 40302d2..9b22e66 100644
--- a/docs/2.0/troubleshooting/basic.html
+++ b/docs/2.0/troubleshooting/basic.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/troubleshooting/performance.html b/docs/2.0/troubleshooting/performance.html
index 19ad771..ee3cda6 100644
--- a/docs/2.0/troubleshooting/performance.html
+++ b/docs/2.0/troubleshooting/performance.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/troubleshooting/system-metadata-tables.html b/docs/2.0/troubleshooting/system-metadata-tables.html
index 2013302..02947d8 100644
--- a/docs/2.0/troubleshooting/system-metadata-tables.html
+++ b/docs/2.0/troubleshooting/system-metadata-tables.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/docs/2.0/troubleshooting/tools.html b/docs/2.0/troubleshooting/tools.html
index b640092..9b732e3 100644
--- a/docs/2.0/troubleshooting/tools.html
+++ b/docs/2.0/troubleshooting/tools.html
@@ -274,6 +274,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                
               </div>
             </div>
           
diff --git a/feed.xml b/feed.xml
index aa818f2..d916faf 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>Tue, 10 Jul 2018 16:06:42 -0400</pubDate>
-    <lastBuildDate>Tue, 10 Jul 2018 16:06:42 -0400</lastBuildDate>
+    <pubDate>Wed, 11 Jul 2018 12:36:21 -0400</pubDate>
+    <lastBuildDate>Wed, 11 Jul 2018 12:36:21 -0400</lastBuildDate>
     <generator>Jekyll v3.7.3</generator>
     
     
diff --git a/search_data.json b/search_data.json
index 9f25585..2420e04 100644
--- a/search_data.json
+++ b/search_data.json
@@ -51,7 +51,7 @@
   
     "docs-2-0-administration-properties": {
       "title": "Server Properties",
-      "content"	 : "Below are properties set in accumulo-site.xml or the Accumulo shell that configure Accumulo servers (i.e tablet server, master, etc):            Property      Description                   gc.*      Properties in this category affect the behavior of the accumulo garbage collector.               gc.cycle.delay      Time between garbage collection cycles. In each cycle, old RFiles or write-ahead logs no longer in use are removed from the filesystem.type: TIMEDURATION, z [...]
+      "content"	 : "Below are properties set in accumulo-site.xml or the Accumulo shell that configure Accumulo servers (i.e tablet server, master, etc):            Property      Description                   gc.*      Properties in this category affect the behavior of the accumulo garbage collector.               gc.cycle.delay      Time between garbage collection cycles. In each cycle, old RFiles or write-ahead logs no longer in use are removed from the filesystem.type: TIMEDURATION, z [...]
       "url": " /docs/2.0/administration/properties",
       "categories": "administration"
     },
@@ -63,6 +63,13 @@
       "categories": "administration"
     },
   
+    "docs-2-0-administration-scan-executors": {
+      "title": "Scan Executors",
+      "content"	 : "Accumulo scans operate by repeatedly fetching batches of data from a tabletserver.  On the tablet server side, a thread pool fetches batches.In Java threads pools are called executors.  By default, a single executor pertablet server handles all scans in FIFO order.  For some workloads, the singleFIFO executor is suboptimal.  For example, consider many unimportant scansreading lots of data mixed with a few important scans reading small amounts ofdata.  The long scans n [...]
+      "url": " /docs/2.0/administration/scan-executors",
+      "categories": "administration"
+    },
+  
     "docs-2-0-administration-ssl": {
       "title": "SSL",
       "content"	 : "Accumulo, through Thrift’s TSSLTransport, provides the ability to encryptwire communication between Accumulo servers and clients using securesockets layer (SSL). SSL certificates signed by the same certificate authoritycontrol the “circle of trust” in which a secure connection can be established.Typically, each host running Accumulo processes would be given a certificatewhich identifies itself.Clients can optionally also be given a certificate, when client-auth is ena [...]
@@ -142,7 +149,7 @@
   
     "docs-2-0-development-summaries": {
       "title": "Summary Statistics",
-      "content"	 : "OverviewAccumulo has the ability to generate summary statistics about data in a tableusing user defined functions.  Currently these statistics are only generated fordata written to files.  Data recently written to Accumulo that is still inmemory will not contribute to summary statistics.This feature can be used to inform a user about what data is in their table.Summary statistics can also be used by compaction strategies to make decisionsabout which files to compact.S [...]
+      "content"	 : "OverviewAccumulo has the ability to generate summary statistics about data in a tableusing user defined functions.  Currently these statistics are only generated fordata written to files.  Data recently written to Accumulo that is still inmemory will not contribute to summary statistics.This feature can be used to inform a user about what data is in their table.Summary statistics can also be used by compaction strategies to make decisionsabout which files to compact.S [...]
       "url": " /docs/2.0/development/summaries",
       "categories": "development"
     },
@@ -177,7 +184,7 @@
   
     "docs-2-0-getting-started-table-configuration": {
       "title": "Table Configuration",
-      "content"	 : "Accumulo tables have a few options that can be configured to alter the defaultbehavior of Accumulo as well as improve performance based on the data stored.These include locality groups, constraints, bloom filters, iterators, and blockcache.  See the configuration properties documentation fora complete list of available configuration options.Locality GroupsAccumulo supports storing sets of column families separately on disk to allowclients to efficiently scan over colu [...]
+      "content"	 : "Accumulo tables have a few options that can be configured to alter the defaultbehavior of Accumulo as well as improve performance based on the data stored.These include locality groups, constraints, bloom filters, iterators, and blockcache.  See the configuration properties documentation fora complete list of available configuration options.Locality GroupsAccumulo supports storing sets of column families separately on disk to allowclients to efficiently scan over colu [...]
       "url": " /docs/2.0/getting-started/table_configuration",
       "categories": "getting-started"
     },