accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwa...@apache.org
Subject [accumulo-website] branch asf-site updated: Jekyll build from master:9ce0c29
Date Wed, 21 Feb 2018 16:00:28 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/asf-site by this push:
     new f26a8c9  Jekyll build from master:9ce0c29
f26a8c9 is described below

commit f26a8c92e06c2e0daade4d9230b2c0e67c03b995
Author: Mike Walch <mwalch@apache.org>
AuthorDate: Wed Feb 21 11:00:12 2018 -0500

    Jekyll build from master:9ce0c29
    
    ACCUMULO-4784 Updating docs with Connector builder (#56)
---
 docs/2.0/administration/caching.html               |   4 +-
 .../administration/configuration-management.html   |  24 +-
 docs/2.0/administration/fate.html                  |   4 +-
 docs/2.0/administration/in-depth-install.html      |  32 +--
 docs/2.0/administration/kerberos.html              |  21 +-
 docs/2.0/administration/monitoring-metrics.html    |   4 +-
 docs/2.0/administration/multivolume.html           |   4 +-
 docs/2.0/administration/properties.html            |  86 +++---
 docs/2.0/administration/replication.html           |   4 +-
 docs/2.0/administration/ssl.html                   |  26 +-
 docs/2.0/administration/tracing.html               |  15 +-
 docs/2.0/administration/upgrading.html             |   4 +-
 ...gh_speed_ingest.html => client-properties.html} | 303 +++++++++++++--------
 docs/2.0/development/development_tools.html        |  14 +-
 docs/2.0/development/high_speed_ingest.html        |   4 +-
 docs/2.0/development/iterators.html                |   4 +-
 docs/2.0/development/mapreduce.html                |  34 +--
 docs/2.0/development/proxy.html                    |   6 +-
 docs/2.0/development/sampling.html                 |   4 +-
 docs/2.0/development/security.html                 |  10 +-
 docs/2.0/development/summaries.html                |   4 +-
 docs/2.0/getting-started/clients.html              | 244 ++++++++++-------
 docs/2.0/getting-started/design.html               |   4 +-
 docs/2.0/getting-started/quick-install.html        |   4 +-
 docs/2.0/getting-started/shell.html                |   4 +-
 docs/2.0/getting-started/table_configuration.html  |   4 +-
 docs/2.0/getting-started/table_design.html         |   4 +-
 docs/2.0/troubleshooting/advanced.html             |   4 +-
 docs/2.0/troubleshooting/basic.html                |   4 +-
 docs/2.0/troubleshooting/performance.html          |   4 +-
 .../troubleshooting/system-metadata-tables.html    |   4 +-
 docs/2.0/troubleshooting/tools.html                |   4 +-
 feed.xml                                           |   4 +-
 33 files changed, 533 insertions(+), 366 deletions(-)

diff --git a/docs/2.0/administration/caching.html b/docs/2.0/administration/caching.html
index bb9eaa7..a2eb9bd 100644
--- a/docs/2.0/administration/caching.html
+++ b/docs/2.0/administration/caching.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
diff --git a/docs/2.0/administration/configuration-management.html b/docs/2.0/administration/configuration-management.html
index 3f46dcc..dd6b2af 100644
--- a/docs/2.0/administration/configuration-management.html
+++ b/docs/2.0/administration/configuration-management.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
@@ -336,9 +338,17 @@
       <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/configuration-management.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
-    <h2 id="setting-configuration">Setting Configuration</h2>
+    <p>Configuration is managed differently for Accumulo clients and servers.</p>
+
+<h2 id="client-configuration">Client Configuration</h2>
+
+<p>Accumulo clients are configured when <a href="/docs/2.0/getting-started/clients#connecting">the Connector is built</a> using builder methods or <code class="highlighter-rouge">accumulo-client.properties</code>
+which is configured using <a href="/docs/2.0/development/client-properties">client properties</a>.</p>
+
+<h2 id="server-configuration">Server Configuration</h2>
 
-<p>Accumulo is configured using <a href="/docs/2.0/administration/properties">properties</a> whose values can be set in the following locations (with increasing precedence):</p>
+<p>Accumulo services (i.e master, tablet server, monitor, etc) are configured using <a href="/docs/2.0/administration/properties">server properties</a> whose values can be
+set in the following locations (with increasing precedence):</p>
 
 <ol>
   <li>Default values</li>
@@ -352,19 +362,19 @@
 
 <h3 id="default-values">Default values</h3>
 
-<p>All <a href="/docs/2.0/administration/properties">properties</a> have a default value that is listed for each property on the <a href="/docs/2.0/administration/properties">properties</a> page. Default values are set in the source code.
+<p>All <a href="/docs/2.0/administration/properties">server properties</a> have a default value that is listed for each property on the <a href="/docs/2.0/administration/properties">properties</a> page. Default values are set in the source code.
 While default values have the lowest precedence, they are usually optimal.  However, there are cases where a change can increase query and ingest performance.</p>
 
 <h3 id="accumulo-sitexml">accumulo-site.xml</h3>
 
-<p>Setting <a href="/docs/2.0/administration/properties">properties</a> in accumulo-site.xml will override their default value. If you are running Accumulo on a cluster, any updates to accumulo-site.xml must
+<p>Setting <a href="/docs/2.0/administration/properties">server properties</a> in accumulo-site.xml will override their default value. If you are running Accumulo on a cluster, any updates to accumulo-site.xml must
 be synced across the cluster. Accumulo processes (master, tserver, etc) read their local accumulo-site.xml on start up so processes must be restarted to apply changes.
 Certain properties can only be set in accumulo-site.xml. These properties have <strong>zk mutable: no</strong> in their description. Setting properties in accumulo-site.xml allows you
 to configure tablet servers with different settings.</p>
 
 <h3 id="zookeeper">Zookeeper</h3>
 
-<p>Many <a href="/docs/2.0/administration/properties">properties</a> can be set in Zookeeper using the Accumulo API or shell. These properties can identified by <strong>zk mutable: yes</strong> in their description on
+<p>Many <a href="/docs/2.0/administration/properties">server properties</a> can be set in Zookeeper using the Accumulo API or shell. These properties can identified by <strong>zk mutable: yes</strong> in their description on
 the <a href="/docs/2.0/administration/properties">properties page</a>. Zookeeper properties can be applied on a per-table or system-wide basis. Per-table properties take precedence over system-wide
 properties. While most properties set in Zookeeper take effect immediately, some require a restart of the process which is indicated in <strong>zk mutable</strong> section
 of their description.</p>
@@ -405,7 +415,7 @@ are two areas in which there aren’t any fail safes built into the API that can
 <p>While these properties have the ability to add some much needed dynamic configuration tools, use cases which might fall
 into these warnings should be reconsidered.</p>
 
-<h2 id="viewing-configuration">Viewing Configuration</h2>
+<h2 id="viewing-server-configuration">Viewing Server Configuration</h2>
 
 <p>Accumulo’s current configuration can be viewed in the shell using the <code class="highlighter-rouge">config</code> command.</p>
 
diff --git a/docs/2.0/administration/fate.html b/docs/2.0/administration/fate.html
index 8bf7fef..2f0a125 100644
--- a/docs/2.0/administration/fate.html
+++ b/docs/2.0/administration/fate.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
diff --git a/docs/2.0/administration/in-depth-install.html b/docs/2.0/administration/in-depth-install.html
index 3de61a4..97d05f7 100644
--- a/docs/2.0/administration/in-depth-install.html
+++ b/docs/2.0/administration/in-depth-install.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
@@ -689,29 +691,11 @@ will expect the KeyStore in the same location.</p>
 
 <h3 id="client-configuration">Client Configuration</h3>
 
-<p>In version 1.6.0, Accumulo included a new type of configuration file known as a client
-configuration file. One problem with the traditional “site.xml” file that is prevalent
-through Hadoop is that it is a single file used by both clients and servers. This makes
-it very difficult to protect secrets that are only meant for the server processes while
-allowing the clients to connect to the servers.</p>
-
-<p>The client configuration file is a subset of the information stored in accumulo-site.xml
-meant only for consumption by clients of Accumulo. By default, Accumulo checks a number
-of locations for a client configuration by default:</p>
-
-<ul>
-  <li><code class="highlighter-rouge">/path/to/accumulo/conf/client.conf</code></li>
-  <li><code class="highlighter-rouge">/etc/accumulo/client.conf</code></li>
-  <li><code class="highlighter-rouge">/etc/accumulo/conf/client.conf</code></li>
-  <li><code class="highlighter-rouge">~/.accumulo/config</code></li>
-</ul>
-
-<p>These files are <a href="https://en.wikipedia.org/wiki/.properties">Java Properties files</a>. These files
-can currently contain information about ZooKeeper servers, RPC properties (such as SSL or SASL
-connectors), distributed tracing properties. Valid properties are defined by the <a href="https://github.com/apache/accumulo/blob/f1d0ec93d9f13ff84844b5ac81e4a7b383ced467/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java#L54">ClientProperty</a>
-enum contained in the client API.</p>
+<p>Accumulo clients are configured in a different way than Accumulo servers. Clients are
+configured when <a href="/docs/2.0/getting-started/clients#connecting">an Accumulo Connnector is created</a> using Java builder methods
+or a <code class="highlighter-rouge">accumulo-client.properties</code> file containing <a href="/docs/2.0/development/client-properties">client properties</a>.</p>
 
-<h4 id="custom-table-tags">Custom Table Tags</h4>
+<h3 id="custom-table-tags">Custom Table Tags</h3>
 
 <p>Accumulo has the ability for users to add custom tags to tables.  This allows
 applications to set application-level metadata about a table.  These tags can be
@@ -725,7 +709,7 @@ very sensitive to an excessive number of nodes and the sizes of the nodes. Appli
 which leverage the user of custom properties should take these warnings into
 consideration. There is no enforcement of these warnings via the API.</p>
 
-<h4 id="configuring-the-classloader">Configuring the ClassLoader</h4>
+<h3 id="configuring-the-classloader">Configuring the ClassLoader</h3>
 
 <p>Accumulo builds its Java classpath in <code class="highlighter-rouge">accumulo-env.sh</code>.  After an Accumulo application has started, it will load classes from the locations
 specified in the deprecated <a href="/docs/2.0/administration/properties#general_classpaths">general.classpaths</a> property. Additionally, Accumulo will load classes from the locations specified in the
diff --git a/docs/2.0/administration/kerberos.html b/docs/2.0/administration/kerberos.html
index c668cac..677dfd3 100644
--- a/docs/2.0/administration/kerberos.html
+++ b/docs/2.0/administration/kerberos.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
@@ -723,17 +725,15 @@ Valid starting       Expires              Service principal
 
 <h4 id="configuration">Configuration</h4>
 
-<p>The second thing clients need to do is to set up their client configuration file. By
-default, this file is stored in <code class="highlighter-rouge">~/.accumulo/config</code> or <code class="highlighter-rouge">/path/to/accumulo/client.conf</code>.
-Accumulo utilities also allow you to provide your own copy of this file in any location
-using the <code class="highlighter-rouge">--config-file</code> command line option.</p>
-
-<p>Three items need to be set to enable access to Accumulo:</p>
+<p>The second thing clients need to do is to configure kerberos when an Accumulo Connector is
+created.  This can be done using Connector builder methods or by setting the properties
+below in <code class="highlighter-rouge">accumulo-client.properties</code> which can be provided to Accumulo utilities using
+the <code class="highlighter-rouge">--config-file</code> command line option.</p>
 
 <ul>
-  <li><code class="highlighter-rouge">instance.rpc.sasl.enabled</code>=<em>true</em></li>
-  <li><code class="highlighter-rouge">rpc.sasl.qop</code>=<em>auth</em></li>
-  <li><code class="highlighter-rouge">kerberos.server.primary</code>=<em>accumulo</em></li>
+  <li><a href="/docs/2.0/development/client-properties#sasl_enabled">sasl.enabled</a> = true</li>
+  <li><a href="/docs/2.0/development/client-properties#sasl_qop">sasl.qop</a> = auth</li>
+  <li><a href="/docs/2.0/development/client-properties#sasl_kerberos_server_primary">sasl.kerberos.server.primary</a> = accumulo</li>
 </ul>
 
 <p>Each of these properties <em>must</em> match the configuration of the accumulo servers; this is
@@ -979,6 +979,7 @@ when I attempt to use the “Recent Traces” page on the Monitor UI I get a sta
 <p>Ensure you have set <code class="highlighter-rouge">trace.token.property.keytab</code> to point to a keytab for the principal defined in <code class="highlighter-rouge">trace.user</code> in the <code class="highlighter-rouge">accumulo-site.xml</code> file for the Monitor, since that should work in all versions of Accumulo.</p>
 
 
+
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
       <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/kerberos.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
diff --git a/docs/2.0/administration/monitoring-metrics.html b/docs/2.0/administration/monitoring-metrics.html
index 0e56d84..80fa622 100644
--- a/docs/2.0/administration/monitoring-metrics.html
+++ b/docs/2.0/administration/monitoring-metrics.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
diff --git a/docs/2.0/administration/multivolume.html b/docs/2.0/administration/multivolume.html
index a08aaa0..a6a6d5a 100644
--- a/docs/2.0/administration/multivolume.html
+++ b/docs/2.0/administration/multivolume.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
diff --git a/docs/2.0/administration/properties.html b/docs/2.0/administration/properties.html
index 1a1bad6..418da91 100644
--- a/docs/2.0/administration/properties.html
+++ b/docs/2.0/administration/properties.html
@@ -25,7 +25,7 @@
 <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs/jq-2.2.3/dt-1.10.12/datatables.min.css">
 <link href="/css/accumulo.css" rel="stylesheet" type="text/css">
 
-<title>Accumulo Documentation - Configuration Properties</title>
+<title>Accumulo Documentation - Server Properties</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>
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
@@ -326,18 +328,20 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Configuration Properties</p>
+    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Server Properties</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.8/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
-      <div class="col-md-10"><h1>Configuration Properties</h1></div>
+      <div class="col-md-10"><h1>Server Properties</h1></div>
       <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/properties.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <!-- WARNING: Do not edit this file. It is a generated file that is copied from Accumulo build (from core/target/generated-docs) -->
 
+<p>Below are properties set in <code class="highlighter-rouge">accumulo-site.xml</code> or the Accumulo shell that configure Accumulo servers (i.e tablet server, master, etc):</p>
+
 <table>
   <thead>
     <tr>
@@ -352,11 +356,11 @@
     </tr>
     <tr>
       <td><a name="gc_cycle_delay" class="prop"></a> gc.cycle.delay</td>
-      <td>Time between garbage collection cycles. In each cycle, old files no longer in use are removed from the filesystem.<br /><strong>type:</strong> TIMEDURATION, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">5m</code></td>
+      <td>Time between garbage collection cycles. In each cycle, old RFiles or write-ahead logs no longer in use are removed from the filesystem.<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="gc_cycle_start" class="prop"></a> gc.cycle.start</td>
-      <td>Time to wait before attempting to garbage collect any old files.<br /><strong>type:</strong> TIMEDURATION, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">30s</code></td>
+      <td>Time to wait before attempting to garbage collect any old RFiles or write-ahead logs.<br /><strong>type:</strong> TIMEDURATION, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">30s</code></td>
     </tr>
     <tr>
       <td><a name="gc_file_archive" class="prop"></a> gc.file.archive</td>
@@ -368,7 +372,7 @@
     </tr>
     <tr>
       <td><a name="gc_threads_delete" class="prop"></a> gc.threads.delete</td>
-      <td>The number of threads used to delete files<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">16</code></td>
+      <td>The number of threads used to delete RFiles and write-ahead logs<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="gc_trace_percent" class="prop"></a> gc.trace.percent</td>
@@ -528,11 +532,11 @@
     </tr>
     <tr>
       <td><a name="master_bulk_retries" class="prop"></a> master.bulk.retries</td>
-      <td>The number of attempts to bulk-load a file before giving up.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">3</code></td>
+      <td>The number of attempts to bulk import a RFile before giving up.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">3</code></td>
     </tr>
     <tr>
       <td><a name="master_bulk_threadpool_size" class="prop"></a> master.bulk.threadpool.size</td>
-      <td>The number of threads to use when coordinating a bulk-import.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">5</code></td>
+      <td>The number of threads to use when coordinating a bulk import.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">5</code></td>
     </tr>
     <tr>
       <td><a name="master_bulk_timeout" class="prop"></a> master.bulk.timeout</td>
@@ -544,11 +548,11 @@
     </tr>
     <tr>
       <td><a name="master_fate_threadpool_size" class="prop"></a> master.fate.threadpool.size</td>
-      <td>The number of threads used to run FAult-Tolerant Executions. These are primarily table operations like merge.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">4</code></td>
+      <td>The number of threads used to run fault-tolerant executions (FATE). These are primarily table operations like merge.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">4</code></td>
     </tr>
     <tr>
       <td><a name="master_lease_recovery_interval" class="prop"></a> master.lease.recovery.interval</td>
-      <td>The amount of time to wait after requesting a WAL file to be recovered<br /><strong>type:</strong> TIMEDURATION, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">5s</code></td>
+      <td>The amount of time to wait after requesting a write-ahead log to be recovered<br /><strong>type:</strong> TIMEDURATION, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">5s</code></td>
     </tr>
     <tr>
       <td><a name="master_metadata_suspendable" class="prop"></a> master.metadata.suspendable</td>
@@ -604,7 +608,7 @@
     </tr>
     <tr>
       <td><a name="master_walog_closer_implementation" class="prop"></a> master.walog.closer.implementation</td>
-      <td>A class that implements a mechansim to steal write access to a file<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> <code class="highlighter-rouge">org.apache.accumulo.server.master.recovery.HadoopLogCloser</code></td>
     </tr>
     <tr>
       <td><a name="monitor_prefix" class="prop"></a> <strong>monitor.</strong>*</td>
@@ -832,7 +836,7 @@
     </tr>
     <tr>
       <td><a name="table_bloom_load_threshold" class="prop"></a> table.bloom.load.threshold</td>
-      <td>This number of seeks that would actually use a bloom filter must occur before a file’s bloom filter is loaded. Set this to zero to initiate loading of bloom filters when a file is opened.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">1</code></td>
+      <td>This number of seeks that would actually use a bloom filter must occur before a RFile’s bloom filter is loaded. Set this to zero to initiate loading of bloom filters when a RFile is opened.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">1</code></td>
     </tr>
     <tr>
       <td><a name="table_bloom_size" class="prop"></a> table.bloom.size</td>
@@ -840,11 +844,11 @@
     </tr>
     <tr>
       <td><a name="table_cache_block_enable" class="prop"></a> table.cache.block.enable</td>
-      <td>Determines whether file block cache is enabled.<br /><strong>type:</strong> BOOLEAN, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">false</code></td>
+      <td>Determines whether data block cache is enabled for a table.<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="table_cache_index_enable" class="prop"></a> table.cache.index.enable</td>
-      <td>Determines whether index cache is enabled.<br /><strong>type:</strong> BOOLEAN, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">true</code></td>
+      <td>Determines whether index block cache is enabled for a table.<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="table_classpath_context" class="prop"></a> table.classpath.context</td>
@@ -852,11 +856,11 @@
     </tr>
     <tr>
       <td><a name="table_compaction_major_everything_idle" class="prop"></a> table.compaction.major.everything.idle</td>
-      <td>After a tablet has been idle (no mutations) for this time period it may have all of its files compacted into one. There is no guarantee an idle tablet will be compacted. Compactions of idle tablets are only started when regular compactions are not running. Idle compactions only take place for tablets that have one or more files.<br /><strong>type:</strong> TIMEDURATION, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">1h</code></td>
+      <td>After a tablet has been idle (no mutations) for this time period it may have all of its RFiles compacted into one. There is no guarantee an idle tablet will be compacted. Compactions of idle tablets are only started when regular compactions are not running. Idle compactions only take place for tablets that have one or more RFiles.<br /><strong>type:</strong> TIMEDURATION, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">1h</code></td>
     </tr>
     <tr>
       <td><a name="table_compaction_major_ratio" class="prop"></a> table.compaction.major.ratio</td>
-      <td>minimum ratio of total input size to maximum input file size for running a major compactionWhen adjusting this property you may want to also adjust table.file.max. Want to avoid the situation where only merging minor compactions occur.<br /><strong>type:</strong> FRACTION, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">3</code></td>
+      <td>Minimum ratio of total input size to maximum input RFile size for running a major compaction. When adjusting this property you may want to also adjust table.file.max. Want to avoid the situation where only merging minor compactions occur.<br /><strong>type:</strong> FRACTION, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">3</code></td>
     </tr>
     <tr>
       <td><a name="table_compaction_minor_idle" class="prop"></a> table.compaction.minor.idle</td>
@@ -868,7 +872,7 @@
     </tr>
     <tr>
       <td><a name="table_compaction_minor_merge_file_size_max" class="prop"></a> table.compaction.minor.merge.file.size.max</td>
-      <td>The max file size used for a merging minor compaction. The default value of 0 disables a max file size.<br /><strong>type:</strong> BYTES, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">0</code></td>
+      <td>The max RFile size used for a merging minor compaction. The default value of 0 disables a max file size.<br /><strong>type:</strong> BYTES, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">0</code></td>
     </tr>
     <tr>
       <td><a name="table_constraint_prefix" class="prop"></a> <strong>table.constraint.</strong>*</td>
@@ -888,31 +892,31 @@
     </tr>
     <tr>
       <td><a name="table_file_blocksize" class="prop"></a> table.file.blocksize</td>
-      <td>Overrides the hadoop dfs.block.size setting so that files have better query performance. The maximum value for this is 2147483647<br /><strong>type:</strong> BYTES, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">0B</code></td>
+      <td>The HDFS block size used when writing RFiles. When set to 0B, the value/defaults of HDFS property ‘dfs.block.size’ will be used.<br /><strong>type:</strong> BYTES, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">0B</code></td>
     </tr>
     <tr>
       <td><a name="table_file_compress_blocksize" class="prop"></a> table.file.compress.blocksize</td>
-      <td>Similar to the hadoop io.seqfile.compress.blocksize setting, so that files have better query performance. The maximum value for this is 2147483647. (This setting is the size threshold prior to compression, and applies even compression is disabled.)<br /><strong>type:</strong> BYTES, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">100K</code></td>
+      <td>The maximum size of data blocks in RFiles before they are compressed and written.<br /><strong>type:</strong> BYTES, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">100K</code></td>
     </tr>
     <tr>
       <td><a name="table_file_compress_blocksize_index" class="prop"></a> table.file.compress.blocksize.index</td>
-      <td>Determines how large index blocks can be in files that support multilevel indexes. The maximum value for this is 2147483647. (This setting is the size threshold prior to compression, and applies even compression is disabled.)<br /><strong>type:</strong> BYTES, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">128K</code></td>
+      <td>The maximum size of index blocks in RFiles before they are compressed and written.<br /><strong>type:</strong> BYTES, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">128K</code></td>
     </tr>
     <tr>
       <td><a name="table_file_compress_type" class="prop"></a> table.file.compress.type</td>
-      <td>One of 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: 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>
-      <td>Determines the max # of files each tablet in a table can have. When adjusting this property you may want to consider adjusting table.compaction.major.ratio also. Setting this property to 0 will make it default to tserver.scan.files.open.max-1, this will prevent a tablet from having more files than can be opened. Setting this property low may throttle ingest and increase query performance.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value [...]
+      <td>The maximum number of RFiles each tablet in a table can have. When adjusting this property you may want to consider adjusting table.compaction.major.ratio also. Setting this property to 0 will make it default to tserver.scan.files.open.max-1, this will prevent a tablet from having more RFiles than can be opened. Setting this property low may throttle ingest and increase query performance.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value [...]
     </tr>
     <tr>
       <td><a name="table_file_replication" class="prop"></a> table.file.replication</td>
-      <td>Determines how many replicas to keep of a tables’ files in HDFS. When this value is LTE 0, HDFS defaults are used.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">0</code></td>
+      <td>The number of replicas for a table’s RFiles in HDFS. When set to 0, HDFS defaults are 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="table_file_summary_maxSize" class="prop"></a> table.file.summary.maxSize</td>
-      <td>The maximum size summary that will be stored. The number of files that had summary data exceeding this threshold is reported by Summary.getFileStatistics().getLarge().  When adjusting this consider the expected number files 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>
@@ -968,7 +972,7 @@
     </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 files without sample data.<br /><strong>type:</strong> CLASSNAME, <st [...]
+      <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 [...]
     </tr>
     <tr>
       <td><a name="table_sampler_opt_prefix" class="prop"></a> <strong>table.sampler.opt.</strong>*</td>
@@ -988,7 +992,7 @@
     </tr>
     <tr>
       <td><a name="table_split_threshold" class="prop"></a> table.split.threshold</td>
-      <td>When combined size of files exceeds this amount a tablet is split.<br /><strong>type:</strong> BYTES, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">1G</code></td>
+      <td>A tablet is split when the combined size of RFiles exceeds this amount.<br /><strong>type:</strong> BYTES, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">1G</code></td>
     </tr>
     <tr>
       <td><a name="table_summarizer_prefix" class="prop"></a> <strong>table.summarizer.</strong>*</td>
@@ -1064,15 +1068,15 @@
     </tr>
     <tr>
       <td><a name="tserver_bulk_assign_threads" class="prop"></a> tserver.bulk.assign.threads</td>
-      <td>The master delegates bulk file processing and assignment to tablet servers. After the bulk file has been processed, the tablet server will assign the file to the appropriate tablets on all servers. This property controls the number of threads used to communicate to the other servers.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">1</code></td>
+      <td>The master delegates bulk import RFile processing and assignment to tablet servers. After file has been processed, the tablet server will assign the file to the appropriate tablets on all servers. This property controls the number of threads used to communicate to the other servers.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">1</code></td>
     </tr>
     <tr>
       <td><a name="tserver_bulk_process_threads" class="prop"></a> tserver.bulk.process.threads</td>
-      <td>The master will task a tablet server with pre-processing a bulk file prior to assigning it to the appropriate tablet servers. This configuration value controls the number of threads used to process the files.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">1</code></td>
+      <td>The master will task a tablet server with pre-processing a bulk import RFile prior to assigning it to the appropriate tablet servers. This configuration value controls the number of threads used to process the files.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">1</code></td>
     </tr>
     <tr>
       <td><a name="tserver_bulk_retry_max" class="prop"></a> tserver.bulk.retry.max</td>
-      <td>The number of times the tablet server will attempt to assign a file to a tablet as it migrates and splits.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">5</code></td>
+      <td>The number of times the tablet server will attempt to assign a RFile to a tablet as it migrates and splits.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">5</code></td>
     </tr>
     <tr>
       <td><a name="tserver_bulk_timeout" class="prop"></a> tserver.bulk.timeout</td>
@@ -1080,11 +1084,11 @@
     </tr>
     <tr>
       <td><a name="tserver_cache_data_size" class="prop"></a> tserver.cache.data.size</td>
-      <td>Specifies the size of the cache for file data blocks.<br /><strong>type:</strong> MEMORY, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">10%</code></td>
+      <td>Specifies the size of the cache for RFile data blocks.<br /><strong>type:</strong> MEMORY, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">10%</code></td>
     </tr>
     <tr>
       <td><a name="tserver_cache_index_size" class="prop"></a> tserver.cache.index.size</td>
-      <td>Specifies the size of the cache for file indices.<br /><strong>type:</strong> MEMORY, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">25%</code></td>
+      <td>Specifies the size of the cache for RFile index blocks.<br /><strong>type:</strong> MEMORY, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">25%</code></td>
     </tr>
     <tr>
       <td><a name="tserver_cache_manager_class" class="prop"></a> tserver.cache.manager.class</td>
@@ -1108,7 +1112,7 @@
     </tr>
     <tr>
       <td><a name="tserver_compaction_major_thread_files_open_max" class="prop"></a> tserver.compaction.major.thread.files.open.max</td>
-      <td>Max number of files a major compaction thread can open at once. <br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">10</code></td>
+      <td>Max number of RFiles a major compaction thread can open at once. <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_compaction_major_throughput" class="prop"></a> tserver.compaction.major.throughput</td>
@@ -1140,7 +1144,7 @@
     </tr>
     <tr>
       <td><a name="tserver_files_open_idle" class="prop"></a> tserver.files.open.idle</td>
-      <td>Tablet servers leave previously used files open for future queries. This setting determines how much time an unused file should be kept open until it is closed.<br /><strong>type:</strong> TIMEDURATION, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">1m</code></td>
+      <td>Tablet servers leave previously used RFiles open for future queries. This setting determines how much time an unused RFile should be kept open until it is closed.<br /><strong>type:</strong> TIMEDURATION, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">1m</code></td>
     </tr>
     <tr>
       <td><a name="tserver_hold_time_max" class="prop"></a> tserver.hold.time.max</td>
@@ -1204,7 +1208,7 @@
     </tr>
     <tr>
       <td><a name="tserver_scan_files_open_max" class="prop"></a> tserver.scan.files.open.max</td>
-      <td>Maximum total files 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>
+      <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>
     <tr>
       <td><a name="tserver_server_message_size_max" class="prop"></a> tserver.server.message.size.max</td>
@@ -1236,11 +1240,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 files.  For a large number of files, the files are broken into partitions of 100K files.  This setting determines how many of these groups of 100K files 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 files, 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>
@@ -1248,7 +1252,7 @@
     </tr>
     <tr>
       <td><a name="tserver_tablet_split_midpoint_files_max" class="prop"></a> tserver.tablet.split.midpoint.files.max</td>
-      <td>To find a tablets split points, all index files are opened. This setting determines how many index files can be opened at once. When there are more index files than this setting multiple passes must be made, which is slower. However opening too many files at once can cause problems.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">300</code></td>
+      <td>To find a tablets split points, all RFiles are opened and their indexes are read. This setting determines how many RFiles can be opened at once. When there are more RFiles than this setting multiple passes must be made, which is slower. However opening too many RFiles at once can cause problems.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">300</code></td>
     </tr>
     <tr>
       <td><a name="tserver_total_mutation_queue_max" class="prop"></a> tserver.total.mutation.queue.max</td>
@@ -1280,11 +1284,11 @@
     </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 WAL file.<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 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 WAL file 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 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>
     </tr>
     <tr>
       <td><a name="tserver_walog_tolerated_wait_increment" class="prop"></a> tserver.walog.tolerated.wait.increment</td>
@@ -1292,7 +1296,7 @@
     </tr>
     <tr>
       <td><a name="tserver_workq_threads" class="prop"></a> tserver.workq.threads</td>
-      <td>The number of threads for the distributed work queue. These threads are used for copying failed bulk files.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">2</code></td>
+      <td>The number of threads for the distributed work queue. These threads are used for copying failed bulk import RFiles.<br /><strong>type:</strong> COUNT, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">2</code></td>
     </tr>
   </tbody>
 </table>
diff --git a/docs/2.0/administration/replication.html b/docs/2.0/administration/replication.html
index e08dd50..5e61c52 100644
--- a/docs/2.0/administration/replication.html
+++ b/docs/2.0/administration/replication.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
diff --git a/docs/2.0/administration/ssl.html b/docs/2.0/administration/ssl.html
index dc68135..35e38df 100644
--- a/docs/2.0/administration/ssl.html
+++ b/docs/2.0/administration/ssl.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
@@ -381,24 +383,22 @@ their own certificate.</p>
 <h2 id="client-configuration">Client configuration</h2>
 
 <p>To establish a connection to Accumulo servers, each client must also have
-special configuration. This is typically accomplished through the use of
-the client configuration file whose default location is <code class="highlighter-rouge">~/.accumulo/config</code>.</p>
-
-<p>The following properties must be set to connect to an Accumulo instance using SSL:</p>
+special configuration. This is typically accomplished by <a href="/docs/2.0/getting-started/clients#connecting">creating Accumulo
+clients</a> using <code class="highlighter-rouge">accumulo-client.properties</code> and setting the following
+the properties to connect to an Accumulo instance using SSL:</p>
 
 <ul>
-  <li><a href="/docs/2.0/administration/properties#rpc_javax_net_ssl_trustStore">rpc.javax.net.ssl.trustStore</a> = <em>The path on the local filesystem to the keystore containing the certificate authority’s public key</em></li>
-  <li><a href="/docs/2.0/administration/properties#rpc_javax_net_ssl_trustStorePassword">rpc.javax.net.ssl.trustStorePassword</a> = <em>The password for the keystore containing the certificate authority’s public key</em></li>
-  <li><a href="/docs/2.0/administration/properties#instance_rpc_ssl_enabled">instance.rpc.ssl.enabled</a> = <em>true</em></li>
+  <li><a href="/docs/2.0/development/client-properties#ssl_enabled">ssl.enabled</a> to <code class="highlighter-rouge">true</code></li>
+  <li><a href="/docs/2.0/development/client-properties#ssl_truststore_path">ssl.truststore.path</a></li>
+  <li><a href="/docs/2.0/development/client-properties#ssl_truststore_password">ssl.truststore.password</a></li>
 </ul>
 
-<p>If two-way SSL if enabled (<code class="highlighter-rouge">instance.rpc.ssl.clientAuth=true</code>) for the instance, the client must also define
-their own certificate and enable client authenticate as well.</p>
+<p>If two-way SSL is enabled for the Accumulo instance (by setting <a href="/docs/2.0/administration/properties#instance_rpc_ssl_clientAuth">instance.rpc.ssl.clientAuth</a> to <code class="highlighter-rouge">true</code> in <code class="highlighter-rouge">accumulo-site.xml</code>),
+Accumulo clients must also define their own certificate by setting the following properties:</p>
 
 <ul>
-  <li><a href="/docs/2.0/administration/properties#rpc_javax_net_ssl_keyStore">rpc.javax.net.ssl.keyStore</a> =<em>The path on the local filesystem to the keystore containing the server’s certificate</em></li>
-  <li><a href="/docs/2.0/administration/properties#rpc_javax_net_ssl_keyStorePassword">rpc.javax.net.ssl.keyStorePassword</a> = <em>The password for the keystore containing the server’s certificate</em></li>
-  <li><a href="/docs/2.0/administration/properties#instance_rpc_ssl_clientAuth">instance.rpc.ssl.clientAuth</a> = <em>true</em></li>
+  <li><a href="/docs/2.0/development/client-properties#ssl_keystore_path">ssl.keystore.path</a></li>
+  <li><a href="/docs/2.0/development/client-properties#ssl_keystore_password">ssl.keystore.password</a></li>
 </ul>
 
 <h2 id="generating-ssl-material-using-openssl">Generating SSL material using OpenSSL</h2>
diff --git a/docs/2.0/administration/tracing.html b/docs/2.0/administration/tracing.html
index e7bb784..7439227 100644
--- a/docs/2.0/administration/tracing.html
+++ b/docs/2.0/administration/tracing.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
@@ -404,10 +406,9 @@ tracer.queue.size - max queue size (default 5000)
 tracer.span.min.ms - minimum span length to store (in ms, default 1)
 </code></pre></div></div>
 
-<p>Note that to configure an Accumulo client for tracing, including
-the Accumulo shell, the client configuration must be given the same
-<a href="/docs/2.0/administration/properties#trace_span_receivers">trace.span.receivers</a>, <a href="/docs/2.0/administration/properties#trace_span_receiver_prefix">trace.span.receiver.*</a>, and <a href="/docs/2.0/administration/properties#trace_zookeeper_path">trace.zookeeper.path</a>
-properties as the servers have.</p>
+<p>To configure an Accumulo client for tracing, set <a href="/docs/2.0/development/client-properties#trace_span_receivers">trace.span.receivers</a> and <a href="/docs/2.0/development/client-properties#trace_zookeeper_path">trace.zookeeper.path</a>
+in <code class="highlighter-rouge">accumulo-client.properties</code>. Also, any <a href="/docs/2.0/administration/properties#trace_span_receiver_prefix">trace.span.receiver.*</a> properties set in <code class="highlighter-rouge">accumulo-site.xml</code> should be set in
+<code class="highlighter-rouge">accumulo-client.properties</code>.</p>
 
 <p>Hadoop can also be configured to send traces to Accumulo, as of
 Hadoop 2.6.0, by setting properties in Hadoop’s core-site.xml
@@ -485,7 +486,7 @@ this is easily done by adding to your client’s pom.xml (taking care to specify
 </code></pre></div>    </div>
   </li>
   <li>
-    <p>Add the following to your client configuration.</p>
+    <p>Add the following to your <code class="highlighter-rouge">accumulo-client.properties</code>.</p>
 
     <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> trace.span.receivers=org.apache.accumulo.tracer.ZooTraceClient,org.apache.htrace.impl.ZipkinSpanReceiver
 </code></pre></div>    </div>
@@ -496,7 +497,7 @@ this is easily done by adding to your client’s pom.xml (taking care to specify
 </ol>
 
 <p>Your SpanReceiver may require additional properties, and if so these should likewise
-be placed in the ClientConfiguration (if applicable) and Accumulo’s <code class="highlighter-rouge">accumulo-site.xml</code>.
+be placed in <code class="highlighter-rouge">accumulo-client.properties</code> (if applicable) and Accumulo’s <code class="highlighter-rouge">accumulo-site.xml</code>.
 Two such properties for ZipkinSpanReceiver, listed with their default values, are</p>
 
 <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;property&gt;</span>
diff --git a/docs/2.0/administration/upgrading.html b/docs/2.0/administration/upgrading.html
index bc577ce..0a06f0e 100644
--- a/docs/2.0/administration/upgrading.html
+++ b/docs/2.0/administration/upgrading.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
diff --git a/docs/2.0/development/high_speed_ingest.html b/docs/2.0/development/client-properties.html
similarity index 69%
copy from docs/2.0/development/high_speed_ingest.html
copy to docs/2.0/development/client-properties.html
index 6008e08..454768f 100644
--- a/docs/2.0/development/high_speed_ingest.html
+++ b/docs/2.0/development/client-properties.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 - High-Speed Ingest</title>
+<title>Accumulo Documentation - Client Properties</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>
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
@@ -326,131 +328,200 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Development &nbsp;&gt;&gt;&nbsp; High-Speed Ingest</p>
+    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Development &nbsp;&gt;&gt;&nbsp; Client Properties</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.8/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
-      <div class="col-md-10"><h1>High-Speed Ingest</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/development/high_speed_ingest.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-10"><h1>Client Properties</h1></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/development/client-properties.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
-    <p>Accumulo is often used as part of a larger data processing and storage system. To
-maximize the performance of a parallel system involving Accumulo, the ingestion
-and query components should be designed to provide enough parallelism and
-concurrency to avoid creating bottlenecks for users and other systems writing to
-and reading from Accumulo. There are several ways to achieve high ingest
-performance.</p>
-
-<h2 id="pre-splitting-new-tables">Pre-Splitting New Tables</h2>
-
-<p>New tables consist of a single tablet by default. As mutations are applied, the table
-grows and splits into multiple tablets which are balanced by the Master across
-TabletServers. This implies that the aggregate ingest rate will be limited to fewer
-servers than are available within the cluster until the table has reached the point
-where there are tablets on every TabletServer.</p>
-
-<p>Pre-splitting a table ensures that there are as many tablets as desired available
-before ingest begins to take advantage of all the parallelism possible with the cluster
-hardware. Tables can be split at any time by using the shell:</p>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>user@myinstance mytable&gt; addsplits -sf /local_splitfile -t mytable
-</code></pre></div></div>
-
-<p>For the purposes of providing parallelism to ingest it is not necessary to create more
-tablets than there are physical machines within the cluster as the aggregate ingest
-rate is a function of the number of physical machines. Note that the aggregate ingest
-rate is still subject to the number of machines running ingest clients, and the
-distribution of rowIDs across the table. The aggregation ingest rate will be
-suboptimal if there are many inserts into a small number of rowIDs.</p>
-
-<h2 id="multiple-ingest-clients">Multiple Ingest Clients</h2>
-
-<p>Accumulo is capable of scaling to very high rates of ingest, which is dependent upon
-not just the number of TabletServers in operation but also the number of ingest
-clients. This is because a single client, while capable of batching mutations and
-sending them to all TabletServers, is ultimately limited by the amount of data that
-can be processed on a single machine. The aggregate ingest rate will scale linearly
-with the number of clients up to the point at which either the aggregate I/O of
-TabletServers or total network bandwidth capacity is reached.</p>
-
-<p>In operational settings where high rates of ingest are paramount, clusters are often
-configured to dedicate some number of machines solely to running Ingester Clients.
-The exact ratio of clients to TabletServers necessary for optimum ingestion rates
-will vary according to the distribution of resources per machine and by data type.</p>
-
-<h2 id="bulk-ingest">Bulk Ingest</h2>
-
-<p>Accumulo supports the ability to import files produced by an external process such
-as MapReduce into an existing table. In some cases it may be faster to load data this
-way rather than via ingesting through clients using BatchWriters. This allows a large
-number of machines to format data the way Accumulo expects. The new files can
-then simply be introduced to Accumulo via a shell command.</p>
-
-<p>To configure MapReduce to format data in preparation for bulk loading, the job
-should be set to use a range partitioner instead of the default hash partitioner. The
-range partitioner uses the split points of the Accumulo table that will receive the
-data. The split points can be obtained from the shell and used by the MapReduce
-RangePartitioner. Note that this is only useful if the existing table is already split
-into multiple tablets.</p>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>user@myinstance mytable&gt; getsplits
-aa
-ab
-ac
-...
-zx
-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.8.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>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>user@myinstance mytable&gt; importdirectory /files_dir /failures
-</code></pre></div></div>
-
-<p>Note that the paths referenced are directories within the same HDFS instance over
-which Accumulo is running. Accumulo places any files that failed to be added to the
-second directory specified.</p>
-
-<p>See the <a href="https://github.com/apache/accumulo-examples/blob/master/docs/bulkIngest.md">bulk ingest example</a> for a complete example.</p>
-
-<h2 id="logical-time-for-bulk-ingest">Logical Time for Bulk Ingest</h2>
-
-<p>Logical time is important for bulk imported data, for which the client code may
-be choosing a timestamp. At bulk import time, the user can choose to enable
-logical time for the set of files being imported. When its enabled, Accumulo
-uses a specialized system iterator to lazily set times in a bulk imported file.
-This mechanism guarantees that times set by unsynchronized multi-node
-applications (such as those running on MapReduce) will maintain some semblance
-of causal ordering. This mitigates the problem of the time being wrong on the
-system that created the file for bulk import. These times are not set when the
-file is imported, but whenever it is read by scans or compactions. At import, a
-time is obtained and always used by the specialized system iterator to set that
-time.</p>
-
-<p>The timestamp assigned by Accumulo will be the same for every key in the file.
-This could cause problems if the file contains multiple keys that are identical
-except for the timestamp. In this case, the sort order of the keys will be
-undefined. This could occur if an insert and an update were in the same bulk
-import file.</p>
-
-<h2 id="mapreduce-ingest">MapReduce Ingest</h2>
-
-<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.8.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>
-
+    <!-- WARNING: Do not edit this file. It is a generated file that is copied from Accumulo build (from core/target/generated-docs) -->
+<!-- Generated by : org.apache.accumulo.core.conf.ClientConfigGenerate$Markdown -->
+
+<p>Below are properties set in <code class="highlighter-rouge">accumulo-client.properties</code> that configure <a href="/docs/2.0/getting-started/clients#connecting">Accumulo clients</a>. All properties have been part of the API since 2.0.0 (unless otherwise specified):</p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Property</th>
+      <th>Default value</th>
+      <th>Since</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td><a name="instance_name" class="prop"></a> instance.name</td>
+      <td><em>empty</em></td>
+      <td> </td>
+      <td>Name of Accumulo instance to connect to</td>
+    </tr>
+    <tr>
+      <td><a name="instance_zookeepers" class="prop"></a> instance.zookeepers</td>
+      <td>localhost:2181</td>
+      <td> </td>
+      <td>Zookeeper connection information for Accumulo instance</td>
+    </tr>
+    <tr>
+      <td><a name="instance_zookeepers_timeout_sec" class="prop"></a> instance.zookeepers.timeout.sec</td>
+      <td>30</td>
+      <td> </td>
+      <td>Zookeeper session timeout (in seconds)</td>
+    </tr>
+    <tr>
+      <td><a name="auth_method" class="prop"></a> auth.method</td>
+      <td>password</td>
+      <td> </td>
+      <td>Authentication method (i.e password, kerberos, provider). Set more properties for chosen method below.</td>
+    </tr>
+    <tr>
+      <td><a name="auth_username" class="prop"></a> auth.username</td>
+      <td><em>empty</em></td>
+      <td> </td>
+      <td>Accumulo username/principal for chosen authentication method</td>
+    </tr>
+    <tr>
+      <td><a name="auth_kerberos_keytab_path" class="prop"></a> auth.kerberos.keytab.path</td>
+      <td><em>empty</em></td>
+      <td> </td>
+      <td>Path to Kerberos keytab</td>
+    </tr>
+    <tr>
+      <td><a name="auth_password" class="prop"></a> auth.password</td>
+      <td><em>empty</em></td>
+      <td> </td>
+      <td>Accumulo user password</td>
+    </tr>
+    <tr>
+      <td><a name="auth_provider_name" class="prop"></a> auth.provider.name</td>
+      <td><em>empty</em></td>
+      <td> </td>
+      <td>Alias used to extract Accumulo user password from CredentialProvider</td>
+    </tr>
+    <tr>
+      <td><a name="auth_provider_urls" class="prop"></a> auth.provider.urls</td>
+      <td><em>empty</em></td>
+      <td> </td>
+      <td>Comma separated list of URLs defining CredentialProvider(s)</td>
+    </tr>
+    <tr>
+      <td><a name="batch_writer_durability" class="prop"></a> batch.writer.durability</td>
+      <td>default</td>
+      <td> </td>
+      <td>Change the durability for the BatchWriter session. To use the table’s durability setting. use “default” which is the table’s durability setting.</td>
+    </tr>
+    <tr>
+      <td><a name="batch_writer_max_latency_sec" class="prop"></a> batch.writer.max.latency.sec</td>
+      <td>120</td>
+      <td> </td>
+      <td>Max amount of time (in seconds) to hold data in memory before flushing it</td>
+    </tr>
+    <tr>
+      <td><a name="batch_writer_max_memory_bytes" class="prop"></a> batch.writer.max.memory.bytes</td>
+      <td>52428800</td>
+      <td> </td>
+      <td>Max memory (in bytes) to batch before writing</td>
+    </tr>
+    <tr>
+      <td><a name="batch_writer_max_timeout_sec" class="prop"></a> batch.writer.max.timeout.sec</td>
+      <td>0</td>
+      <td> </td>
+      <td>Max amount of time (in seconds) an unresponsive server will be re-tried. An exception is thrown when this timeout is exceeded. Set to zero for no timeout.</td>
+    </tr>
+    <tr>
+      <td><a name="batch_writer_max_write_threads" class="prop"></a> batch.writer.max.write.threads</td>
+      <td>3</td>
+      <td> </td>
+      <td>Maximum number of threads to use for writing data to tablet servers.</td>
+    </tr>
+    <tr>
+      <td><a name="ssl_enabled" class="prop"></a> ssl.enabled</td>
+      <td>false</td>
+      <td> </td>
+      <td>Enable SSL for client RPC</td>
+    </tr>
+    <tr>
+      <td><a name="ssl_keystore_password" class="prop"></a> ssl.keystore.password</td>
+      <td><em>empty</em></td>
+      <td> </td>
+      <td>Password used to encrypt keystore</td>
+    </tr>
+    <tr>
+      <td><a name="ssl_keystore_path" class="prop"></a> ssl.keystore.path</td>
+      <td><em>empty</em></td>
+      <td> </td>
+      <td>Path to SSL keystore file</td>
+    </tr>
+    <tr>
+      <td><a name="ssl_keystore_type" class="prop"></a> ssl.keystore.type</td>
+      <td>jks</td>
+      <td> </td>
+      <td>Type of SSL keystore</td>
+    </tr>
+    <tr>
+      <td><a name="ssl_truststore_password" class="prop"></a> ssl.truststore.password</td>
+      <td><em>empty</em></td>
+      <td> </td>
+      <td>Password used to encrypt truststore</td>
+    </tr>
+    <tr>
+      <td><a name="ssl_truststore_path" class="prop"></a> ssl.truststore.path</td>
+      <td><em>empty</em></td>
+      <td> </td>
+      <td>Path to SSL truststore file</td>
+    </tr>
+    <tr>
+      <td><a name="ssl_truststore_type" class="prop"></a> ssl.truststore.type</td>
+      <td>jks</td>
+      <td> </td>
+      <td>Type of SSL truststore</td>
+    </tr>
+    <tr>
+      <td><a name="ssl_use_jsse" class="prop"></a> ssl.use.jsse</td>
+      <td>false</td>
+      <td> </td>
+      <td>Use JSSE system properties to configure SSL</td>
+    </tr>
+    <tr>
+      <td><a name="sasl_enabled" class="prop"></a> sasl.enabled</td>
+      <td>false</td>
+      <td> </td>
+      <td>Enable SASL for client RPC</td>
+    </tr>
+    <tr>
+      <td><a name="sasl_kerberos_server_primary" class="prop"></a> sasl.kerberos.server.primary</td>
+      <td>accumulo</td>
+      <td> </td>
+      <td>Kerberos principal/primary that Accumulo servers use to login</td>
+    </tr>
+    <tr>
+      <td><a name="sasl_qop" class="prop"></a> sasl.qop</td>
+      <td>auth</td>
+      <td> </td>
+      <td>SASL quality of protection. Valid values are ‘auth’, ‘auth-int’, and ‘auth-conf’</td>
+    </tr>
+    <tr>
+      <td><a name="trace_span_receivers" class="prop"></a> trace.span.receivers</td>
+      <td>org.apache.accumulo.tracer.ZooTraceClient</td>
+      <td> </td>
+      <td>A list of span receiver classes to send trace spans</td>
+    </tr>
+    <tr>
+      <td><a name="trace_zookeeper_path" class="prop"></a> trace.zookeeper.path</td>
+      <td>/tracers</td>
+      <td> </td>
+      <td>The zookeeper node where tracers are registered</td>
+    </tr>
+  </tbody>
+</table>
 
 
     <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/development/high_speed_ingest.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/development/client-properties.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/development/development_tools.html b/docs/2.0/development/development_tools.html
index 048688d..63b8a05 100644
--- a/docs/2.0/development/development_tools.html
+++ b/docs/2.0/development/development_tools.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
@@ -360,19 +362,19 @@ as a test dependency:</p>
 <p>To start it up, you will need to supply an empty directory and a root password as arguments:</p>
 
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">File</span> <span class="n">tempDirectory</span> <span class="o">=</span> <span class="c1">// JUnit and Guava supply mechanisms for creating temp directories</span>
-<span class="n">MiniAccumuloCluster</span> <span class="n">accumulo</span> <span class="o">=</span> <span class="k">new</span> <span class="n">MiniAccumuloCluster</span><span class="o">(</span><span class="n">tempDirectory</span><span class="o">,</span> <span class="s">"password"</span><span class="o">);</span>
-<span class="n">accumulo</span><span class="o">.</span><span class="na">start</span><span class="o">();</span>
+<span class="n">MiniAccumuloCluster</span> <span class="n">mac</span> <span class="o">=</span> <span class="k">new</span> <span class="n">MiniAccumuloCluster</span><span class="o">(</span><span class="n">tempDirectory</span><span class="o">,</span> <span class="s">"password"</span><span class="o">);</span>
+<span class="n">mac</span><span class="o">.</span><span class="na">start</span><span class="o">();</span>
 </code></pre></div></div>
 
 <p>Once we have our mini cluster running, we will want to interact with the Accumulo client API:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Instance</span> <span class="n">instance</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ZooKeeperInstance</span><span class="o">(</span><span class="n">accumulo</span><span class="o">.</span><span class="na">getInstanceName</span><span class="o">(),</span> <span class="n">accumulo</span><span class="o">.</span><span class="na">getZooKeepers</span><s [...]
-<span class="n">Connector</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">instance</span><span class="o">.</span><span class="na">getConnector</span><span class="o">(</span><span class="s">"root"</span><span class="o">,</span> <span class="k">new</span> <span class="n">PasswordToken</span><span class="o">(</span><span class="s">"password"</span><span class="o">));</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Connector</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">Connector</span><span class="o">.</span><span class="na">builder</span><span class="o">().</span><span class="na">forInstance</span><span class="o">(</span><span class="n">mac</span><span class="o">.</span><span class="na">getInstanceName</span><span class="o">(),</span> <span class="n">mac</ [...]
+                    <span class="o">.</span><span class="na">usingPassword</span><span class="o">(</span><span class="s">"root"</span><span class="o">,</span> <span class="s">"password"</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
 </code></pre></div></div>
 
 <p>Upon completion of our development code, we will want to shutdown our MiniAccumuloCluster:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">accumulo</span><span class="o">.</span><span class="na">stop</span><span class="o">();</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">mac</span><span class="o">.</span><span class="na">stop</span><span class="o">();</span>
 <span class="c1">// delete your temporary folder</span>
 </code></pre></div></div>
 
diff --git a/docs/2.0/development/high_speed_ingest.html b/docs/2.0/development/high_speed_ingest.html
index 6008e08..1ac570c 100644
--- a/docs/2.0/development/high_speed_ingest.html
+++ b/docs/2.0/development/high_speed_ingest.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
diff --git a/docs/2.0/development/iterators.html b/docs/2.0/development/iterators.html
index ff9ebfe..207c180 100644
--- a/docs/2.0/development/iterators.html
+++ b/docs/2.0/development/iterators.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
diff --git a/docs/2.0/development/mapreduce.html b/docs/2.0/development/mapreduce.html
index 0ed6334..d9c1f77 100644
--- a/docs/2.0/development/mapreduce.html
+++ b/docs/2.0/development/mapreduce.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
@@ -382,15 +384,14 @@ options.</p>
 
 <h2 id="accumuloinputformat-options">AccumuloInputFormat options</h2>
 
+<p>The following code shows how to set up Accumulo</p>
+
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Job</span> <span class="n">job</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Job</span><span class="o">(</span><span class="n">getConf</span><span class="o">());</span>
-<span class="n">AccumuloInputFormat</span><span class="o">.</span><span class="na">setInputInfo</span><span class="o">(</span><span class="n">job</span><span class="o">,</span>
-        <span class="s">"user"</span><span class="o">,</span>
-        <span class="s">"passwd"</span><span class="o">.</span><span class="na">getBytes</span><span class="o">(),</span>
-        <span class="s">"table"</span><span class="o">,</span>
-        <span class="k">new</span> <span class="nf">Authorizations</span><span class="o">());</span>
-
-<span class="n">AccumuloInputFormat</span><span class="o">.</span><span class="na">setZooKeeperInstance</span><span class="o">(</span><span class="n">job</span><span class="o">,</span> <span class="s">"myinstance"</span><span class="o">,</span>
-        <span class="s">"zooserver-one,zooserver-two"</span><span class="o">);</span>
+<span class="n">ConnectionInfo</span> <span class="n">info</span> <span class="o">=</span> <span class="n">Connector</span><span class="o">.</span><span class="na">builder</span><span class="o">().</span><span class="na">forInstance</span><span class="o">(</span><span class="s">"myinstance"</span><span class="o">,</span><span class="s">"zoo1,zoo2"</span><span class="o">)</span>
+                        <span class="o">.</span><span class="na">usingPassword</span><span class="o">(</span><span class="s">"user"</span><span class="o">,</span> <span class="s">"passwd"</span><span class="o">).</span><span class="na">info</span><span class="o">()</span>
+<span class="n">AccumuloInputFormat</span><span class="o">.</span><span class="na">setConnectionInfo</span><span class="o">(</span><span class="n">job</span><span class="o">,</span> <span class="n">info</span><span class="o">);</span>
+<span class="n">AccumuloInputFormat</span><span class="o">.</span><span class="na">setInputTableName</span><span class="o">(</span><span class="n">job</span><span class="o">,</span> <span class="n">table</span><span class="o">);</span>
+<span class="n">AccumuloInputFormat</span><span class="o">.</span><span class="na">setScanAuthorizations</span><span class="o">(</span><span class="n">job</span><span class="o">,</span> <span class="k">new</span> <span class="n">Authorizations</span><span class="o">());</span>
 </code></pre></div></div>
 
 <p><strong>Optional Settings:</strong></p>
@@ -476,17 +477,10 @@ used for each table.</p>
 
 <h2 id="accumulooutputformat-options">AccumuloOutputFormat options</h2>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kt">boolean</span> <span class="n">createTables</span> <span class="o">=</span> <span class="kc">true</span><span class="o">;</span>
-<span class="n">String</span> <span class="n">defaultTable</span> <span class="o">=</span> <span class="s">"mytable"</span><span class="o">;</span>
-
-<span class="n">AccumuloOutputFormat</span><span class="o">.</span><span class="na">setOutputInfo</span><span class="o">(</span><span class="n">job</span><span class="o">,</span>
-        <span class="s">"user"</span><span class="o">,</span>
-        <span class="s">"passwd"</span><span class="o">.</span><span class="na">getBytes</span><span class="o">(),</span>
-        <span class="n">createTables</span><span class="o">,</span>
-        <span class="n">defaultTable</span><span class="o">);</span>
-
-<span class="n">AccumuloOutputFormat</span><span class="o">.</span><span class="na">setZooKeeperInstance</span><span class="o">(</span><span class="n">job</span><span class="o">,</span> <span class="s">"myinstance"</span><span class="o">,</span>
-        <span class="s">"zooserver-one,zooserver-two"</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">ConnectionInfo</span> <span class="n">info</span> <span class="o">=</span> <span class="n">Connector</span><span class="o">.</span><span class="na">builder</span><span class="o">().</span><span class="na">forInstance</span><span class="o">(</span><span class="s">"myinstance"</span><span class="o">,</span><span class="s">"zoo1,zoo2"</span><span class="o">)</span>
+                        <span class="o">.</span><span class="na">usingPassword</span><span class="o">(</span><span class="s">"user"</span><span class="o">,</span> <span class="s">"passwd"</span><span class="o">).</span><span class="na">info</span><span class="o">()</span>
+<span class="n">AccumuloOutputFormat</span><span class="o">.</span><span class="na">setConnectionInfo</span><span class="o">(</span><span class="n">job</span><span class="o">,</span> <span class="n">info</span><span class="o">);</span>
+<span class="n">AccumuloOutputFormat</span><span class="o">.</span><span class="na">setDefaultTableName</span><span class="o">(</span><span class="n">job</span><span class="o">,</span> <span class="s">"mytable"</span><span class="o">);</span>
 </code></pre></div></div>
 
 <p><strong>Optional Settings:</strong></p>
diff --git a/docs/2.0/development/proxy.html b/docs/2.0/development/proxy.html
index 55a197e..988a41e 100644
--- a/docs/2.0/development/proxy.html
+++ b/docs/2.0/development/proxy.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
@@ -338,7 +340,7 @@
 
     <p>The proxy API allows the interaction with Accumulo with languages other than Java.
 A proxy server is provided in the codebase and a client can further be generated.
-The proxy API can also be used instead of the traditional <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/client/ZooKeeperInstance.html">ZooKeeperInstance</a> class to
+The proxy API can also be used instead of the traditional <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/client/Connector.html">Connector</a> class to
 provide a single TCP port in which clients can be securely routed through a firewall,
 without requiring access to all tablet servers in the cluster.</p>
 
diff --git a/docs/2.0/development/sampling.html b/docs/2.0/development/sampling.html
index b958e15..284425d 100644
--- a/docs/2.0/development/sampling.html
+++ b/docs/2.0/development/sampling.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
diff --git a/docs/2.0/development/security.html b/docs/2.0/development/security.html
index 9335fd3..2264ec3 100644
--- a/docs/2.0/development/security.html
+++ b/docs/2.0/development/security.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
@@ -446,13 +448,13 @@ disable the bulk import permission.</p>
 authorization, and permission handling.</p>
 
 <p>Authentication verifies the identity of a user. In Accumulo, authentication occurs when
-the <code class="highlighter-rouge">getConnector</code> method of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/client/Instance.html">Instance</a> is called with a principal (i.e username)
+the <code class="highlighter-rouge">usingToken'</code> method of the [Connector] builder is called with a principal (i.e username)
 and an <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.html">AuthenticationToken</a> which is an interface with multiple implementations. The most
 common implementation is <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/client/security/tokens/PasswordToken.html">PasswordToken</a> which is the default authentication method for Accumulo
 out of the box.</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Instance</span> <span class="n">instance</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ZooKeeperInstance</span><span class="o">(</span><span class="s">"myinstance"</span><span class="o">,</span> <span class="s">"zookeeper1,zookeeper2"</span><span class="o">);</span>
-<span class="n">Connector</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">instance</span><span class="o">.</span><span class="na">getConnector</span><span class="o">(</span><span class="s">"user"</span><span class="o">,</span> <span class="k">new</span> <span class="n">PasswordToken</span><span class="o">(</span><span class="s">"passwd"</span><span class="o">));</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Connector</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">Connector</span><span class="o">.</span><span class="na">builder</span><span class="o">().</span><span class="na">forInstance</span><span class="o">(</span><span class="s">"myinstance"</span><span class="o">,</span> <span class="s">"zookeeper1,zookeper2"</span><span class="o">)</span>
+                    <span class="o">.</span><span class="na">usingToken</span><span class="o">(</span><span class="s">"user"</span><span class="o">,</span> <span class="k">new</span> <span class="n">PasswordToken</span><span class="o">(</span><span class="s">"passwd"</span><span class="o">)).</span><span class="na">build</span><span class="o">();</span>
 </code></pre></div></div>
 
 <p>Once a user is authenticated by the Authenticator, the user has access to the other actions within
diff --git a/docs/2.0/development/summaries.html b/docs/2.0/development/summaries.html
index cfe21d9..ad02306 100644
--- a/docs/2.0/development/summaries.html
+++ b/docs/2.0/development/summaries.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
diff --git a/docs/2.0/getting-started/clients.html b/docs/2.0/getting-started/clients.html
index ac70ccd..07b2d89 100644
--- a/docs/2.0/getting-started/clients.html
+++ b/docs/2.0/getting-started/clients.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
@@ -347,96 +349,87 @@
 <span class="nt">&lt;/dependency&gt;</span>
 </code></pre></div></div>
 
-<h2 id="running-client-code">Running Client Code</h2>
+<h2 id="connecting">Connecting</h2>
 
-<p>There are multiple ways to run Java code that use Accumulo. Below is a list
-of the different ways to execute client code.</p>
+<p>Before writing Accumulo client code, you will need the following information.</p>
 
 <ul>
-  <li>build and execute an uber jar</li>
-  <li>add <code class="highlighter-rouge">accumulo classpath</code> to your Java classpath</li>
-  <li>use the <code class="highlighter-rouge">accumulo</code> command</li>
-  <li>use the <code class="highlighter-rouge">accumulo-util hadoop-jar</code> command</li>
+  <li>Accumulo instance name</li>
+  <li>Zookeeper connection string</li>
+  <li>Accumulo username &amp; password</li>
 </ul>
 
-<h3 id="build-and-execute-an-uber-jar">Build and execute an uber jar</h3>
-
-<p>If you have included <code class="highlighter-rouge">accumulo-core</code> as dependency in your pom, you can build an uber jar
-using the Maven assembly or shade plugin and use it to run Accumulo client code. When building
-an uber jar, you should set the versions of any Hadoop dependencies in your pom to match the
-version running on your cluster.</p>
-
-<h3 id="add-accumulo-classpath-to-your-java-classpath">Add ‘accumulo classpath’ to your Java classpath</h3>
-
-<p>To run Accumulo client code using the <code class="highlighter-rouge">java</code> command, use the <code class="highlighter-rouge">accumulo classpath</code> command 
-to include all of Accumulo’s dependencies on your classpath:</p>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>java -classpath /path/to/my.jar:/path/to/dep.jar:$(accumulo classpath) com.my.Main arg1 arg2
-</code></pre></div></div>
-
-<p>If you would like to review which jars are included, the <code class="highlighter-rouge">accumulo classpath</code> command can
-output a more human readable format using the <code class="highlighter-rouge">-d</code> option which enables debugging:</p>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>accumulo classpath -d
-</code></pre></div></div>
-
-<h3 id="use-the-accumulo-command">Use the accumulo command</h3>
+<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/client/Connector.html">Connector</a> object is the main entry point for Accumulo clients. It can be created using one
+of the following methods:</p>
+
+<ol>
+  <li>Using the <code class="highlighter-rouge">accumulo-client.properties</code> file (a template can be found in the <code class="highlighter-rouge">conf/</code> directory
+of the tarball distribution):
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">Connector</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">Connector</span><span class="o">.</span><span class="na">builder</span><span class="o">()</span>
+                     <span class="o">.</span><span class="na">usingProperties</span><span class="o">(</span><span class="s">"/path/to/accumulo-client.properties"</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
+</code></pre></div>    </div>
+  </li>
+  <li>Using the builder methods of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/client/Connector.html">Connector</a>:
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">Connector</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">Connector</span><span class="o">.</span><span class="na">builder</span><span class="o">().</span><span class="na">forInstance</span><span class="o">(</span><span class="s">"myinstance"</span><span class="o">,</span> <span class="s">"zookeeper1,zookeper2"</span><span class="o">)</span>
+                     <span class="o">.</span><span class="na">usingPassword</span><span class="o">(</span><span class="s">"myuser"</span><span class="o">,</span> <span class="s">"mypassword"</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
+</code></pre></div>    </div>
+  </li>
+  <li>Using a Java Properties object.
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">Properties</span> <span class="n">props</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="o">()</span>
+ <span class="n">props</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"instance.name"</span><span class="o">,</span> <span class="s">"myinstance"</span><span class="o">)</span>
+ <span class="n">props</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"instance.zookeepers"</span><span class="o">,</span> <span class="s">"zookeeper1,zookeeper2"</span><span class="o">)</span>
+ <span class="n">props</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"auth.method"</span><span class="o">,</span> <span class="s">"password"</span><span class="o">)</span>
+ <span class="n">props</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"auth.username"</span><span class="o">,</span> <span class="s">"myuser"</span><span class="o">)</span>
+ <span class="n">props</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"auth.password"</span><span class="o">,</span> <span class="s">"mypassword"</span><span class="o">)</span>
+ <span class="n">Connector</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">Connector</span><span class="o">.</span><span class="na">builder</span><span class="o">().</span><span class="na">usingProperties</span><span class="o">(</span><span class="n">props</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
+</code></pre></div>    </div>
+  </li>
+</ol>
+
+<p>If a <code class="highlighter-rouge">accumulo-client.properties</code> file or a Java Properties object is used to create a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/client/Connector.html">Connector</a>, the following
+<a href="/docs/2.0/development/client-properties">client properties</a> must be set:</p>
 
-<p>Another option for running your code is to use the Accumulo script which can execute a
-main class (if it exists on its classpath):</p>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>accumulo com.foo.Client arg1 arg2
-</code></pre></div></div>
-
-<p>While the Accumulo script will add all of Accumulo’s dependencies to the classpath, you
-will need to add any jars that your create or depend on beyond what Accumulo already
-depends on. This can be accomplished by either adding the jars to the <code class="highlighter-rouge">lib/ext</code> directory
-of your Accumulo installation or by adding jars to the CLASSPATH variable before calling
-the accumulo command.</p>
-
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>export CLASSPATH=/path/to/my.jar:/path/to/dep.jar; accumulo com.foo.Client arg1 arg2
-</code></pre></div></div>
-
-<h3 id="use-the-accumulo-util-hadoop-jar-command">Use the ‘accumulo-util hadoop-jar’ command</h3>
-
-<p>If you are writing map reduce job that accesses Accumulo, then you can use
-<code class="highlighter-rouge">accumulo-util hadoop-jar</code> to run those jobs. See the <a href="https://github.com/apache/accumulo-examples/blob/master/docs/mapred.md">MapReduce example</a>
-for more information.</p>
-
-<h2 id="connecting">Connecting</h2>
-
-<p>All clients must first identify the Accumulo instance to which they will be
-communicating. Code to do this is as follows:</p>
+<ul>
+  <li><a href="/docs/2.0/development/client-properties#instance_name">instance.name</a></li>
+  <li><a href="/docs/2.0/development/client-properties#instance_zookeepers">instance.zookeepers</a></li>
+  <li><a href="/docs/2.0/development/client-properties#auth_method">auth.method</a></li>
+  <li><a href="/docs/2.0/development/client-properties#auth_username">auth.username</a></li>
+  <li><a href="/docs/2.0/development/client-properties#auth_password">auth.password</a></li>
+</ul>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">instanceName</span> <span class="o">=</span> <span class="s">"myinstance"</span><span class="o">;</span>
-<span class="n">String</span> <span class="n">zooServers</span> <span class="o">=</span> <span class="s">"zooserver-one,zooserver-two"</span>
-<span class="n">Instance</span> <span class="n">inst</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ZooKeeperInstance</span><span class="o">(</span><span class="n">instanceName</span><span class="o">,</span> <span class="n">zooServers</span><span class="o">);</span>
+<h1 id="authentication">Authentication</h1>
+
+<p>When creating a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/client/Connector.html">Connector</a>, the user must be authenticated using one of the following
+implementations of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.html">AuthenticationToken</a> below:</p>
+
+<ol>
+  <li><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/client/security/tokens/PasswordToken.html">PasswordToken</a> is the must commonly used implementation.</li>
+  <li><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.html">CredentialProviderToken</a> leverages the Hadoop CredentialProviders (new in Hadoop 2.6).
+For example, the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.html">CredentialProviderToken</a> can be used in conjunction with a Java KeyStore to
+alleviate passwords stored in cleartext. When stored in HDFS, a single KeyStore can be used across
+an entire instance. Be aware that KeyStores stored on the local filesystem must be made available
+to all nodes in the Accumulo cluster.</li>
+  <li>
+    <p><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/client/security/tokens/KerberosToken.html">KerberosToken</a> can be provided to use the authentication provided by Kerberos. Using Kerberos
+requires external setup and additional configuration, but provides a single point of authentication
+through HDFS, YARN and ZooKeeper and allowing for password-less authentication with Accumulo.</p>
+
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">KerberosToken</span> <span class="n">token</span> <span class="o">=</span> <span class="k">new</span> <span class="n">KerberosToken</span><span class="o">();</span>
+ <span class="n">Connector</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">Connector</span><span class="o">.</span><span class="na">builder</span><span class="o">().</span><span class="na">forInstance</span><span class="o">(</span><span class="s">"myinstance"</span><span class="o">,</span> <span class="s">"zookeeper1,zookeper2"</span><span class="o">)</span>
+                     <span class="o">.</span><span class="na">usingToken</span><span class="o">(</span><span class="n">token</span><span class="o">.</span><span class="na">getPrincipal</span><span class="o">(),</span> <span class="n">token</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
+</code></pre></div>    </div>
+  </li>
+</ol>
 
-<span class="n">Connector</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">inst</span><span class="o">.</span><span class="na">getConnector</span><span class="o">(</span><span class="s">"user"</span><span class="o">,</span> <span class="k">new</span> <span class="n">PasswordToken</span><span class="o">(</span><span class="s">"passwd"</span><span class="o">));</span>
-</code></pre></div></div>
-
-<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/client/security/tokens/PasswordToken.html">PasswordToken</a> is the most common implementation of an <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.html">AuthenticationToken</a>.
-This general interface allow authentication as an Accumulo user to come from
-a variety of sources or means. The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.html">CredentialProviderToken</a> leverages the Hadoop
-CredentialProviders (new in Hadoop 2.6).</p>
+<h2 id="writing-data">Writing Data</h2>
 
-<p>For example, the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.html">CredentialProviderToken</a> can be used in conjunction with a Java
-KeyStore to alleviate passwords stored in cleartext. When stored in HDFS, a single
-KeyStore can be used across an entire instance. Be aware that KeyStores stored on
-the local filesystem must be made available to all nodes in the Accumulo cluster.</p>
+<p>With a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/client/Connector.html">Connector</a> created, it can be used to create objects (like the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/client/BatchWriter.html">BatchWriter</a>) for
+reading and writing from Accumulo:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">KerberosToken</span> <span class="n">token</span> <span class="o">=</span> <span class="k">new</span> <span class="n">KerberosToken</span><span class="o">();</span>
-<span class="n">Connector</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">inst</span><span class="o">.</span><span class="na">getConnector</span><span class="o">(</span><span class="n">token</span><span class="o">.</span><span class="na">getPrincipal</span><span class="o">(),</span> <span class="n">token</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">BatchWriter</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="s">"table"</span><span class="o">);</span>
 </code></pre></div></div>
 
-<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/client/security/tokens/KerberosToken.html">KerberosToken</a> can be provided to use the authentication provided by Kerberos.
-Using Kerberos requires external setup and additional configuration, but provides
-a single point of authentication through HDFS, YARN and ZooKeeper and allowing
-for password-less authentication with Accumulo.</p>
-
-<h2 id="writing-data">Writing Data</h2>
-
-<p>Data are written to Accumulo by creating <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/data/Mutation.html">Mutation</a> objects that represent all the
+<p>Data is written to Accumulo by creating <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/data/Mutation.html">Mutation</a> objects that represent all the
 changes to the columns of a single row. The changes are made atomically in the
 TabletServer. Clients then add Mutations to a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/client/BatchWriter.html">BatchWriter</a> which submits them to
 the appropriate TabletServers.</p>
@@ -513,25 +506,32 @@ replicas, and waiting for a permanent sync to disk can significantly write speed
 These levels are:</p>
 
 <ul>
-  <li>none: no durability guarantees are made, the WAL is not used</li>
-  <li>log: the WAL is used, but not flushed; loss of the server probably means recent writes are lost</li>
-  <li>flush: updates are written to the WAL, and flushed out to replicas; loss of a single server is unlikely to result in data loss.</li>
-  <li>sync: updates are written to the WAL, and synced to disk on all replicas before the write is acknowledge. Data will not be lost even if the entire cluster suddenly loses power.</li>
+  <li><code class="highlighter-rouge">none</code> - no durability guarantees are made, the WAL is not used</li>
+  <li><code class="highlighter-rouge">log</code> - the WAL is used, but not flushed; loss of the server probably means recent writes are lost</li>
+  <li><code class="highlighter-rouge">flush</code> - updates are written to the WAL, and flushed out to replicas; loss of a single server is unlikely to result in data loss.</li>
+  <li><code class="highlighter-rouge">sync</code> - updates are written to the WAL, and synced to disk on all replicas before the write is acknowledge. Data will not be lost even if the entire cluster suddenly loses power.</li>
 </ul>
 
-<p>The user can set the default durability of a table in the shell.  When
-writing, the user can configure the BatchWriter or ConditionalWriter to use
-a different level of durability for the session. This will override the
-default durability setting.</p>
+<p>Durability can be set in multiple ways:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">BatchWriterConfig</span> <span class="n">cfg</span> <span class="o">=</span> <span class="k">new</span> <span class="n">BatchWriterConfig</span><span class="o">();</span>
-<span class="c1">// We don't care about data loss with these writes:</span>
-<span class="c1">// This is DANGEROUS:</span>
-<span class="n">cfg</span><span class="o">.</span><span class="na">setDurability</span><span class="o">(</span><span class="n">Durability</span><span class="o">.</span><span class="na">NONE</span><span class="o">);</span>
+<ol>
+  <li>The default durability of a table can be set in the Accumulo shell</li>
+  <li>When creating a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1/org/apache/accumulo/core/client/Connector.html">Connector</a>, the default durability can be overriden using <code class="highlighter-rouge">withBatchWriterConfig()</code>
+or by setting <a href="/docs/2.0/development/client-properties#batch_writer_durability">batch.writer.durability</a> in <code class="highlighter-rouge">accumulo-client.properties</code>.</li>
+  <li>
+    <p>When a BatchWriter or ConditionalWriter is created, the durability settings above will be overriden
+by the <code class="highlighter-rouge">BatchWriterConfig</code> that is passed in.</p>
 
-<span class="n">Connection</span> <span class="n">conn</span> <span class="o">=</span> <span class="o">...</span> <span class="o">;</span>
-<span class="n">BatchWriter</span> <span class="n">bw</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="n">table</span><span class="o">,</span> <span class="n">cfg</span><span class="o">);</span>
-</code></pre></div></div>
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">BatchWriterConfig</span> <span class="n">cfg</span> <span class="o">=</span> <span class="k">new</span> <span class="n">BatchWriterConfig</span><span class="o">();</span>
+ <span class="c1">// We don't care about data loss with these writes:</span>
+ <span class="c1">// This is DANGEROUS:</span>
+ <span class="n">cfg</span><span class="o">.</span><span class="na">setDurability</span><span class="o">(</span><span class="n">Durability</span><span class="o">.</span><span class="na">NONE</span><span class="o">);</span>
+
+ <span class="n">Connection</span> <span class="n">conn</span> <span class="o">=</span> <span class="o">...</span> <span class="o">;</span>
+ <span class="n">BatchWriter</span> <span class="n">bw</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="n">table</span><span class="o">,</span> <span class="n">cfg</span><span class="o">);</span>
+</code></pre></div>    </div>
+  </li>
+</ol>
 
 <h2 id="reading-data">Reading Data</h2>
 
@@ -613,6 +613,62 @@ You may consider using the <a href="https://static.javadoc.io/org.apache.accumul
 isolation. The drawback of this approach is that entire rows are read into
 memory on the server side. If a row is too big, it may crash a tablet server.</p>
 
+<h2 id="running-client-code">Running Client Code</h2>
+
+<p>There are multiple ways to run Java code that use Accumulo. Below is a list
+of the different ways to execute client code.</p>
+
+<ul>
+  <li>build and execute an uber jar</li>
+  <li>add <code class="highlighter-rouge">accumulo classpath</code> to your Java classpath</li>
+  <li>use the <code class="highlighter-rouge">accumulo</code> command</li>
+  <li>use the <code class="highlighter-rouge">accumulo-util hadoop-jar</code> command</li>
+</ul>
+
+<h3 id="build-and-execute-an-uber-jar">Build and execute an uber jar</h3>
+
+<p>If you have included <code class="highlighter-rouge">accumulo-core</code> as dependency in your pom, you can build an uber jar
+using the Maven assembly or shade plugin and use it to run Accumulo client code. When building
+an uber jar, you should set the versions of any Hadoop dependencies in your pom to match the
+version running on your cluster.</p>
+
+<h3 id="add-accumulo-classpath-to-your-java-classpath">Add ‘accumulo classpath’ to your Java classpath</h3>
+
+<p>To run Accumulo client code using the <code class="highlighter-rouge">java</code> command, use the <code class="highlighter-rouge">accumulo classpath</code> command
+to include all of Accumulo’s dependencies on your classpath:</p>
+
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>java -classpath /path/to/my.jar:/path/to/dep.jar:$(accumulo classpath) com.my.Main arg1 arg2
+</code></pre></div></div>
+
+<p>If you would like to review which jars are included, the <code class="highlighter-rouge">accumulo classpath</code> command can
+output a more human readable format using the <code class="highlighter-rouge">-d</code> option which enables debugging:</p>
+
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>accumulo classpath -d
+</code></pre></div></div>
+
+<h3 id="use-the-accumulo-command">Use the accumulo command</h3>
+
+<p>Another option for running your code is to use the Accumulo script which can execute a
+main class (if it exists on its classpath):</p>
+
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>accumulo com.foo.Client arg1 arg2
+</code></pre></div></div>
+
+<p>While the Accumulo script will add all of Accumulo’s dependencies to the classpath, you
+will need to add any jars that your create or depend on beyond what Accumulo already
+depends on. This can be accomplished by either adding the jars to the <code class="highlighter-rouge">lib/ext</code> directory
+of your Accumulo installation or by adding jars to the CLASSPATH variable before calling
+the accumulo command.</p>
+
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>export CLASSPATH=/path/to/my.jar:/path/to/dep.jar; accumulo com.foo.Client arg1 arg2
+</code></pre></div></div>
+
+<h3 id="use-the-accumulo-util-hadoop-jar-command">Use the ‘accumulo-util hadoop-jar’ command</h3>
+
+<p>If you are writing map reduce job that accesses Accumulo, then you can use
+<code class="highlighter-rouge">accumulo-util hadoop-jar</code> to run those jobs. See the <a href="https://github.com/apache/accumulo-examples/blob/master/docs/mapred.md">MapReduce example</a>
+for more information.</p>
+
 <h2 id="additional-documentation">Additional Documentation</h2>
 
 <p>This page covers Accumulo client basics.  Below are links to additional documentation that may be useful when creating Accumulo clients:</p>
diff --git a/docs/2.0/getting-started/design.html b/docs/2.0/getting-started/design.html
index 098c582..d3381e1 100644
--- a/docs/2.0/getting-started/design.html
+++ b/docs/2.0/getting-started/design.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
diff --git a/docs/2.0/getting-started/quick-install.html b/docs/2.0/getting-started/quick-install.html
index 0d31054..0d0c30d 100644
--- a/docs/2.0/getting-started/quick-install.html
+++ b/docs/2.0/getting-started/quick-install.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
diff --git a/docs/2.0/getting-started/shell.html b/docs/2.0/getting-started/shell.html
index c2f752f..6e75dae 100644
--- a/docs/2.0/getting-started/shell.html
+++ b/docs/2.0/getting-started/shell.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
diff --git a/docs/2.0/getting-started/table_configuration.html b/docs/2.0/getting-started/table_configuration.html
index af2c57d..251a9a6 100644
--- a/docs/2.0/getting-started/table_configuration.html
+++ b/docs/2.0/getting-started/table_configuration.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
diff --git a/docs/2.0/getting-started/table_design.html b/docs/2.0/getting-started/table_design.html
index a21f974..6c87eae 100644
--- a/docs/2.0/getting-started/table_design.html
+++ b/docs/2.0/getting-started/table_design.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
diff --git a/docs/2.0/troubleshooting/advanced.html b/docs/2.0/troubleshooting/advanced.html
index e1b2030..e206d64 100644
--- a/docs/2.0/troubleshooting/advanced.html
+++ b/docs/2.0/troubleshooting/advanced.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
diff --git a/docs/2.0/troubleshooting/basic.html b/docs/2.0/troubleshooting/basic.html
index d39a487..b374b95 100644
--- a/docs/2.0/troubleshooting/basic.html
+++ b/docs/2.0/troubleshooting/basic.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
diff --git a/docs/2.0/troubleshooting/performance.html b/docs/2.0/troubleshooting/performance.html
index a63deac..02a5482 100644
--- a/docs/2.0/troubleshooting/performance.html
+++ b/docs/2.0/troubleshooting/performance.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
diff --git a/docs/2.0/troubleshooting/system-metadata-tables.html b/docs/2.0/troubleshooting/system-metadata-tables.html
index 9b5dedc..4ee8fb3 100644
--- a/docs/2.0/troubleshooting/system-metadata-tables.html
+++ b/docs/2.0/troubleshooting/system-metadata-tables.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
diff --git a/docs/2.0/troubleshooting/tools.html b/docs/2.0/troubleshooting/tools.html
index 89025b6..750033e 100644
--- a/docs/2.0/troubleshooting/tools.html
+++ b/docs/2.0/troubleshooting/tools.html
@@ -224,6 +224,8 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                
               </div>
             </div>
           
@@ -252,7 +254,7 @@
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Configuration Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
                 
                 <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
diff --git a/feed.xml b/feed.xml
index 97c0201..e77236f 100644
--- a/feed.xml
+++ b/feed.xml
@@ -6,8 +6,8 @@
 </description>
     <link>https://accumulo.apache.org/</link>
     <atom:link href="https://accumulo.apache.org/feed.xml" rel="self" type="application/rss+xml"/>
-    <pubDate>Thu, 08 Feb 2018 17:42:17 -0500</pubDate>
-    <lastBuildDate>Thu, 08 Feb 2018 17:42:17 -0500</lastBuildDate>
+    <pubDate>Wed, 21 Feb 2018 10:59:59 -0500</pubDate>
+    <lastBuildDate>Wed, 21 Feb 2018 10:59:59 -0500</lastBuildDate>
     <generator>Jekyll v3.6.2</generator>
     
     

-- 
To stop receiving notification emails like this one, please contact
mwalch@apache.org.

Mime
View raw message