You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mw...@apache.org on 2018/10/03 22:10:35 UTC

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

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 ba33ead  Jekyll build from master:ccf16c6
ba33ead is described below

commit ba33ead4394dd8f7f1ba17fdaa421cacfd272992
Author: Mike Walch <mw...@apache.org>
AuthorDate: Wed Oct 3 18:10:14 2018 -0400

    Jekyll build from master:ccf16c6
    
    Accumulo 2.0 updates (#111)
    
    * Renamed Connector to AccumuloClient
    * Fixed Kerberos DelegationToken docs for M/R
---
 docs/2.0/administration/caching.html               |  2 +-
 .../administration/configuration-management.html   |  2 +-
 docs/2.0/administration/in-depth-install.html      | 16 +++----
 docs/2.0/administration/kerberos.html              | 51 +++++++---------------
 docs/2.0/administration/ssl.html                   |  4 +-
 docs/2.0/administration/tracing.html               |  2 +-
 docs/2.0/development/development_tools.html        |  3 +-
 docs/2.0/development/mapreduce.html                |  8 ++--
 docs/2.0/development/proxy.html                    |  2 +-
 docs/2.0/development/security.html                 |  7 +--
 docs/2.0/getting-started/clients.html              | 39 +++++++++--------
 docs/2.0/getting-started/table_configuration.html  |  9 ++--
 docs/2.0/getting-started/table_design.html         | 10 +++--
 feed.xml                                           |  4 +-
 search_data.json                                   | 26 +++++------
 15 files changed, 85 insertions(+), 100 deletions(-)

diff --git a/docs/2.0/administration/caching.html b/docs/2.0/administration/caching.html
index 93bbe5c..468bdad 100644
--- a/docs/2.0/administration/caching.html
+++ b/docs/2.0/administration/caching.html
@@ -373,7 +373,7 @@ setting <a href="/docs/2.0/administration/properties#table_cache_block_enable">t
 
 <p>Or programmatically using <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/admin/TableOperations.html#setProperty-java.lang.String-java.lang.String-java.lang.String-">TableOperations.setProperty()</a>:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">conn</span><span class="o">.</span><span class="na">tableOperations</span><span class="o">().</span><span class="na">setProperty</span><span class="o">(</span><span class="s">"mytable"</span><span class="o">,</span> <span class="s">"table.cache.block.enable"</span><span class="o">,</span> <span class="s">"true"</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">client</span><span class="o">.</span><span class="na">tableOperations</span><span class="o">().</span><span class="na">setProperty</span><span class="o">(</span><span class="s">"mytable"</span><span class="o">,</span> <span class="s">"table.cache.block.enable"</span><span class="o">,</span> <span class="s">"true"</span><span class="o">);</span>
 </code></pre></div></div>
 
 <p>The size of the index and data block caches (which are shared by all tablets of tablet server) can be changed from
diff --git a/docs/2.0/administration/configuration-management.html b/docs/2.0/administration/configuration-management.html
index 851ec07..4452f77 100644
--- a/docs/2.0/administration/configuration-management.html
+++ b/docs/2.0/administration/configuration-management.html
@@ -346,7 +346,7 @@
 
 <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>
+<p><a href="/docs/2.0/getting-started/clients#creating-an-accumulo-client">Accumulo clients</a> are created using builder methods or <code class="highlighter-rouge">accumulo-client.properties</code>
 which is configured using <a href="/docs/2.0/development/client-properties">client properties</a>.</p>
 
 <h2 id="server-configuration">Server Configuration</h2>
diff --git a/docs/2.0/administration/in-depth-install.html b/docs/2.0/administration/in-depth-install.html
index d3de313..0e7b63c 100644
--- a/docs/2.0/administration/in-depth-install.html
+++ b/docs/2.0/administration/in-depth-install.html
@@ -499,12 +499,12 @@ the Monitor which is configured by <code class="highlighter-rouge">log4j-monitor
 and specify the following:</p>
 
 <ol>
-  <li>Enter the location of Hadoop for <code class="highlighter-rouge">$HADOOP_PREFIX</code></li>
+  <li>Enter the location of Hadoop for <code class="highlighter-rouge">$HADOOP_HOME</code></li>
   <li>Enter the location of ZooKeeper for <code class="highlighter-rouge">$ZOOKEEPER_HOME</code></li>
   <li>Optionally, choose a different location for Accumulo logs using <code class="highlighter-rouge">$ACCUMULO_LOG_DIR</code></li>
 </ol>
 
-<p>Accumulo uses <code class="highlighter-rouge">HADOOP_PREFIX</code> and <code class="highlighter-rouge">ZOOKEEPER_HOME</code> to locate Hadoop and Zookeeper jars
+<p>Accumulo uses <code class="highlighter-rouge">HADOOP_HOME</code> and <code class="highlighter-rouge">ZOOKEEPER_HOME</code> to locate Hadoop and Zookeeper jars
 and add them the <code class="highlighter-rouge">CLASSPATH</code> variable. If you are running a vendor-specific release of Hadoop
 or Zookeeper, you may need to change how your <code class="highlighter-rouge">CLASSPATH</code> is built in <code class="highlighter-rouge">accumulo-env.sh</code>. If
 Accumulo has problems later on finding jars, run <code class="highlighter-rouge">accumulo classpath -d</code> to debug and print
@@ -692,9 +692,9 @@ will expect the KeyStore in the same location.</p>
 
 <h3 id="client-configuration">Client Configuration</h3>
 
-<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 Connector 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>
+<p>Accumulo clients are configured in a different way than Accumulo servers. <a href="/docs/2.0/getting-started/clients#creating-an-accumulo-client">Accumulo clients
+are created</a> using Java builder methods or a <code class="highlighter-rouge">accumulo-client.properties</code>
+file containing <a href="/docs/2.0/development/client-properties">client properties</a>.</p>
 
 <h3 id="custom-table-tags">Custom Table Tags</h3>
 
@@ -715,9 +715,9 @@ consideration. There is no enforcement of these warnings via the API.</p>
 <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
 <a href="/docs/2.0/administration/properties#general_dynamic_classpaths">general.dynamic.classpaths</a> property and will monitor and reload them if they change. The reloading feature is useful during the development
-and testing of iterators as new or modified iterator classes can be deployed to Accumulo without having to restart the database.
-/
-Accumulo also has an alternate configuration for the classloader which will allow it to load classes from remote locations. This mechanism
+and testing of iterators as new or modified iterator classes can be deployed to Accumulo without having to restart the database.</p>
+
+<p>Accumulo also has an alternate configuration for the classloader which will allow it to load classes from remote locations. This mechanism
 uses Apache Commons VFS which enables locations such as http and hdfs to be used. This alternate configuration also uses the
 <a href="/docs/2.0/administration/properties#general_classpaths">general.classpaths</a> property in the same manner described above. It differs in that you need to configure the
 <a href="/docs/2.0/administration/properties#general_vfs_classpaths">general.vfs.classpaths</a> property instead of the <a href="/docs/2.0/administration/properties#general_dynamic_classpaths">general.dynamic.classpaths</a> property. As in the default configuration, this alternate
diff --git a/docs/2.0/administration/kerberos.html b/docs/2.0/administration/kerberos.html
index f192dd3..80d0e72 100644
--- a/docs/2.0/administration/kerberos.html
+++ b/docs/2.0/administration/kerberos.html
@@ -715,8 +715,8 @@ Valid starting       Expires              Service principal
 
 <h4 id="configuration">Configuration</h4>
 
-<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
+<p>The second thing clients need to do is to configure kerberos when an Accumulo client is
+created.  This can be done using client 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>
 
@@ -766,50 +766,31 @@ accumulo_admin@EXAMPLE.COM@MYACCUMULO&gt; quit
 
 <h4 id="delegationtokens-with-mapreduce">DelegationTokens with MapReduce</h4>
 
-<p>To use DelegationTokens in a custom MapReduce job, the call to <code class="highlighter-rouge">setConnectorInfo()</code> method
-on <code class="highlighter-rouge">AccumuloInputFormat</code> or <code class="highlighter-rouge">AccumuloOutputFormat</code> should be the only necessary change. Instead
-of providing an instance of a <code class="highlighter-rouge">KerberosToken</code>, the user must call <code class="highlighter-rouge">SecurityOperations.getDelegationToken</code>
-using a <code class="highlighter-rouge">Connector</code> obtained with that <code class="highlighter-rouge">KerberosToken</code>, and pass the <code class="highlighter-rouge">DelegationToken</code> to
-<code class="highlighter-rouge">setConnectorInfo</code> instead of the <code class="highlighter-rouge">KerberosToken</code>. It is expected that the user launching
-the MapReduce job is already logged in via Kerberos via a keytab or via a locally-cached
-Kerberos ticket-granting-ticket (TGT).</p>
+<p>To use DelegationTokens in a custom MapReduce job, the user should create an <code class="highlighter-rouge">AccumuloClient</code>
+using a <code class="highlighter-rouge">KerberosToken</code> and use it to call <code class="highlighter-rouge">SecurityOperations.getDelegationToken</code>. The
+<code class="highlighter-rouge">DelegationToken</code> that is created can then be used to create a new client using this
+delegation token.  The <code class="highlighter-rouge">ClientInfo</code> object from this client can be passed into the MapReduce
+job. It is expected that the user launching the MapReduce job is already logged in via Kerberos
+via a keytab or via a locally-cached Kerberos ticket-granting-ticket (TGT).</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="n">getInstance</span><span class="o">();</span>
-<span class="n">KerberosToken</span> <span class="n">kt</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">instance</span><span class="o">.</span><span class="na">getConnector</span><span class="o">(</span><span class="n">principal</span><span class="o">,</span> <span class="n">kt</span><span class="o">);</span>
-<span class="n">DelegationToken</span> <span class="n">dt</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">getDelegationToken</span><span class="o">();</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">KerberosToken</span> <span class="n">kt</span> <span class="o">=</span> <span class="k">new</span> <span class="n">KerberosToken</span><span class="o">();</span>
+<span class="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">().</span><span class="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">usingToken</span><span class="o">(</span><span class="n">principal</span><span class="o">,</span> <span class="n">kt</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
+<span class="n">DelegationToken</span> <span class="n">dt</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">getDelegationToken</span><span class="o">();</span>
+<span class="n">AccumuloClient</span> <span class="n">client2</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">changeUser</span><span class="o">(</span><span class="n">principal</span><span class="o">,</span> <span class="n">dt</span><span class="o">);</span>
+<span class="n">ClientInfo</span> <span class="n">info2</span> <span class="o">=</span> <span class="n">client2</span><span class="o">.</span><span class="na">info</span><span class="o">();</span>
 
 <span class="c1">// Reading from Accumulo</span>
-<span class="n">AccumuloInputFormat</span><span class="o">.</span><span class="na">setConnectorInfo</span><span class="o">(</span><span class="n">job</span><span class="o">,</span> <span class="n">principal</span><span class="o">,</span> <span class="n">dt</span><span class="o">);</span>
+<span class="n">AccumuloInputFormat</span><span class="o">.</span><span class="na">setClientInfo</span><span class="o">(</span><span class="n">job</span><span class="o">,</span> <span class="n">info2</span><span class="o">);</span>
 
 <span class="c1">// Writing to Accumulo</span>
-<span class="n">AccumuloOutputFormat</span><span class="o">.</span><span class="na">setConnectorInfo</span><span class="o">(</span><span class="n">job</span><span class="o">,</span> <span class="n">principal</span><span class="o">,</span> <span class="n">dt</span><span class="o">);</span>
+<span class="n">AccumuloOutputFormat</span><span class="o">.</span><span class="na">setClientInfo</span><span class="o">(</span><span class="n">job</span><span class="o">,</span> <span class="n">info2</span><span class="o">);</span>
 </code></pre></div></div>
 
-<p>If the user passes a <code class="highlighter-rouge">KerberosToken</code> to the <code class="highlighter-rouge">setConnectorInfo</code> method, the implementation will
-attempt to obtain a <code class="highlighter-rouge">DelegationToken</code> automatically, but this does have limitations
-based on the other MapReduce configuration methods already called and permissions granted
-to the calling user. It is best for the user to acquire the DelegationToken on their own
-and provide it directly to <code class="highlighter-rouge">setConnectorInfo</code>.</p>
-
 <p>Users must have the <code class="highlighter-rouge">DELEGATION_TOKEN</code> system permission to call the <code class="highlighter-rouge">getDelegationToken</code>
 method. The obtained delegation token is only valid for the requesting user for a period
 of time dependent on Accumulo’s configuration (<code class="highlighter-rouge">general.delegation.token.lifetime</code>).</p>
 
-<p>It is also possible to obtain and use <code class="highlighter-rouge">DelegationToken</code>s outside of the context
-of MapReduce.</p>
-
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">principal</span> <span class="o">=</span> <span class="s">"user@REALM"</span><span class="o">;</span>
-<span class="n">Instance</span> <span class="n">instance</span> <span class="o">=</span> <span class="n">getInstance</span><span class="o">();</span>
-<span class="n">Connector</span> <span class="n">connector</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="n">principal</span><span class="o">,</span> <span class="k">new</span> <span class="n">KerberosToken</span><span class="o">());</span>
-<span class="n">DelegationToken</span> <span class="n">delegationToken</span> <span class="o">=</span> <span class="n">connector</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">getDelegationToken</span><span class="o">();</span>
-
-<span class="n">Connector</span> <span class="n">dtConnector</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="n">principal</span><span class="o">,</span> <span class="n">delegationToken</span><span class="o">);</span>
-</code></pre></div></div>
-
-<p>Use of the <code class="highlighter-rouge">dtConnector</code> will perform each operation as the original user, but without
-their Kerberos credentials.</p>
-
 <p>For the duration of validity of the <code class="highlighter-rouge">DelegationToken</code>, the user <em>must</em> take the necessary precautions
 to protect the <code class="highlighter-rouge">DelegationToken</code> from prying eyes as it can be used by any user on any host to impersonate
 the user who requested the <code class="highlighter-rouge">DelegationToken</code>. YARN ensures that passing the delegation token from the client
diff --git a/docs/2.0/administration/ssl.html b/docs/2.0/administration/ssl.html
index 12db0d0..5d87223 100644
--- a/docs/2.0/administration/ssl.html
+++ b/docs/2.0/administration/ssl.html
@@ -387,8 +387,8 @@ 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 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
+special configuration. This is typically accomplished by <a href="/docs/2.0/getting-started/clients#creating-an-accumulo-client">creating an Accumulo
+client</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>
diff --git a/docs/2.0/administration/tracing.html b/docs/2.0/administration/tracing.html
index e51d32c..05407ee 100644
--- a/docs/2.0/administration/tracing.html
+++ b/docs/2.0/administration/tracing.html
@@ -526,7 +526,7 @@ your application call</p>
 <span class="kn">import</span> <span class="nn">org.apache.htrace.TraceScope</span><span class="o">;</span>
 <span class="o">...</span>
 <span class="n">TraceScope</span> <span class="n">scope</span> <span class="o">=</span> <span class="n">Trace</span><span class="o">.</span><span class="na">startSpan</span><span class="o">(</span><span class="s">"Client Scan"</span><span class="o">,</span> <span class="n">Sampler</span><span class="o">.</span><span class="na">ALWAYS</span><span class="o">);</span>
-<span class="n">BatchScanner</span> <span class="n">scanner</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createBatchScanner</span><span class="o">(...);</span>
+<span class="n">BatchScanner</span> <span class="n">scanner</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchScanner</span><span class="o">(...);</span>
 <span class="c1">// Configure your scanner</span>
 <span class="k">for</span> <span class="o">(</span><span class="n">Entry</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">scanner</span><span class="o">)</span> <span class="o">{</span>
 <span class="o">}</span>
diff --git a/docs/2.0/development/development_tools.html b/docs/2.0/development/development_tools.html
index 04cde14..ecb6074 100644
--- a/docs/2.0/development/development_tools.html
+++ b/docs/2.0/development/development_tools.html
@@ -372,8 +372,7 @@ as a test dependency:</p>
 
 <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">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>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">mac</span><span class="o">.</span><span class="na">getAccumuloClient</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=" [...]
 </code></pre></div></div>
 
 <p>Upon completion of our development code, we will want to shutdown our MiniAccumuloCluster:</p>
diff --git a/docs/2.0/development/mapreduce.html b/docs/2.0/development/mapreduce.html
index 53d49ce..f8783a4 100644
--- a/docs/2.0/development/mapreduce.html
+++ b/docs/2.0/development/mapreduce.html
@@ -391,9 +391,9 @@ options.</p>
 <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">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="n">ClientInfo</span> <span class="n">info</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">().</span><span class="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">setClientInfo</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>
@@ -481,9 +481,9 @@ 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="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>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">ClientInfo</span> <span class="n">info</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">().</span><span class="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">setClientInfo</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>
 
diff --git a/docs/2.0/development/proxy.html b/docs/2.0/development/proxy.html
index d4b0223..d512f5b 100644
--- a/docs/2.0/development/proxy.html
+++ b/docs/2.0/development/proxy.html
@@ -344,7 +344,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.9.2/org/apache/accumulo/core/client/Connector.html">Connector</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.9.2/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</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/security.html b/docs/2.0/development/security.html
index f9ef9b8..d81e890 100644
--- a/docs/2.0/development/security.html
+++ b/docs/2.0/development/security.html
@@ -419,7 +419,7 @@ results sent back to the client.</p>
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c1">// user possesses both admin and system level access</span>
 <span class="n">Authorizations</span> <span class="n">auths</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Authorizations</span><span class="o">(</span><span class="s">"admin"</span><span class="o">,</span><span class="s">"system"</span><span class="o">);</span>
 
-<span class="n">Scanner</span> <span class="n">s</span> <span class="o">=</span> <span class="n">connector</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"table"</span><span class="o">,</span> <span class="n">auths</span><span class="o">);</span>
+<span class="n">Scanner</span> <span class="n">s</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"table"</span><span class="o">,</span> <span class="n">auths</span><span class="o">);</span>
 </code></pre></div></div>
 
 <h2 id="user-authorizations">User Authorizations</h2>
@@ -452,12 +452,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">usingToken'</code> method of the [Connector] builder is called with a principal (i.e username)
+the <code class="highlighter-rouge">usingToken'</code> method of the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a> builder is called with a principal (i.e username)
 and an <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/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.9.2/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">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>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">()</span>
+                    <span class="o">.</span><span class="na">forInstance</span><span class="o">(</span><span class="s">"myinstance"</span><span class="o">,</span> <span class="s">"zookeeper1,zookeper2"</span><span class="o">)</span>
                     <span class="o">.</span><span class="na">usingToken</span><span class="o">(</span><span class="s">"user"</span><span class="o">,</span> <span class="k">new</span> <span class="n">PasswordToken</span><span class="o">(</span><span class="s">"passwd"</span><span class="o">)).</span><span class="na">build</span><span class="o">();</span>
 </code></pre></div></div>
 
diff --git a/docs/2.0/getting-started/clients.html b/docs/2.0/getting-started/clients.html
index d34eec9..27bb515 100644
--- a/docs/2.0/getting-started/clients.html
+++ b/docs/2.0/getting-started/clients.html
@@ -344,7 +344,7 @@
 
     <h2 id="creating-client-code">Creating Client Code</h2>
 
-<p>If you are using Maven to create Accumulo client code, add the following to your pom:</p>
+<p>If you are using Maven to create Accumulo client code, add the following dependency to your pom:</p>
 
 <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;dependency&gt;</span>
   <span class="nt">&lt;groupId&gt;</span>org.apache.accumulo<span class="nt">&lt;/groupId&gt;</span>
@@ -357,9 +357,9 @@
 The <code class="highlighter-rouge">accumulo-core</code> artifact includes implementation code that falls outside the
 Public API and should be avoided.</p>
 
-<h2 id="connecting">Connecting</h2>
+<h2 id="creating-an-accumulo-client">Creating an Accumulo Client</h2>
 
-<p>Before writing Accumulo client code, you will need the following information.</p>
+<p>Before creating an Accumulo client, you will need the following information:</p>
 
 <ul>
   <li>Accumulo instance name</li>
@@ -367,18 +367,19 @@ Public API and should be avoided.</p>
   <li>Accumulo username &amp; password</li>
 </ul>
 
-<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/Connector.html">Connector</a> object is the main entry point for Accumulo clients. It can be created using one
+<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</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>
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">()</span>
                      <span class="o">.</span><span class="na">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.9.2/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>
+  <li>Using the builder methods of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a>:
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">()</span>
+                     <span class="o">.</span><span class="na">forInstance</span><span class="o">(</span><span class="s">"myinstance"</span><span class="o">,</span> <span class="s">"zookeeper1,zookeeper2"</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>
@@ -389,12 +390,12 @@ of the tarball distribution):
  <span class="n">props</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"auth.type"</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.principal"</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.token"</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>
+ <span class="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">().</span><span class="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.9.2/org/apache/accumulo/core/client/Connector.html">Connector</a>, the following
+<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.9.2/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a>, the following
 <a href="/docs/2.0/development/client-properties">client properties</a> must be set:</p>
 
 <ul>
@@ -444,7 +445,7 @@ auth.token = AAAAGh+LCAAAAAAAAAArTk0uSi0BAOXoolwGAAAA
 
 <h1 id="authentication">Authentication</h1>
 
-<p>When creating a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/Connector.html">Connector</a>, the user must be authenticated using one of the following
+<p>When creating a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</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.9.2/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.html">AuthenticationToken</a> below:</p>
 
 <ol>
@@ -460,7 +461,8 @@ requires external setup and additional configuration, but provides a single poin
 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="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">()</span>
+                     <span class="o">.</span><span class="na">forInstance</span><span class="o">(</span><span class="s">"myinstance"</span><span class="o">,</span> <span class="s">"zookeeper1,zookeper2"</span><span class="o">)</span>
                      <span class="o">.</span><span class="na">usingToken</span><span class="o">(</span><span class="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>
@@ -468,10 +470,10 @@ through HDFS, YARN and ZooKeeper and allowing for password-less authentication w
 
 <h2 id="writing-data">Writing Data</h2>
 
-<p>With a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/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.9.2/org/apache/accumulo/core/client/BatchWriter.html">BatchWriter</a>) for
+<p>With a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a> created, it can be used to create objects (like the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/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">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>
+<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">client</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>Data is written to Accumulo by creating <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/data/Mutation.html">Mutation</a> objects that represent all the
@@ -507,7 +509,7 @@ batching.</p>
 <span class="n">BatchWriterConfig</span> <span class="n">config</span> <span class="o">=</span> <span class="k">new</span> <span class="n">BatchWriterConfig</span><span class="o">();</span>
 <span class="n">config</span><span class="o">.</span><span class="na">setMaxMemory</span><span class="o">(</span><span class="mi">10000000L</span><span class="o">);</span> <span class="c1">// bytes available to batchwriter for buffering mutations</span>
 
-<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> <span class="n">config</span><span class="o">)</span>
+<span class="n">BatchWriter</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="s">"table"</span><span class="o">,</span> <span class="n">config</span><span class="o">)</span>
 <span class="n">writer</span><span class="o">.</span><span class="na">addMutation</span><span class="o">(</span><span class="n">mutation</span><span class="o">);</span>
 <span class="n">writer</span><span class="o">.</span><span class="na">close</span><span class="o">();</span>
 </code></pre></div></div>
@@ -561,7 +563,7 @@ These levels are:</p>
 
 <ol>
   <li>The default durability of a table can be set in the Accumulo shell</li>
-  <li>When creating a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/Connector.html">Connector</a>, the default durability can be overridden using <code class="highlighter-rouge">withBatchWriterConfig()</code>
+  <li>When creating a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a>, the default durability can be overridden using <code class="highlighter-rouge">withBatchWriterConfig()</code>
 or by setting <a href="/docs/2.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 overridden
@@ -572,8 +574,7 @@ by the <code class="highlighter-rouge">BatchWriterConfig</code> that is passed i
  <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>
+ <span class="n">BatchWriter</span> <span class="n">bw</span> <span class="o">=</span> <span class="n">client</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>
@@ -592,7 +593,7 @@ to return a subset of the columns available.</p>
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c1">// specify which visibilities we are allowed to see</span>
 <span class="n">Authorizations</span> <span class="n">auths</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Authorizations</span><span class="o">(</span><span class="s">"public"</span><span class="o">);</span>
 
-<span class="n">Scanner</span> <span class="n">scan</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"table"</span><span class="o">,</span> <span class="n">auths</span><span class="o">);</span>
+<span class="n">Scanner</span> <span class="n">scan</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"table"</span><span class="o">,</span> <span class="n">auths</span><span class="o">);</span>
 <span class="n">scan</span><span class="o">.</span><span class="na">setRange</span><span class="o">(</span><span class="k">new</span> <span class="n">Range</span><span class="o">(</span><span class="s">"harry"</span><span class="o">,</span><span class="s">"john"</span><span class="o">));</span>
 <span class="n">scan</span><span class="o">.</span><span class="na">fetchColumnFamily</span><span class="o">(</span><span class="k">new</span> <span class="n">Text</span><span class="o">(</span><span class="s">"attributes"</span><span class="o">));</span>
 
@@ -642,7 +643,7 @@ TabletServers in parallel.</p>
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">ArrayList</span><span class="o">&lt;</span><span class="n">Range</span><span class="o">&gt;</span> <span class="n">ranges</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ArrayList</span><span class="o">&lt;</span><span class="n">Range</span><span class="o">&gt;();</span>
 <span class="c1">// populate list of ranges ...</span>
 
-<span class="n">BatchScanner</span> <span class="n">bscan</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createBatchScanner</span><span class="o">(</span><span class="s">"table"</span><span class="o">,</span> <span class="n">auths</span><span class="o">,</span> <span class="mi">10</span><span class="o">);</span>
+<span class="n">BatchScanner</span> <span class="n">bscan</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchScanner</span><span class="o">(</span><span class="s">"table"</span><span class="o">,</span> <span class="n">auths</span><span class="o">,</span> <span class="mi">10</span><span class="o">);</span>
 <span class="n">bscan</span><span class="o">.</span><span class="na">setRanges</span><span class="o">(</span><span class="n">ranges</span><span class="o">);</span>
 <span class="n">bscan</span><span class="o">.</span><span class="na">fetchColumnFamily</span><span class="o">(</span><span class="s">"attributes"</span><span class="o">);</span>
 
diff --git a/docs/2.0/getting-started/table_configuration.html b/docs/2.0/getting-started/table_configuration.html
index 4192d56..91ecd15 100644
--- a/docs/2.0/getting-started/table_configuration.html
+++ b/docs/2.0/getting-started/table_configuration.html
@@ -372,7 +372,8 @@ user@myinstance mytable&gt; getgroups -t mytable
 
 <h3 id="managing-locality-groups-via-the-client-api">Managing Locality Groups via the Client API</h3>
 
-<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>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">()</span>
+                        <span class="o">.</span><span class="na">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>
 
 <span class="n">HashMap</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span><span class="n">Set</span><span class="o">&lt;</span><span class="n">Text</span><span class="o">&gt;&gt;</span> <span class="n">localityGroups</span> <span class="o">=</span> <span class="k">new</span> <span class="n">HashMap</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">Set</span><span class="o">&lt;</span><span class="n"> [...]
 
@@ -387,10 +388,10 @@ user@myinstance mytable&gt; getgroups -t mytable
 <span class="n">localityGroups</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"metadata"</span><span class="o">,</span> <span class="n">metadataColumns</span><span class="o">);</span>
 <span class="n">localityGroups</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"content"</span><span class="o">,</span> <span class="n">contentColumns</span><span class="o">);</span>
 
-<span class="n">conn</span><span class="o">.</span><span class="na">tableOperations</span><span class="o">().</span><span class="na">setLocalityGroups</span><span class="o">(</span><span class="s">"mytable"</span><span class="o">,</span> <span class="n">localityGroups</span><span class="o">);</span>
+<span class="n">client</span><span class="o">.</span><span class="na">tableOperations</span><span class="o">().</span><span class="na">setLocalityGroups</span><span class="o">(</span><span class="s">"mytable"</span><span class="o">,</span> <span class="n">localityGroups</span><span class="o">);</span>
 
 <span class="c1">// existing locality groups can be obtained as follows</span>
-<span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">Set</span><span class="o">&lt;</span><span class="n">Text</span><span class="o">&gt;&gt;</span> <span class="n">groups</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">tableOperations</span><span class="o">().</span><span class="na">getLocalityGroups</span><span class="o">(</span><span class="s">"mytable"</span><span [...]
+<span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">Set</span><span class="o">&lt;</span><span class="n">Text</span><span class="o">&gt;&gt;</span> <span class="n">groups</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">tableOperations</span><span class="o">().</span><span class="na">getLocalityGroups</span><span class="o">(</span><span class="s">"mytable"</span><sp [...]
 </code></pre></div></div>
 
 <p>The assignment of Column Families to Locality Groups can be changed at any time. The
@@ -532,7 +533,7 @@ VersioningIterator and keep one version. A table can be created without the
 VersioningIterator with the -ndi option in the shell. Also the Java API
 has the following method</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">connector</span><span class="o">.</span><span class="na">tableOperations</span><span class="o">.</span><span class="na">create</span><span class="o">(</span><span class="n">String</span> <span class="n">tableName</span><span class="o">,</span> <span class="kt">boolean</span> <span class="n">limitVersion</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">client</span><span class="o">.</span><span class="na">tableOperations</span><span class="o">.</span><span class="na">create</span><span class="o">(</span><span class="n">String</span> <span class="n">tableName</span><span class="o">,</span> <span class="kt">boolean</span> <span class="n">limitVersion</span><span class="o">);</span>
 </code></pre></div></div>
 
 <h4 id="logical-time">Logical Time</h4>
diff --git a/docs/2.0/getting-started/table_design.html b/docs/2.0/getting-started/table_design.html
index 38b1b6b..166bc46 100644
--- a/docs/2.0/getting-started/table_design.html
+++ b/docs/2.0/getting-started/table_design.html
@@ -370,8 +370,10 @@ name in the column family, and a blank column qualifier:</p>
 <p>We could then retrieve any of the columns for a specific userid by specifying the
 userid as the range of a scanner and fetching specific columns:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Range</span> <span class="n">r</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Range</span><span class="o">(</span><span class="n">userid</span><span class="o">,</span> <span class="n">userid</span><span class="o">);</span> <span class="c1">// single row</span>
-<span class="n">Scanner</span> <span class="n">s</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"userdata"</span><span class="o">,</span> <span class="n">auths</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">()</span>
+                        <span class="o">.</span><span class="na">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>
+<span class="n">Range</span> <span class="n">r</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Range</span><span class="o">(</span><span class="n">userid</span><span class="o">,</span> <span class="n">userid</span><span class="o">);</span> <span class="c1">// single row</span>
+<span class="n">Scanner</span> <span class="n">s</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"userdata"</span><span class="o">,</span> <span class="n">auths</span><span class="o">);</span>
 <span class="n">s</span><span class="o">.</span><span class="na">setRange</span><span class="o">(</span><span class="n">r</span><span class="o">);</span>
 <span class="n">s</span><span class="o">.</span><span class="na">fetchColumnFamily</span><span class="o">(</span><span class="k">new</span> <span class="n">Text</span><span class="o">(</span><span class="s">"age"</span><span class="o">));</span>
 
@@ -517,7 +519,7 @@ sorted order, as is the case with the basic Scanner interface.</p>
 <span class="o">}</span>
 
 <span class="c1">// now we pass the set of rowIDs to the batch scanner to retrieve them</span>
-<span class="n">BatchScanner</span> <span class="n">bscan</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createBatchScanner</span><span class="o">(</span><span class="s">"table"</span><span class="o">,</span> <span class="n">auths</span><span class="o">,</span> <span class="mi">10</span><span class="o">);</span>
+<span class="n">BatchScanner</span> <span class="n">bscan</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchScanner</span><span class="o">(</span><span class="s">"table"</span><span class="o">,</span> <span class="n">auths</span><span class="o">,</span> <span class="mi">10</span><span class="o">);</span>
 <span class="n">bscan</span><span class="o">.</span><span class="na">setRanges</span><span class="o">(</span><span class="n">matchingRows</span><span class="o">);</span>
 <span class="n">bscan</span><span class="o">.</span><span class="na">fetchColumnFamily</span><span class="o">(</span><span class="k">new</span> <span class="n">Text</span><span class="o">(</span><span class="s">"attributes"</span><span class="o">));</span>
 
@@ -778,7 +780,7 @@ BatchScanner within user query code as follows:</p>
 
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Text</span><span class="o">[]</span> <span class="n">terms</span> <span class="o">=</span> <span class="o">{</span><span class="k">new</span> <span class="n">Text</span><span class="o">(</span><span class="s">"the"</span><span class="o">),</span> <span class="k">new</span> <span class="n">Text</span><span class="o">(</span><span class="s">"white"</span><span class="o">),</span [...]
 
-<span class="n">BatchScanner</span> <span class="n">bscan</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createBatchScanner</span><span class="o">(</span><span class="n">table</span><span class="o">,</span> <span class="n">auths</span><span class="o">,</span> <span class="mi">20</span><span class="o">);</span>
+<span class="n">BatchScanner</span> <span class="n">bscan</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchScanner</span><span class="o">(</span><span class="n">table</span><span class="o">,</span> <span class="n">auths</span><span class="o">,</span> <span class="mi">20</span><span class="o">);</span>
 
 <span class="n">IteratorSetting</span> <span class="n">iter</span> <span class="o">=</span> <span class="k">new</span> <span class="n">IteratorSetting</span><span class="o">(</span><span class="mi">20</span><span class="o">,</span> <span class="s">"ii"</span><span class="o">,</span> <span class="n">IntersectingIterator</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
 <span class="n">IntersectingIterator</span><span class="o">.</span><span class="na">setColumnFamilies</span><span class="o">(</span><span class="n">iter</span><span class="o">,</span> <span class="n">terms</span><span class="o">);</span>
diff --git a/feed.xml b/feed.xml
index 565975e..0ebe2f4 100644
--- a/feed.xml
+++ b/feed.xml
@@ -6,8 +6,8 @@
 </description>
     <link>https://accumulo.apache.org/</link>
     <atom:link href="https://accumulo.apache.org/feed.xml" rel="self" type="application/rss+xml"/>
-    <pubDate>Mon, 01 Oct 2018 17:04:41 -0400</pubDate>
-    <lastBuildDate>Mon, 01 Oct 2018 17:04:41 -0400</lastBuildDate>
+    <pubDate>Wed, 03 Oct 2018 18:10:02 -0400</pubDate>
+    <lastBuildDate>Wed, 03 Oct 2018 18:10:02 -0400</lastBuildDate>
     <generator>Jekyll v3.7.3</generator>
     
     
diff --git a/search_data.json b/search_data.json
index f0c2645..b61992e 100644
--- a/search_data.json
+++ b/search_data.json
@@ -2,14 +2,14 @@
   
     "docs-2-0-administration-caching": {
       "title": "Caching",
-      "content"	 : "Accumulo tablet servers have block caches that buffer data in memory to limit reads from disk.This caching has the following benefits:  reduces latency when reading data  helps alleviate hotspots in tablesEach tablet server has an index and data block cache that is shared by all hosted tablets (see the tablet server diagramto learn more). A typical Accumulo read operation will perform a binary search over several index blocks followed by a linear scanof one or more da [...]
+      "content"	 : "Accumulo tablet servers have block caches that buffer data in memory to limit reads from disk.This caching has the following benefits:  reduces latency when reading data  helps alleviate hotspots in tablesEach tablet server has an index and data block cache that is shared by all hosted tablets (see the tablet server diagramto learn more). A typical Accumulo read operation will perform a binary search over several index blocks followed by a linear scanof one or more da [...]
       "url": " /docs/2.0/administration/caching",
       "categories": "administration"
     },
   
     "docs-2-0-administration-configuration-management": {
       "title": "Configuration Management",
-      "content"	 : "Configuration is managed differently for Accumulo clients and servers.Client ConfigurationAccumulo clients are configured when the Connector is built using builder methods or accumulo-client.propertieswhich is configured using client properties.Server ConfigurationAccumulo services (i.e master, tablet server, monitor, etc) are configured using server properties whose values can beset in the following locations (with increasing precedence):  Default values  accumulo.pr [...]
+      "content"	 : "Configuration is managed differently for Accumulo clients and servers.Client ConfigurationAccumulo clients are created using builder methods or accumulo-client.propertieswhich is configured using client properties.Server ConfigurationAccumulo services (i.e master, tablet server, monitor, etc) are configured using server properties whose values can beset in the following locations (with increasing precedence):  Default values  accumulo.properties (overrides defaults)   [...]
       "url": " /docs/2.0/administration/configuration-management",
       "categories": "administration"
     },
@@ -30,14 +30,14 @@
   
     "docs-2-0-administration-in-depth-install": {
       "title": "In-depth Installation",
-      "content"	 : "This document provides detailed instructions for installing Accumulo. For basicinstructions, see the quick installation guide.HardwareBecause we are running essentially two or three systems simultaneously layeredacross the cluster: HDFS, Accumulo and MapReduce, it is typical for hardware toconsist of 4 to 8 cores, and 8 to 32 GB RAM. This is so each running process can haveat least one core and 2 - 4 GB each.One core running HDFS can typically keep 2 to 4 disks busy,  [...]
+      "content"	 : "This document provides detailed instructions for installing Accumulo. For basicinstructions, see the quick installation guide.HardwareBecause we are running essentially two or three systems simultaneously layeredacross the cluster: HDFS, Accumulo and MapReduce, it is typical for hardware toconsist of 4 to 8 cores, and 8 to 32 GB RAM. This is so each running process can haveat least one core and 2 - 4 GB each.One core running HDFS can typically keep 2 to 4 disks busy,  [...]
       "url": " /docs/2.0/administration/in-depth-install",
       "categories": "administration"
     },
   
     "docs-2-0-administration-kerberos": {
       "title": "Kerberos",
-      "content"	 : "OverviewKerberos is a network authentication protocol that provides a secure way forpeers to prove their identity over an unsecure network in a client-server model.A centralized key-distribution center (KDC) is the service that coordinatesauthentication between a client and a server. Clients and servers use “tickets”,obtained from the KDC via a password or a special file called a “keytab”, tocommunicate with the KDC and prove their identity. A KDC administrator mustcr [...]
+      "content"	 : "OverviewKerberos is a network authentication protocol that provides a secure way forpeers to prove their identity over an unsecure network in a client-server model.A centralized key-distribution center (KDC) is the service that coordinatesauthentication between a client and a server. Clients and servers use “tickets”,obtained from the KDC via a password or a special file called a “keytab”, tocommunicate with the KDC and prove their identity. A KDC administrator mustcr [...]
       "url": " /docs/2.0/administration/kerberos",
       "categories": "administration"
     },
@@ -79,14 +79,14 @@
   
     "docs-2-0-administration-ssl": {
       "title": "SSL",
-      "content"	 : "Accumulo, through Thrift’s TSSLTransport, provides the ability to encryptwire communication between Accumulo servers and clients using securesockets layer (SSL). SSL certificates signed by the same certificate authoritycontrol the “circle of trust” in which a secure connection can be established.Typically, each host running Accumulo processes would be given a certificatewhich identifies itself.Clients can optionally also be given a certificate, when client-auth is ena [...]
+      "content"	 : "Accumulo, through Thrift’s TSSLTransport, provides the ability to encryptwire communication between Accumulo servers and clients using securesockets layer (SSL). SSL certificates signed by the same certificate authoritycontrol the “circle of trust” in which a secure connection can be established.Typically, each host running Accumulo processes would be given a certificatewhich identifies itself.Clients can optionally also be given a certificate, when client-auth is ena [...]
       "url": " /docs/2.0/administration/ssl",
       "categories": "administration"
     },
   
     "docs-2-0-administration-tracing": {
       "title": "Tracing",
-      "content"	 : "It can be difficult to determine why some operations are taking longerthan expected. For example, you may be looking up items with very lowlatency, but sometimes the lookups take much longer. Determining thecause of the delay is difficult because the system is distributed, andthe typical lookup is fast.Accumulo has been instrumented to record the time that variousoperations take when tracing is turned on. The fact that tracing isenabled follows all the requests made o [...]
+      "content"	 : "It can be difficult to determine why some operations are taking longerthan expected. For example, you may be looking up items with very lowlatency, but sometimes the lookups take much longer. Determining thecause of the delay is difficult because the system is distributed, andthe typical lookup is fast.Accumulo has been instrumented to record the time that variousoperations take when tracing is turned on. The fact that tracing isenabled follows all the requests made o [...]
       "url": " /docs/2.0/administration/tracing",
       "categories": "administration"
     },
@@ -107,7 +107,7 @@
   
     "docs-2-0-development-development-tools": {
       "title": "Development Tools",
-      "content"	 : "Accumulo has several tools that can help developers test their code.MiniAccumuloClusterMiniAccumuloCluster is a standalone instance of Apache Accumulo for testing. It willcreate Zookeeper and Accumulo processes that write all of their data to a single localdirectory. MiniAccumuloCluster makes it easy to code against a real Accumulo instance.Developers can write realistic-to-end integration tests that mimic the use of a normalAccumulo instance.MiniAccumuloCluster is pu [...]
+      "content"	 : "Accumulo has several tools that can help developers test their code.MiniAccumuloClusterMiniAccumuloCluster is a standalone instance of Apache Accumulo for testing. It willcreate Zookeeper and Accumulo processes that write all of their data to a single localdirectory. MiniAccumuloCluster makes it easy to code against a real Accumulo instance.Developers can write realistic-to-end integration tests that mimic the use of a normalAccumulo instance.MiniAccumuloCluster is pu [...]
       "url": " /docs/2.0/development/development_tools",
       "categories": "development"
     },
@@ -128,14 +128,14 @@
   
     "docs-2-0-development-mapreduce": {
       "title": "MapReduce",
-      "content"	 : "Accumulo tables can be used as the source and destination of MapReduce jobs. Touse an Accumulo table with a MapReduce job, configure the job parameters to usethe AccumuloInputFormat and AccumuloOutputFormat. Accumulo specific parameterscan be set via these two format classes to do the following:  Authenticate and provide user credentials for the input  Restrict the scan to a range of rows  Restrict the input to a subset of available columnsMapper and Reducer classesTo [...]
+      "content"	 : "Accumulo tables can be used as the source and destination of MapReduce jobs. Touse an Accumulo table with a MapReduce job, configure the job parameters to usethe AccumuloInputFormat and AccumuloOutputFormat. Accumulo specific parameterscan be set via these two format classes to do the following:  Authenticate and provide user credentials for the input  Restrict the scan to a range of rows  Restrict the input to a subset of available columnsMapper and Reducer classesTo [...]
       "url": " /docs/2.0/development/mapreduce",
       "categories": "development"
     },
   
     "docs-2-0-development-proxy": {
       "title": "Proxy",
-      "content"	 : "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 Connector class toprovide a single TCP port in which clients can be securely routed through a firewall,without requiring access to all tablet servers in the cluster.PrerequisitesThe proxy server can live on any node in which the basic client API would [...]
+      "content"	 : "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 AccumuloClient class toprovide a single TCP port in which clients can be securely routed through a firewall,without requiring access to all tablet servers in the cluster.PrerequisitesThe proxy server can live on any node in which the basic client API  [...]
       "url": " /docs/2.0/development/proxy",
       "categories": "development"
     },
@@ -149,7 +149,7 @@
   
     "docs-2-0-development-security": {
       "title": "Security",
-      "content"	 : "Accumulo extends the BigTable data model to implement a security mechanismknown as cell-level security. Every Key-Value pair has its own security label, storedunder the column visibility element of the key, which is used to determine whethera given user meets the security requirements to read the value. This enables data ofvarious security levels to be stored within the same row, and users of varyingdegrees of access to query the same table, while preserving data conf [...]
+      "content"	 : "Accumulo extends the BigTable data model to implement a security mechanismknown as cell-level security. Every Key-Value pair has its own security label, storedunder the column visibility element of the key, which is used to determine whethera given user meets the security requirements to read the value. This enables data ofvarious security levels to be stored within the same row, and users of varyingdegrees of access to query the same table, while preserving data conf [...]
       "url": " /docs/2.0/development/security",
       "categories": "development"
     },
@@ -163,7 +163,7 @@
   
     "docs-2-0-getting-started-clients": {
       "title": "Accumulo Clients",
-      "content"	 : "Creating Client CodeIf you are using Maven to create Accumulo client code, add the following to your pom:&amp;lt;dependency&amp;gt;  &amp;lt;groupId&amp;gt;org.apache.accumulo&amp;lt;/groupId&amp;gt;  &amp;lt;artifactId&amp;gt;accumulo-core&amp;lt;/artifactId&amp;gt;  &amp;lt;version&amp;gt;2.0.0&amp;lt;/version&amp;gt;&amp;lt;/dependency&amp;gt;When writing code that uses Accumulo, only use the Accumulo Public API.The accumulo-core artifact includes implementation co [...]
+      "content"	 : "Creating Client CodeIf you are using Maven to create Accumulo client code, add the following dependency to your pom:&amp;lt;dependency&amp;gt;  &amp;lt;groupId&amp;gt;org.apache.accumulo&amp;lt;/groupId&amp;gt;  &amp;lt;artifactId&amp;gt;accumulo-core&amp;lt;/artifactId&amp;gt;  &amp;lt;version&amp;gt;2.0.0&amp;lt;/version&amp;gt;&amp;lt;/dependency&amp;gt;When writing code that uses Accumulo, only use the Accumulo Public API.The accumulo-core artifact includes implem [...]
       "url": " /docs/2.0/getting-started/clients",
       "categories": "getting-started"
     },
@@ -191,14 +191,14 @@
   
     "docs-2-0-getting-started-table-configuration": {
       "title": "Table Configuration",
-      "content"	 : "Accumulo tables have a few options that can be configured to alter the defaultbehavior of Accumulo as well as improve performance based on the data stored.These include locality groups, constraints, bloom filters, iterators, and blockcache.  See the configuration properties documentation fora complete list of available configuration options.Locality GroupsAccumulo supports storing sets of column families separately on disk to allowclients to efficiently scan over colu [...]
+      "content"	 : "Accumulo tables have a few options that can be configured to alter the defaultbehavior of Accumulo as well as improve performance based on the data stored.These include locality groups, constraints, bloom filters, iterators, and blockcache.  See the configuration properties documentation fora complete list of available configuration options.Locality GroupsAccumulo supports storing sets of column families separately on disk to allowclients to efficiently scan over colu [...]
       "url": " /docs/2.0/getting-started/table_configuration",
       "categories": "getting-started"
     },
   
     "docs-2-0-getting-started-table-design": {
       "title": "Table Design",
-      "content"	 : "Basic TableSince Accumulo tables are sorted by row ID, each table can be thought of as beingindexed by the row ID. Lookups performed by row ID can be executed quickly, by doinga binary search, first across the tablets, and then within a tablet. Clients shouldchoose a row ID carefully in order to support their desired application. A simple ruleis to select a unique identifier as the row ID for each entity to be stored and assignall the other attributes to be tracked to [...]
+      "content"	 : "Basic TableSince Accumulo tables are sorted by row ID, each table can be thought of as beingindexed by the row ID. Lookups performed by row ID can be executed quickly, by doinga binary search, first across the tablets, and then within a tablet. Clients shouldchoose a row ID carefully in order to support their desired application. A simple ruleis to select a unique identifier as the row ID for each entity to be stored and assignall the other attributes to be tracked to [...]
       "url": " /docs/2.0/getting-started/table_design",
       "categories": "getting-started"
     },