accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [accumulo-website] branch asf-site updated: Jekyll build from master:80e4b91
Date Thu, 31 Jan 2019 18:32:52 GMT
This is an automated email from the ASF dual-hosted git repository.

ctubbsii 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 7956bf8  Jekyll build from master:80e4b91
7956bf8 is described below

commit 7956bf8ac1676b06f5800e7ca5a3d9c7354a2644
Author: Christopher Tubbs <ctubbsii@apache.org>
AuthorDate: Thu Jan 31 13:31:49 2019 -0500

    Jekyll build from master:80e4b91
    
    Update site for 2.0.0-alpha-2
---
 1.3/user_manual/Accumulo_Design.html               |    2 +-
 1.3/user_manual/Accumulo_Shell.html                |    2 +-
 1.3/user_manual/Administration.html                |    2 +-
 1.3/user_manual/Analytics.html                     |    2 +-
 1.3/user_manual/Contents.html                      |    2 +-
 1.3/user_manual/High_Speed_Ingest.html             |    2 +-
 1.3/user_manual/Introduction.html                  |    2 +-
 1.3/user_manual/Security.html                      |    2 +-
 1.3/user_manual/Shell_Commands.html                |    2 +-
 1.3/user_manual/Table_Configuration.html           |    2 +-
 1.3/user_manual/Table_Design.html                  |    2 +-
 1.3/user_manual/Writing_Accumulo_Clients.html      |    2 +-
 1.3/user_manual/accumulo_user_manual.html          |    2 +-
 1.3/user_manual/examples/aggregation.html          |    2 +-
 1.3/user_manual/examples/batch.html                |    2 +-
 1.3/user_manual/examples/bloom.html                |    2 +-
 1.3/user_manual/examples/bulkIngest.html           |    2 +-
 1.3/user_manual/examples/constraints.html          |    2 +-
 1.3/user_manual/examples/dirlist.html              |    2 +-
 1.3/user_manual/examples/filter.html               |    2 +-
 1.3/user_manual/examples/helloworld.html           |    2 +-
 1.3/user_manual/examples/index.html                |    2 +-
 1.3/user_manual/examples/mapred.html               |    2 +-
 1.3/user_manual/examples/shard.html                |    2 +-
 1.3/user_manual/index.html                         |    2 +-
 1.4/examples/batch.html                            |    2 +-
 1.4/examples/bloom.html                            |    2 +-
 1.4/examples/bulkIngest.html                       |    2 +-
 1.4/examples/combiner.html                         |    2 +-
 1.4/examples/constraints.html                      |    2 +-
 1.4/examples/dirlist.html                          |    2 +-
 1.4/examples/filedata.html                         |    2 +-
 1.4/examples/filter.html                           |    2 +-
 1.4/examples/helloworld.html                       |    2 +-
 1.4/examples/index.html                            |    2 +-
 1.4/examples/isolation.html                        |    2 +-
 1.4/examples/mapred.html                           |    2 +-
 1.4/examples/shard.html                            |    2 +-
 1.4/examples/visibility.html                       |    2 +-
 1.4/user_manual/Accumulo_Design.html               |    2 +-
 1.4/user_manual/Accumulo_Shell.html                |    2 +-
 1.4/user_manual/Administration.html                |    2 +-
 1.4/user_manual/Analytics.html                     |    2 +-
 1.4/user_manual/Contents.html                      |    2 +-
 1.4/user_manual/Development_Clients.html           |    2 +-
 1.4/user_manual/High_Speed_Ingest.html             |    2 +-
 1.4/user_manual/Introduction.html                  |    2 +-
 1.4/user_manual/Security.html                      |    2 +-
 1.4/user_manual/Shell_Commands.html                |    2 +-
 1.4/user_manual/Table_Configuration.html           |    2 +-
 1.4/user_manual/Table_Design.html                  |    2 +-
 1.4/user_manual/Writing_Accumulo_Clients.html      |    2 +-
 1.4/user_manual/accumulo_user_manual.html          |    2 +-
 1.4/user_manual/index.html                         |    2 +-
 1.5/examples/batch.html                            |    2 +-
 1.5/examples/bloom.html                            |    2 +-
 1.5/examples/bulkIngest.html                       |    2 +-
 1.5/examples/classpath.html                        |    2 +-
 1.5/examples/client.html                           |    2 +-
 1.5/examples/combiner.html                         |    2 +-
 1.5/examples/constraints.html                      |    2 +-
 1.5/examples/dirlist.html                          |    2 +-
 1.5/examples/export.html                           |    2 +-
 1.5/examples/filedata.html                         |    2 +-
 1.5/examples/filter.html                           |    2 +-
 1.5/examples/helloworld.html                       |    2 +-
 1.5/examples/index.html                            |    2 +-
 1.5/examples/isolation.html                        |    2 +-
 1.5/examples/mapred.html                           |    2 +-
 1.5/examples/maxmutation.html                      |    2 +-
 1.5/examples/regex.html                            |    2 +-
 1.5/examples/rowhash.html                          |    2 +-
 1.5/examples/shard.html                            |    2 +-
 1.5/examples/tabletofile.html                      |    2 +-
 1.5/examples/terasort.html                         |    2 +-
 1.5/examples/visibility.html                       |    2 +-
 1.6/examples/batch.html                            |    2 +-
 1.6/examples/bloom.html                            |    2 +-
 1.6/examples/bulkIngest.html                       |    2 +-
 1.6/examples/classpath.html                        |    2 +-
 1.6/examples/client.html                           |    2 +-
 1.6/examples/combiner.html                         |    2 +-
 1.6/examples/constraints.html                      |    2 +-
 1.6/examples/dirlist.html                          |    2 +-
 1.6/examples/export.html                           |    2 +-
 1.6/examples/filedata.html                         |    2 +-
 1.6/examples/filter.html                           |    2 +-
 1.6/examples/helloworld.html                       |    2 +-
 1.6/examples/index.html                            |    2 +-
 1.6/examples/isolation.html                        |    2 +-
 1.6/examples/mapred.html                           |    2 +-
 1.6/examples/maxmutation.html                      |    2 +-
 1.6/examples/regex.html                            |    2 +-
 1.6/examples/reservations.html                     |    2 +-
 1.6/examples/rowhash.html                          |    2 +-
 1.6/examples/shard.html                            |    2 +-
 1.6/examples/tabletofile.html                      |    2 +-
 1.6/examples/terasort.html                         |    2 +-
 1.6/examples/visibility.html                       |    2 +-
 1.7/examples/batch.html                            |    2 +-
 1.7/examples/bloom.html                            |    2 +-
 1.7/examples/bulkIngest.html                       |    2 +-
 1.7/examples/classpath.html                        |    2 +-
 1.7/examples/client.html                           |    2 +-
 1.7/examples/combiner.html                         |    2 +-
 1.7/examples/constraints.html                      |    2 +-
 1.7/examples/dirlist.html                          |    2 +-
 1.7/examples/export.html                           |    2 +-
 1.7/examples/filedata.html                         |    2 +-
 1.7/examples/filter.html                           |    2 +-
 1.7/examples/helloworld.html                       |    2 +-
 1.7/examples/index.html                            |    2 +-
 1.7/examples/isolation.html                        |    2 +-
 1.7/examples/mapred.html                           |    2 +-
 1.7/examples/maxmutation.html                      |    2 +-
 1.7/examples/regex.html                            |    2 +-
 1.7/examples/reservations.html                     |    2 +-
 1.7/examples/rowhash.html                          |    2 +-
 1.7/examples/shard.html                            |    2 +-
 1.7/examples/tabletofile.html                      |    2 +-
 1.7/examples/terasort.html                         |    2 +-
 1.7/examples/visibility.html                       |    2 +-
 1.8/examples/index.html                            |    2 +-
 1.9/examples/index.html                            |    2 +-
 api/index.html                                     |    2 +-
 blog/2014/05/03/accumulo-classloader.html          |    2 +-
 .../05/27/getting-started-with-accumulo-1.6.0.html |    2 +-
 .../scaling-accumulo-with-multivolume-support.html |    2 +-
 .../2014/07/09/functional-reads-over-accumulo.html |    2 +-
 ...eystores-for-configuring-accumulo-with-ssl.html |    2 +-
 blog/2015/03/20/balancing-groups-of-tablets.html   |    2 +-
 .../replicating-data-across-accumulo-clusters.html |    2 +-
 blog/2016/11/02/durability-performance.html        |    2 +-
 blog/2016/11/16/simpler-scripts-and-config.html    |    2 +-
 blog/2016/12/19/running-on-fedora-25.html          |    2 +-
 .../03/06/security-performance-implications.html   |    2 +-
 blog/2017/03/21/happy-anniversary-accumulo.html    |    2 +-
 blog/2017/04/21/introducing-uno-and-muchos.html    |    2 +-
 .../06/29/accumulo-documentation-improvements.html |    2 +-
 .../2017/07/27/accumulo-summmit-on-october-16.html |    2 +-
 blog/2017/12/12/take-the-accumulo-tour.html        |    2 +-
 blog/2018/03/16/moving-to-github-issues.html       |    2 +-
 blog/2018/03/22/view-metrics-in-grafana.html       |    2 +-
 blog/2018/07/05/accumulo-summit.html               |    2 +-
 contact-us/index.html                              |    2 +-
 contributor/bylaws.html                            |    2 +-
 contributor/consensusBuilding.html                 |    2 +-
 contributor/contrib-projects.html                  |    2 +-
 contributor/lazyConsensus.html                     |    2 +-
 contributor/making-release.html                    |    2 +-
 contributor/rb.html                                |    2 +-
 contributor/release-management.html                |    2 +-
 contributor/verifying-release.html                 |    2 +-
 contributor/versioning.html                        |    2 +-
 contributor/voting.html                            |    2 +-
 contributors-guide/index.html                      |    2 +-
 doap/accumulo.rdf                                  |    7 +
 docs-archive/index.html                            |    2 +-
 docs/2.x/administration/caching.html               |    4 +-
 docs/2.x/administration/fate.html                  |    2 +-
 docs/2.x/administration/in-depth-install.html      |    6 +-
 docs/2.x/administration/monitoring-metrics.html    |    2 +-
 docs/2.x/administration/multivolume.html           |    2 +-
 docs/2.x/administration/replication.html           |   30 +-
 docs/2.x/administration/scan-executors.html        |   14 +-
 docs/2.x/administration/upgrading.html             |    6 +-
 docs/2.x/apidocs/allclasses-frame.html             |   12 +-
 docs/2.x/apidocs/allclasses-noframe.html           |   12 +-
 docs/2.x/apidocs/constant-values.html              |   10 +-
 docs/2.x/apidocs/deprecated-list.html              |  315 +++--
 docs/2.x/apidocs/help-doc.html                     |   10 +-
 docs/2.x/apidocs/index-all.html                    | 1477 ++++++++++++--------
 docs/2.x/apidocs/index.html                        |    4 +-
 .../org/apache/accumulo/core/client/Accumulo.html  |   57 +-
 .../AccumuloClient.AccumuloClientFactory.html      |  256 ----
 .../client/AccumuloClient.AuthenticationArgs.html  |   76 +-
 ...tory.html => AccumuloClient.ClientFactory.html} |   54 +-
 .../client/AccumuloClient.ClientInfoOptions.html   |  255 ----
 .../client/AccumuloClient.ConnectionOptions.html   |  105 +-
 .../core/client/AccumuloClient.FromOptions.html    |   53 +-
 .../core/client/AccumuloClient.InstanceArgs.html   |   34 +-
 .../client/AccumuloClient.PropertyOptions.html     |   78 +-
 .../core/client/AccumuloClient.SaslOptions.html    |   55 +-
 .../core/client/AccumuloClient.SslOptions.html     |  103 +-
 .../accumulo/core/client/AccumuloClient.html       |  210 ++-
 .../accumulo/core/client/AccumuloException.html    |   10 +-
 .../core/client/AccumuloSecurityException.html     |   52 +-
 .../apache/accumulo/core/client/BatchDeleter.html  |   10 +-
 .../apache/accumulo/core/client/BatchScanner.html  |   10 +-
 .../apache/accumulo/core/client/BatchWriter.html   |   10 +-
 .../accumulo/core/client/BatchWriterConfig.html    |   10 +-
 .../client/ClientConfiguration.ClientProperty.html |   14 +-
 .../accumulo/core/client/ClientConfiguration.html  |   10 +-
 .../apache/accumulo/core/client/ClientInfo.html    |  370 -----
 .../core/client/ClientSideIteratorScanner.html     |  135 +-
 .../core/client/ConditionalWriter.Result.html      |   10 +-
 .../core/client/ConditionalWriter.Status.html      |   10 +-
 .../accumulo/core/client/ConditionalWriter.html    |   10 +-
 .../core/client/ConditionalWriterConfig.html       |   10 +-
 .../org/apache/accumulo/core/client/Connector.html |   36 +-
 .../apache/accumulo/core/client/Durability.html    |   10 +-
 .../org/apache/accumulo/core/client/Instance.html  |   13 +-
 .../client/IsolatedScanner.MemoryRowBuffer.html    |   10 +-
 .../IsolatedScanner.MemoryRowBufferFactory.html    |   10 +-
 .../core/client/IsolatedScanner.RowBuffer.html     |   10 +-
 .../client/IsolatedScanner.RowBufferFactory.html   |   10 +-
 .../accumulo/core/client/IsolatedScanner.html      |  125 +-
 .../core/client/IteratorSetting.Column.html        |   10 +-
 .../accumulo/core/client/IteratorSetting.html      |   10 +-
 .../core/client/MultiTableBatchWriter.html         |   10 +-
 .../core/client/MutationsRejectedException.html    |   22 +-
 .../core/client/NamespaceExistsException.html      |   16 +-
 .../core/client/NamespaceNotEmptyException.html    |   16 +-
 .../core/client/NamespaceNotFoundException.html    |   16 +-
 .../apache/accumulo/core/client/RowIterator.html   |   10 +-
 .../core/client/SampleNotPresentException.html     |   10 +-
 .../org/apache/accumulo/core/client/Scanner.html   |   69 +-
 .../apache/accumulo/core/client/ScannerBase.html   |   12 +-
 .../core/client/TableDeletedException.html         |   30 +-
 .../accumulo/core/client/TableExistsException.html |   16 +-
 .../core/client/TableNotFoundException.html        |   16 +-
 .../core/client/TableOfflineException.html         |   34 +-
 .../accumulo/core/client/TimedOutException.html    |   10 +-
 .../accumulo/core/client/ZooKeeperInstance.html    |   29 +-
 .../admin/ActiveCompaction.CompactionReason.html   |   10 +-
 .../admin/ActiveCompaction.CompactionType.html     |   10 +-
 .../core/client/admin/ActiveCompaction.html        |   10 +-
 .../accumulo/core/client/admin/ActiveScan.html     |   10 +-
 .../core/client/admin/CompactionConfig.html        |   10 +-
 .../client/admin/CompactionStrategyConfig.html     |   10 +-
 .../core/client/admin/DelegationTokenConfig.html   |   10 +-
 .../accumulo/core/client/admin/DiskUsage.html      |   10 +-
 .../apache/accumulo/core/client/admin/FindMax.html |   10 +-
 .../core/client/admin/InitialTableState.html       |   10 +-
 .../core/client/admin/InstanceOperations.html      |   10 +-
 .../accumulo/core/client/admin/Locations.html      |   10 +-
 .../core/client/admin/NamespaceOperations.html     |   10 +-
 .../core/client/admin/NewTableConfiguration.html   |   10 +-
 .../core/client/admin/ReplicationOperations.html   |   10 +-
 .../accumulo/core/client/admin/ScanState.html      |   10 +-
 .../accumulo/core/client/admin/ScanType.html       |   10 +-
 .../core/client/admin/SecurityOperations.html      |  214 +--
 .../core/client/admin/SummaryRetriever.html        |   10 +-
 ...TableOperations.ImportDestinationArguments.html |   10 +-
 .../TableOperations.ImportMappingOptions.html      |   12 +-
 .../admin/TableOperations.ImportOptions.html       |   19 +-
 .../core/client/admin/TableOperations.html         |  221 +--
 .../accumulo/core/client/admin/TimeType.html       |   10 +-
 .../ActiveCompaction.CompactionReason.html         |   10 +-
 .../class-use/ActiveCompaction.CompactionType.html |   10 +-
 .../client/admin/class-use/ActiveCompaction.html   |   10 +-
 .../core/client/admin/class-use/ActiveScan.html    |   10 +-
 .../client/admin/class-use/CompactionConfig.html   |   10 +-
 .../admin/class-use/CompactionStrategyConfig.html  |   10 +-
 .../admin/class-use/DelegationTokenConfig.html     |   10 +-
 .../core/client/admin/class-use/DiskUsage.html     |   10 +-
 .../core/client/admin/class-use/FindMax.html       |   10 +-
 .../client/admin/class-use/InitialTableState.html  |   10 +-
 .../client/admin/class-use/InstanceOperations.html |   10 +-
 .../core/client/admin/class-use/Locations.html     |   10 +-
 .../admin/class-use/NamespaceOperations.html       |   10 +-
 .../admin/class-use/NewTableConfiguration.html     |   10 +-
 .../admin/class-use/ReplicationOperations.html     |   10 +-
 .../core/client/admin/class-use/ScanState.html     |   10 +-
 .../core/client/admin/class-use/ScanType.html      |   10 +-
 .../client/admin/class-use/SecurityOperations.html |   10 +-
 .../client/admin/class-use/SummaryRetriever.html   |   10 +-
 ...TableOperations.ImportDestinationArguments.html |   10 +-
 .../TableOperations.ImportMappingOptions.html      |   12 +-
 .../class-use/TableOperations.ImportOptions.html   |   10 +-
 .../client/admin/class-use/TableOperations.html    |   10 +-
 .../core/client/admin/class-use/TimeType.html      |   20 +-
 .../accumulo/core/client/admin/package-frame.html  |    6 +-
 .../core/client/admin/package-summary.html         |   10 +-
 .../accumulo/core/client/admin/package-tree.html   |   12 +-
 .../accumulo/core/client/admin/package-use.html    |   10 +-
 .../accumulo/core/client/class-use/Accumulo.html   |   10 +-
 .../AccumuloClient.AccumuloClientFactory.html      |  205 ---
 .../AccumuloClient.AuthenticationArgs.html         |   18 +-
 ...tory.html => AccumuloClient.ClientFactory.html} |   48 +-
 .../AccumuloClient.ClientInfoOptions.html          |  168 ---
 .../AccumuloClient.ConnectionOptions.html          |   50 +-
 .../class-use/AccumuloClient.FromOptions.html      |   28 +-
 .../class-use/AccumuloClient.InstanceArgs.html     |   20 +-
 .../class-use/AccumuloClient.PropertyOptions.html  |   28 +-
 .../class-use/AccumuloClient.SaslOptions.html      |   22 +-
 .../class-use/AccumuloClient.SslOptions.html       |   52 +-
 .../core/client/class-use/AccumuloClient.html      |   49 +-
 .../core/client/class-use/AccumuloException.html   |  211 +--
 .../class-use/AccumuloSecurityException.html       |  247 ++--
 .../core/client/class-use/BatchDeleter.html        |   10 +-
 .../core/client/class-use/BatchScanner.html        |   21 +-
 .../core/client/class-use/BatchWriter.html         |   10 +-
 .../core/client/class-use/BatchWriterConfig.html   |   40 +-
 .../ClientConfiguration.ClientProperty.html        |   10 +-
 .../core/client/class-use/ClientConfiguration.html |   59 +-
 .../accumulo/core/client/class-use/ClientInfo.html |  348 -----
 .../class-use/ClientSideIteratorScanner.html       |   10 +-
 .../client/class-use/ConditionalWriter.Result.html |   10 +-
 .../client/class-use/ConditionalWriter.Status.html |   10 +-
 .../core/client/class-use/ConditionalWriter.html   |   10 +-
 .../client/class-use/ConditionalWriterConfig.html  |   10 +-
 .../accumulo/core/client/class-use/Connector.html  |   22 +-
 .../accumulo/core/client/class-use/Durability.html |   26 +-
 .../accumulo/core/client/class-use/Instance.html   |   57 +-
 .../class-use/IsolatedScanner.MemoryRowBuffer.html |   10 +-
 .../IsolatedScanner.MemoryRowBufferFactory.html    |   10 +-
 .../class-use/IsolatedScanner.RowBuffer.html       |   10 +-
 .../IsolatedScanner.RowBufferFactory.html          |   10 +-
 .../core/client/class-use/IsolatedScanner.html     |   10 +-
 .../client/class-use/IteratorSetting.Column.html   |   10 +-
 .../core/client/class-use/IteratorSetting.html     |   62 +-
 .../client/class-use/MultiTableBatchWriter.html    |   10 +-
 .../class-use/MutationsRejectedException.html      |   10 +-
 .../client/class-use/NamespaceExistsException.html |   10 +-
 .../class-use/NamespaceNotEmptyException.html      |   10 +-
 .../class-use/NamespaceNotFoundException.html      |   10 +-
 .../core/client/class-use/RowIterator.html         |   10 +-
 .../class-use/SampleNotPresentException.html       |   10 +-
 .../accumulo/core/client/class-use/Scanner.html    |  111 +-
 .../core/client/class-use/ScannerBase.html         |   52 +-
 .../client/class-use/TableDeletedException.html    |   10 +-
 .../client/class-use/TableExistsException.html     |   29 +-
 .../client/class-use/TableNotFoundException.html   |   56 +-
 .../client/class-use/TableOfflineException.html    |   10 +-
 .../core/client/class-use/TimedOutException.html   |   10 +-
 .../core/client/class-use/ZooKeeperInstance.html   |   12 +-
 .../core/client/lexicoder/AbstractEncoder.html     |   12 +-
 .../core/client/lexicoder/BigIntegerLexicoder.html |   14 +-
 .../core/client/lexicoder/BytesLexicoder.html      |   14 +-
 .../core/client/lexicoder/DateLexicoder.html       |   14 +-
 .../core/client/lexicoder/DoubleLexicoder.html     |   14 +-
 .../accumulo/core/client/lexicoder/Encoder.html    |   12 +-
 .../core/client/lexicoder/FloatLexicoder.html      |   14 +-
 .../core/client/lexicoder/IntegerLexicoder.html    |   14 +-
 .../accumulo/core/client/lexicoder/Lexicoder.html  |   12 +-
 .../core/client/lexicoder/ListLexicoder.html       |   14 +-
 .../core/client/lexicoder/LongLexicoder.html       |   12 +-
 .../core/client/lexicoder/PairLexicoder.html       |   14 +-
 .../core/client/lexicoder/ReverseLexicoder.html    |   14 +-
 .../core/client/lexicoder/StringLexicoder.html     |   14 +-
 .../core/client/lexicoder/TextLexicoder.html       |   14 +-
 .../core/client/lexicoder/UIntegerLexicoder.html   |   14 +-
 .../core/client/lexicoder/ULongLexicoder.html      |   14 +-
 .../core/client/lexicoder/UUIDLexicoder.html       |   14 +-
 .../lexicoder/class-use/AbstractEncoder.html       |   20 +-
 .../lexicoder/class-use/BigIntegerLexicoder.html   |   10 +-
 .../client/lexicoder/class-use/BytesLexicoder.html |   10 +-
 .../client/lexicoder/class-use/DateLexicoder.html  |   10 +-
 .../lexicoder/class-use/DoubleLexicoder.html       |   10 +-
 .../core/client/lexicoder/class-use/Encoder.html   |   20 +-
 .../client/lexicoder/class-use/FloatLexicoder.html |   10 +-
 .../lexicoder/class-use/IntegerLexicoder.html      |   10 +-
 .../core/client/lexicoder/class-use/Lexicoder.html |   20 +-
 .../client/lexicoder/class-use/ListLexicoder.html  |   10 +-
 .../client/lexicoder/class-use/LongLexicoder.html  |   10 +-
 .../client/lexicoder/class-use/PairLexicoder.html  |   10 +-
 .../lexicoder/class-use/ReverseLexicoder.html      |   10 +-
 .../lexicoder/class-use/StringLexicoder.html       |   10 +-
 .../client/lexicoder/class-use/TextLexicoder.html  |   10 +-
 .../lexicoder/class-use/UIntegerLexicoder.html     |   10 +-
 .../client/lexicoder/class-use/ULongLexicoder.html |   10 +-
 .../client/lexicoder/class-use/UUIDLexicoder.html  |   10 +-
 .../core/client/lexicoder/package-frame.html       |    6 +-
 .../core/client/lexicoder/package-summary.html     |   10 +-
 .../core/client/lexicoder/package-tree.html        |   12 +-
 .../core/client/lexicoder/package-use.html         |   22 +-
 .../AbstractInputFormat.AbstractRecordReader.html  |   56 +-
 .../core/client/mapred/AbstractInputFormat.html    |  288 ++--
 .../client/mapred/AccumuloFileOutputFormat.html    |   76 +-
 .../core/client/mapred/AccumuloInputFormat.html    |   43 +-
 .../mapred/AccumuloMultiTableInputFormat.html      |   49 +-
 .../AccumuloOutputFormat.AccumuloRecordWriter.html |   14 +-
 .../core/client/mapred/AccumuloOutputFormat.html   |  301 ++--
 .../core/client/mapred/AccumuloRowInputFormat.html |   40 +-
 .../mapred/InputFormatBase.RecordReaderBase.html   |   72 +-
 .../core/client/mapred/InputFormatBase.html        |  123 +-
 .../core/client/mapred/RangeInputSplit.html        |   34 +-
 .../AbstractInputFormat.AbstractRecordReader.html  |   14 +-
 .../mapred/class-use/AbstractInputFormat.html      |   31 +-
 .../mapred/class-use/AccumuloFileOutputFormat.html |   10 +-
 .../mapred/class-use/AccumuloInputFormat.html      |   10 +-
 .../class-use/AccumuloMultiTableInputFormat.html   |   10 +-
 .../AccumuloOutputFormat.AccumuloRecordWriter.html |   10 +-
 .../mapred/class-use/AccumuloOutputFormat.html     |   10 +-
 .../mapred/class-use/AccumuloRowInputFormat.html   |   10 +-
 .../InputFormatBase.RecordReaderBase.html          |   10 +-
 .../client/mapred/class-use/InputFormatBase.html   |   20 +-
 .../client/mapred/class-use/RangeInputSplit.html   |   34 +-
 .../accumulo/core/client/mapred/package-frame.html |    6 +-
 .../core/client/mapred/package-summary.html        |   59 +-
 .../accumulo/core/client/mapred/package-tree.html  |   10 +-
 .../accumulo/core/client/mapred/package-use.html   |   33 +-
 .../AbstractInputFormat.AbstractRecordReader.html  |   54 +-
 .../core/client/mapreduce/AbstractInputFormat.html |  368 ++---
 .../client/mapreduce/AccumuloFileOutputFormat.html |   76 +-
 .../core/client/mapreduce/AccumuloInputFormat.html |   40 +-
 .../mapreduce/AccumuloMultiTableInputFormat.html   |   40 +-
 .../AccumuloOutputFormat.AccumuloRecordWriter.html |   10 +-
 .../client/mapreduce/AccumuloOutputFormat.html     |  308 ++--
 .../client/mapreduce/AccumuloRowInputFormat.html   |   40 +-
 .../InputFormatBase.RecordReaderBase.html          |   71 +-
 .../core/client/mapreduce/InputFormatBase.html     |  123 +-
 .../core/client/mapreduce/InputTableConfig.html    |  167 ++-
 .../core/client/mapreduce/RangeInputSplit.html     |  505 +++++--
 .../AbstractInputFormat.AbstractRecordReader.html  |   14 +-
 .../mapreduce/class-use/AbstractInputFormat.html   |   31 +-
 .../class-use/AccumuloFileOutputFormat.html        |   10 +-
 .../mapreduce/class-use/AccumuloInputFormat.html   |   10 +-
 .../class-use/AccumuloMultiTableInputFormat.html   |   10 +-
 .../AccumuloOutputFormat.AccumuloRecordWriter.html |   10 +-
 .../mapreduce/class-use/AccumuloOutputFormat.html  |   10 +-
 .../class-use/AccumuloRowInputFormat.html          |   10 +-
 .../InputFormatBase.RecordReaderBase.html          |   10 +-
 .../mapreduce/class-use/InputFormatBase.html       |   20 +-
 .../mapreduce/class-use/InputTableConfig.html      |   39 +-
 .../mapreduce/class-use/RangeInputSplit.html       |   49 +-
 .../lib/partition/KeyRangePartitioner.html         |   47 +-
 .../mapreduce/lib/partition/RangePartitioner.html  |   47 +-
 .../partition/class-use/KeyRangePartitioner.html   |   10 +-
 .../lib/partition/class-use/RangePartitioner.html  |   10 +-
 .../mapreduce/lib/partition/package-frame.html     |    6 +-
 .../mapreduce/lib/partition/package-summary.html   |   20 +-
 .../mapreduce/lib/partition/package-tree.html      |   10 +-
 .../mapreduce/lib/partition/package-use.html       |   10 +-
 .../core/client/mapreduce/package-frame.html       |    6 +-
 .../core/client/mapreduce/package-summary.html     |   62 +-
 .../core/client/mapreduce/package-tree.html        |   10 +-
 .../core/client/mapreduce/package-use.html         |   46 +-
 .../apache/accumulo/core/client/package-frame.html |   11 +-
 .../accumulo/core/client/package-summary.html      |   61 +-
 .../apache/accumulo/core/client/package-tree.html  |   42 +-
 .../apache/accumulo/core/client/package-use.html   |  154 +-
 .../client/replication/PeerExistsException.html    |   10 +-
 .../client/replication/PeerNotFoundException.html  |   10 +-
 .../replication/class-use/PeerExistsException.html |   10 +-
 .../class-use/PeerNotFoundException.html           |   10 +-
 .../core/client/replication/package-frame.html     |    6 +-
 .../core/client/replication/package-summary.html   |   10 +-
 .../core/client/replication/package-tree.html      |   10 +-
 .../core/client/replication/package-use.html       |   10 +-
 .../core/client/rfile/RFile.InputArguments.html    |   10 +-
 .../core/client/rfile/RFile.OutputArguments.html   |   10 +-
 .../core/client/rfile/RFile.ScannerFSOptions.html  |   10 +-
 .../core/client/rfile/RFile.ScannerOptions.html    |   10 +-
 .../core/client/rfile/RFile.SummaryFSOptions.html  |   10 +-
 .../client/rfile/RFile.SummaryInputArguments.html  |   10 +-
 .../core/client/rfile/RFile.SummaryOptions.html    |   10 +-
 .../core/client/rfile/RFile.WriterFSOptions.html   |   10 +-
 .../core/client/rfile/RFile.WriterOptions.html     |   10 +-
 .../apache/accumulo/core/client/rfile/RFile.html   |   10 +-
 .../accumulo/core/client/rfile/RFileSource.html    |   10 +-
 .../accumulo/core/client/rfile/RFileWriter.html    |   10 +-
 .../rfile/class-use/RFile.InputArguments.html      |   10 +-
 .../rfile/class-use/RFile.OutputArguments.html     |   10 +-
 .../rfile/class-use/RFile.ScannerFSOptions.html    |   10 +-
 .../rfile/class-use/RFile.ScannerOptions.html      |   10 +-
 .../rfile/class-use/RFile.SummaryFSOptions.html    |   10 +-
 .../class-use/RFile.SummaryInputArguments.html     |   10 +-
 .../rfile/class-use/RFile.SummaryOptions.html      |   10 +-
 .../rfile/class-use/RFile.WriterFSOptions.html     |   10 +-
 .../rfile/class-use/RFile.WriterOptions.html       |   10 +-
 .../core/client/rfile/class-use/RFile.html         |   10 +-
 .../core/client/rfile/class-use/RFileSource.html   |   10 +-
 .../core/client/rfile/class-use/RFileWriter.html   |   10 +-
 .../accumulo/core/client/rfile/package-frame.html  |    6 +-
 .../core/client/rfile/package-summary.html         |   10 +-
 .../accumulo/core/client/rfile/package-tree.html   |   10 +-
 .../accumulo/core/client/rfile/package-use.html    |   10 +-
 .../core/client/sample/AbstractHashSampler.html    |   10 +-
 .../core/client/sample/RowColumnSampler.html       |   10 +-
 .../accumulo/core/client/sample/RowSampler.html    |   10 +-
 .../accumulo/core/client/sample/Sampler.html       |   10 +-
 .../core/client/sample/SamplerConfiguration.html   |   10 +-
 .../sample/class-use/AbstractHashSampler.html      |   10 +-
 .../client/sample/class-use/RowColumnSampler.html  |   10 +-
 .../core/client/sample/class-use/RowSampler.html   |   10 +-
 .../core/client/sample/class-use/Sampler.html      |   10 +-
 .../sample/class-use/SamplerConfiguration.html     |   27 +-
 .../accumulo/core/client/sample/package-frame.html |    6 +-
 .../core/client/sample/package-summary.html        |   10 +-
 .../accumulo/core/client/sample/package-tree.html  |   10 +-
 .../accumulo/core/client/sample/package-use.html   |   10 +-
 .../core/client/security/SecurityErrorCode.html    |   10 +-
 .../security/class-use/SecurityErrorCode.html      |   14 +-
 .../core/client/security/package-frame.html        |    6 +-
 .../core/client/security/package-summary.html      |   10 +-
 .../core/client/security/package-tree.html         |   10 +-
 .../accumulo/core/client/security/package-use.html |   10 +-
 ...icationToken.AuthenticationTokenSerializer.html |   10 +-
 .../tokens/AuthenticationToken.Properties.html     |   10 +-
 .../tokens/AuthenticationToken.TokenProperty.html  |   10 +-
 .../security/tokens/AuthenticationToken.html       |   10 +-
 .../security/tokens/CredentialProviderToken.html   |   10 +-
 .../client/security/tokens/DelegationToken.html    |   10 +-
 .../core/client/security/tokens/KerberosToken.html |   43 +-
 .../core/client/security/tokens/NullToken.html     |   10 +-
 .../core/client/security/tokens/PasswordToken.html |   10 +-
 ...icationToken.AuthenticationTokenSerializer.html |   10 +-
 .../class-use/AuthenticationToken.Properties.html  |   16 +-
 .../AuthenticationToken.TokenProperty.html         |   16 +-
 .../tokens/class-use/AuthenticationToken.html      |   97 +-
 .../tokens/class-use/CredentialProviderToken.html  |   10 +-
 .../security/tokens/class-use/DelegationToken.html |   10 +-
 .../security/tokens/class-use/KerberosToken.html   |   10 +-
 .../security/tokens/class-use/NullToken.html       |   10 +-
 .../security/tokens/class-use/PasswordToken.html   |   10 +-
 .../core/client/security/tokens/package-frame.html |    6 +-
 .../client/security/tokens/package-summary.html    |   10 +-
 .../core/client/security/tokens/package-tree.html  |   10 +-
 .../core/client/security/tokens/package-use.html   |   31 +-
 .../core/client/summary/CounterSummary.html        |   10 +-
 .../summary/CountingSummarizer.Converter.html      |   10 +-
 .../core/client/summary/CountingSummarizer.html    |   12 +-
 .../core/client/summary/Summarizer.Collector.html  |   10 +-
 .../core/client/summary/Summarizer.Combiner.html   |   10 +-
 .../summary/Summarizer.StatisticConsumer.html      |   10 +-
 .../accumulo/core/client/summary/Summarizer.html   |   12 +-
 .../summary/SummarizerConfiguration.Builder.html   |   10 +-
 .../client/summary/SummarizerConfiguration.html    |   10 +-
 .../client/summary/Summary.FileStatistics.html     |   10 +-
 .../accumulo/core/client/summary/Summary.html      |   10 +-
 .../client/summary/class-use/CounterSummary.html   |   10 +-
 .../class-use/CountingSummarizer.Converter.html    |   14 +-
 .../summary/class-use/CountingSummarizer.html      |   18 +-
 .../summary/class-use/Summarizer.Collector.html    |   10 +-
 .../summary/class-use/Summarizer.Combiner.html     |   10 +-
 .../class-use/Summarizer.StatisticConsumer.html    |   10 +-
 .../core/client/summary/class-use/Summarizer.html  |   22 +-
 .../class-use/SummarizerConfiguration.Builder.html |   10 +-
 .../summary/class-use/SummarizerConfiguration.html |   60 +-
 .../summary/class-use/Summary.FileStatistics.html  |   10 +-
 .../core/client/summary/class-use/Summary.html     |   10 +-
 .../core/client/summary/package-frame.html         |    6 +-
 .../core/client/summary/package-summary.html       |   10 +-
 .../accumulo/core/client/summary/package-tree.html |   10 +-
 .../accumulo/core/client/summary/package-use.html  |   35 +-
 ...ummarizer.html => AuthorizationSummarizer.html} |   94 +-
 .../summary/summarizers/DeletesSummarizer.html     |   14 +-
 .../summary/summarizers/EntryLengthSummarizer.html |   10 +-
 .../summary/summarizers/FamilySummarizer.html      |   10 +-
 .../summary/summarizers/VisibilitySummarizer.html  |   13 +-
 ...ummarizer.html => AuthorizationSummarizer.html} |   26 +-
 .../summarizers/class-use/DeletesSummarizer.html   |   10 +-
 .../class-use/EntryLengthSummarizer.html           |   10 +-
 .../summarizers/class-use/FamilySummarizer.html    |   10 +-
 .../class-use/VisibilitySummarizer.html            |   10 +-
 .../client/summary/summarizers/package-frame.html  |    7 +-
 .../summary/summarizers/package-summary.html       |   22 +-
 .../client/summary/summarizers/package-tree.html   |   11 +-
 .../client/summary/summarizers/package-use.html    |   10 +-
 .../accumulo/core/data/ArrayByteSequence.html      |   10 +-
 .../apache/accumulo/core/data/ByteSequence.html    |   10 +-
 .../org/apache/accumulo/core/data/Column.html      |   20 +-
 .../apache/accumulo/core/data/ColumnUpdate.html    |   10 +-
 .../org/apache/accumulo/core/data/Condition.html   |   10 +-
 .../accumulo/core/data/ConditionalMutation.html    |   10 +-
 .../core/data/ConstraintViolationSummary.html      |   20 +-
 .../apidocs/org/apache/accumulo/core/data/Key.html |   28 +-
 .../accumulo/core/data/KeyBuilder.Build.html       |   10 +-
 .../core/data/KeyBuilder.ColumnFamilyStep.html     |   10 +-
 .../core/data/KeyBuilder.ColumnQualifierStep.html  |   10 +-
 .../core/data/KeyBuilder.ColumnVisibilityStep.html |   10 +-
 .../accumulo/core/data/KeyBuilder.RowStep.html     |   10 +-
 .../org/apache/accumulo/core/data/KeyBuilder.html  |   10 +-
 .../org/apache/accumulo/core/data/KeyValue.html    |   10 +-
 .../accumulo/core/data/LoadPlan.Builder.html       |   10 +-
 .../accumulo/core/data/LoadPlan.Destination.html   |   10 +-
 .../accumulo/core/data/LoadPlan.RangeType.html     |   10 +-
 .../org/apache/accumulo/core/data/LoadPlan.html    |   10 +-
 .../accumulo/core/data/Mutation.FamilyOptions.html |   10 +-
 .../core/data/Mutation.MutationOptions.html        |   10 +-
 .../core/data/Mutation.QualifierOptions.html       |   10 +-
 .../core/data/Mutation.SERIALIZED_FORMAT.html      |   10 +-
 .../core/data/Mutation.TimestampOptions.html       |   10 +-
 .../core/data/Mutation.VisibilityOptions.html      |   10 +-
 .../org/apache/accumulo/core/data/Mutation.html    |   20 +-
 .../org/apache/accumulo/core/data/PartialKey.html  |   48 +-
 .../org/apache/accumulo/core/data/Range.html       |   20 +-
 .../org/apache/accumulo/core/data/TabletId.html    |   10 +-
 .../accumulo/core/data/Value.Comparator.html       |   10 +-
 .../org/apache/accumulo/core/data/Value.html       |   78 +-
 .../core/data/class-use/ArrayByteSequence.html     |   10 +-
 .../accumulo/core/data/class-use/ByteSequence.html |   26 +-
 .../accumulo/core/data/class-use/Column.html       |   10 +-
 .../accumulo/core/data/class-use/ColumnUpdate.html |   10 +-
 .../accumulo/core/data/class-use/Condition.html    |   10 +-
 .../core/data/class-use/ConditionalMutation.html   |   10 +-
 .../data/class-use/ConstraintViolationSummary.html |   14 +-
 .../apache/accumulo/core/data/class-use/Key.html   |   64 +-
 .../core/data/class-use/KeyBuilder.Build.html      |   10 +-
 .../class-use/KeyBuilder.ColumnFamilyStep.html     |   10 +-
 .../class-use/KeyBuilder.ColumnQualifierStep.html  |   10 +-
 .../class-use/KeyBuilder.ColumnVisibilityStep.html |   10 +-
 .../core/data/class-use/KeyBuilder.RowStep.html    |   10 +-
 .../accumulo/core/data/class-use/KeyBuilder.html   |   10 +-
 .../accumulo/core/data/class-use/KeyValue.html     |   12 +-
 .../core/data/class-use/LoadPlan.Builder.html      |   10 +-
 .../core/data/class-use/LoadPlan.Destination.html  |   10 +-
 .../core/data/class-use/LoadPlan.RangeType.html    |   10 +-
 .../accumulo/core/data/class-use/LoadPlan.html     |   10 +-
 .../data/class-use/Mutation.FamilyOptions.html     |   10 +-
 .../data/class-use/Mutation.MutationOptions.html   |   10 +-
 .../data/class-use/Mutation.QualifierOptions.html  |   10 +-
 .../data/class-use/Mutation.SERIALIZED_FORMAT.html |   10 +-
 .../data/class-use/Mutation.TimestampOptions.html  |   10 +-
 .../data/class-use/Mutation.VisibilityOptions.html |   10 +-
 .../accumulo/core/data/class-use/Mutation.html     |   18 +-
 .../accumulo/core/data/class-use/PartialKey.html   |   20 +-
 .../apache/accumulo/core/data/class-use/Range.html |   52 +-
 .../accumulo/core/data/class-use/TabletId.html     |   14 +-
 .../core/data/class-use/Value.Comparator.html      |   10 +-
 .../apache/accumulo/core/data/class-use/Value.html |   56 +-
 .../apache/accumulo/core/data/package-frame.html   |    6 +-
 .../apache/accumulo/core/data/package-summary.html |   10 +-
 .../apache/accumulo/core/data/package-tree.html    |   12 +-
 .../org/apache/accumulo/core/data/package-use.html |   10 +-
 .../core/security/AuthorizationContainer.html      |   10 +-
 .../accumulo/core/security/Authorizations.html     |   10 +-
 .../core/security/ColumnVisibility.Node.html       |   10 +-
 .../security/ColumnVisibility.NodeComparator.html  |   10 +-
 .../core/security/ColumnVisibility.NodeType.html   |   10 +-
 .../accumulo/core/security/ColumnVisibility.html   |   10 +-
 .../core/security/NamespacePermission.html         |   10 +-
 .../accumulo/core/security/SystemPermission.html   |   10 +-
 .../accumulo/core/security/TablePermission.html    |   10 +-
 .../core/security/VisibilityEvaluator.html         |   10 +-
 .../core/security/VisibilityParseException.html    |   10 +-
 .../security/class-use/AuthorizationContainer.html |   10 +-
 .../core/security/class-use/Authorizations.html    |   47 +-
 .../security/class-use/ColumnVisibility.Node.html  |   10 +-
 .../class-use/ColumnVisibility.NodeComparator.html |   10 +-
 .../class-use/ColumnVisibility.NodeType.html       |   10 +-
 .../core/security/class-use/ColumnVisibility.html  |   10 +-
 .../security/class-use/NamespacePermission.html    |   10 +-
 .../core/security/class-use/SystemPermission.html  |   10 +-
 .../core/security/class-use/TablePermission.html   |   10 +-
 .../security/class-use/VisibilityEvaluator.html    |   10 +-
 .../class-use/VisibilityParseException.html        |   10 +-
 .../accumulo/core/security/package-frame.html      |    6 +-
 .../accumulo/core/security/package-summary.html    |   10 +-
 .../accumulo/core/security/package-tree.html       |   14 +-
 .../apache/accumulo/core/security/package-use.html |   35 +-
 .../apache/accumulo/minicluster/MemoryUnit.html    |   10 +-
 .../accumulo/minicluster/MiniAccumuloCluster.html  |   68 +-
 .../accumulo/minicluster/MiniAccumuloConfig.html   |   10 +-
 .../accumulo/minicluster/MiniAccumuloInstance.html |   12 +-
 .../minicluster/MiniAccumuloRunner.Opts.html       |   10 +-
 .../MiniAccumuloRunner.PropertiesConverter.html    |   10 +-
 .../accumulo/minicluster/MiniAccumuloRunner.html   |   10 +-
 .../apache/accumulo/minicluster/ServerType.html    |   10 +-
 .../accumulo/minicluster/class-use/MemoryUnit.html |   10 +-
 .../minicluster/class-use/MiniAccumuloCluster.html |   10 +-
 .../minicluster/class-use/MiniAccumuloConfig.html  |   10 +-
 .../class-use/MiniAccumuloInstance.html            |   10 +-
 .../class-use/MiniAccumuloRunner.Opts.html         |   10 +-
 .../MiniAccumuloRunner.PropertiesConverter.html    |   10 +-
 .../minicluster/class-use/MiniAccumuloRunner.html  |   10 +-
 .../accumulo/minicluster/class-use/ServerType.html |   10 +-
 .../apache/accumulo/minicluster/package-frame.html |    6 +-
 .../accumulo/minicluster/package-summary.html      |   12 +-
 .../apache/accumulo/minicluster/package-tree.html  |   12 +-
 .../apache/accumulo/minicluster/package-use.html   |   10 +-
 docs/2.x/apidocs/overview-frame.html               |    6 +-
 docs/2.x/apidocs/overview-summary.html             |   12 +-
 docs/2.x/apidocs/overview-tree.html                |   59 +-
 docs/2.x/apidocs/serialized-form.html              |   12 +-
 docs/2.x/configuration/client-properties.html      |    2 +-
 docs/2.x/configuration/files.html                  |    2 +-
 docs/2.x/configuration/overview.html               |    8 +-
 docs/2.x/configuration/server-properties.html      |   30 +-
 docs/2.x/development/development_tools.html        |   16 +-
 docs/2.x/development/high_speed_ingest.html        |    6 +-
 docs/2.x/development/iterators.html                |   72 +-
 docs/2.x/development/mapreduce.html                |   30 +-
 docs/2.x/development/proxy.html                    |    6 +-
 docs/2.x/development/sampling.html                 |   26 +-
 docs/2.x/development/summaries.html                |    8 +-
 docs/2.x/getting-started/clients.html              |   64 +-
 docs/2.x/getting-started/design.html               |    2 +-
 docs/2.x/getting-started/features.html             |    4 +-
 docs/2.x/getting-started/glossary.html             |    2 +-
 docs/2.x/getting-started/quickstart.html           |    8 +-
 docs/2.x/getting-started/shell.html                |    4 +-
 docs/2.x/getting-started/table_configuration.html  |   30 +-
 docs/2.x/getting-started/table_design.html         |    2 +-
 docs/2.x/security/authentication.html              |   16 +-
 docs/2.x/security/authorizations.html              |   18 +-
 docs/2.x/security/kerberos.html                    |   26 +-
 docs/2.x/security/on-disk-encryption.html          |   14 +-
 docs/2.x/security/overview.html                    |   10 +-
 docs/2.x/security/permissions.html                 |   16 +-
 docs/2.x/security/wire-encryption.html             |    2 +-
 docs/2.x/troubleshooting/advanced.html             |    2 +-
 docs/2.x/troubleshooting/basic.html                |    2 +-
 docs/2.x/troubleshooting/performance.html          |    2 +-
 .../troubleshooting/system-metadata-tables.html    |    2 +-
 docs/2.x/troubleshooting/tools.html                |    2 +-
 docs/2.x/troubleshooting/tracing.html              |    2 +-
 downloads/index.html                               |   22 +-
 external-docs/index.html                           |    2 +-
 feed.xml                                           |   55 +-
 how-to-contribute/index.html                       |    2 +-
 index.html                                         |   16 +-
 news/index.html                                    |   15 +-
 people/index.html                                  |    2 +-
 quickstart-1.x/index.html                          |    2 +-
 redirects.json                                     |    2 +-
 related-projects/index.html                        |    2 +-
 release/accumulo-1.3.5-incubating/index.html       |    2 +-
 release/accumulo-1.3.6/index.html                  |    2 +-
 release/accumulo-1.4.0/index.html                  |    2 +-
 release/accumulo-1.4.1/index.html                  |    2 +-
 release/accumulo-1.4.2/index.html                  |    2 +-
 release/accumulo-1.4.3/index.html                  |    2 +-
 release/accumulo-1.4.4/index.html                  |    2 +-
 release/accumulo-1.4.5/index.html                  |    2 +-
 release/accumulo-1.5.0/index.html                  |    2 +-
 release/accumulo-1.5.1/index.html                  |    2 +-
 release/accumulo-1.5.2/index.html                  |    2 +-
 release/accumulo-1.5.3/index.html                  |    2 +-
 release/accumulo-1.5.4/index.html                  |    2 +-
 release/accumulo-1.6.0/index.html                  |    2 +-
 release/accumulo-1.6.1/index.html                  |    2 +-
 release/accumulo-1.6.2/index.html                  |    2 +-
 release/accumulo-1.6.3/index.html                  |    2 +-
 release/accumulo-1.6.4/index.html                  |    2 +-
 release/accumulo-1.6.5/index.html                  |    2 +-
 release/accumulo-1.6.6/index.html                  |    2 +-
 release/accumulo-1.7.0/index.html                  |    2 +-
 release/accumulo-1.7.1/index.html                  |    2 +-
 release/accumulo-1.7.2/index.html                  |    2 +-
 release/accumulo-1.7.3/index.html                  |    2 +-
 release/accumulo-1.7.4/index.html                  |    2 +-
 release/accumulo-1.8.0/index.html                  |    2 +-
 release/accumulo-1.8.1/index.html                  |    2 +-
 release/accumulo-1.9.0/index.html                  |    2 +-
 release/accumulo-1.9.1/index.html                  |    2 +-
 release/accumulo-1.9.2/index.html                  |    2 +-
 release/accumulo-1.9.3/index.html                  |    4 +-
 release/accumulo-2.0.0-alpha-1/index.html          |    2 +-
 .../index.html                                     |   10 +-
 release/accumulo-2.0.0/index.html                  |   22 +-
 release/index.html                                 |   17 +-
 search/index.html                                  |    2 +-
 search_data.json                                   |   22 +-
 tour/authorizations-code/index.html                |    2 +-
 tour/authorizations/index.html                     |    2 +-
 tour/basic-read-write/index.html                   |    2 +-
 tour/batch-scanner-code/index.html                 |    2 +-
 tour/batch-scanner/index.html                      |    2 +-
 tour/conditional-writer-code/index.html            |    2 +-
 tour/conditional-writer/index.html                 |    2 +-
 tour/data-model-code/index.html                    |    2 +-
 tour/data-model/index.html                         |    2 +-
 tour/getting-started/index.html                    |    2 +-
 tour/index.html                                    |    2 +-
 tour/ranges-splits/index.html                      |    2 +-
 tour/using-iterators/index.html                    |    2 +-
 759 files changed, 7935 insertions(+), 8510 deletions(-)

diff --git a/1.3/user_manual/Accumulo_Design.html b/1.3/user_manual/Accumulo_Design.html
index 7a09509..961fa01 100644
--- a/1.3/user_manual/Accumulo_Design.html
+++ b/1.3/user_manual/Accumulo_Design.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/Accumulo_Shell.html b/1.3/user_manual/Accumulo_Shell.html
index a9fe224..d142289 100644
--- a/1.3/user_manual/Accumulo_Shell.html
+++ b/1.3/user_manual/Accumulo_Shell.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/Administration.html b/1.3/user_manual/Administration.html
index 4cfe5d3..8f712f5 100644
--- a/1.3/user_manual/Administration.html
+++ b/1.3/user_manual/Administration.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/Analytics.html b/1.3/user_manual/Analytics.html
index 9c19ed4..398846f 100644
--- a/1.3/user_manual/Analytics.html
+++ b/1.3/user_manual/Analytics.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/Contents.html b/1.3/user_manual/Contents.html
index e1fc97b..6688f35 100644
--- a/1.3/user_manual/Contents.html
+++ b/1.3/user_manual/Contents.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/High_Speed_Ingest.html b/1.3/user_manual/High_Speed_Ingest.html
index 28407fe..9524f06 100644
--- a/1.3/user_manual/High_Speed_Ingest.html
+++ b/1.3/user_manual/High_Speed_Ingest.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/Introduction.html b/1.3/user_manual/Introduction.html
index 390d1e7..4e07848 100644
--- a/1.3/user_manual/Introduction.html
+++ b/1.3/user_manual/Introduction.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/Security.html b/1.3/user_manual/Security.html
index c5b5a4e..28332a1 100644
--- a/1.3/user_manual/Security.html
+++ b/1.3/user_manual/Security.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/Shell_Commands.html b/1.3/user_manual/Shell_Commands.html
index 7d47091..faedd9e 100644
--- a/1.3/user_manual/Shell_Commands.html
+++ b/1.3/user_manual/Shell_Commands.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/Table_Configuration.html b/1.3/user_manual/Table_Configuration.html
index 372eab6..014c72f 100644
--- a/1.3/user_manual/Table_Configuration.html
+++ b/1.3/user_manual/Table_Configuration.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/Table_Design.html b/1.3/user_manual/Table_Design.html
index 32b1af3..ca21081 100644
--- a/1.3/user_manual/Table_Design.html
+++ b/1.3/user_manual/Table_Design.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/Writing_Accumulo_Clients.html b/1.3/user_manual/Writing_Accumulo_Clients.html
index f84494d..612f266 100644
--- a/1.3/user_manual/Writing_Accumulo_Clients.html
+++ b/1.3/user_manual/Writing_Accumulo_Clients.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/accumulo_user_manual.html b/1.3/user_manual/accumulo_user_manual.html
index 44784da..a3e8bf8 100644
--- a/1.3/user_manual/accumulo_user_manual.html
+++ b/1.3/user_manual/accumulo_user_manual.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/examples/aggregation.html b/1.3/user_manual/examples/aggregation.html
index 237ae31..5cc448a 100644
--- a/1.3/user_manual/examples/aggregation.html
+++ b/1.3/user_manual/examples/aggregation.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/examples/batch.html b/1.3/user_manual/examples/batch.html
index 2a8e218..2fd88b9 100644
--- a/1.3/user_manual/examples/batch.html
+++ b/1.3/user_manual/examples/batch.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/examples/bloom.html b/1.3/user_manual/examples/bloom.html
index 0d6a34a..24cda4c 100644
--- a/1.3/user_manual/examples/bloom.html
+++ b/1.3/user_manual/examples/bloom.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/examples/bulkIngest.html b/1.3/user_manual/examples/bulkIngest.html
index 4825eba..c6bac32 100644
--- a/1.3/user_manual/examples/bulkIngest.html
+++ b/1.3/user_manual/examples/bulkIngest.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/examples/constraints.html b/1.3/user_manual/examples/constraints.html
index 02c95fa..c324c13 100644
--- a/1.3/user_manual/examples/constraints.html
+++ b/1.3/user_manual/examples/constraints.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/examples/dirlist.html b/1.3/user_manual/examples/dirlist.html
index e002ec7..a034e00 100644
--- a/1.3/user_manual/examples/dirlist.html
+++ b/1.3/user_manual/examples/dirlist.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/examples/filter.html b/1.3/user_manual/examples/filter.html
index fac4a40..432abca 100644
--- a/1.3/user_manual/examples/filter.html
+++ b/1.3/user_manual/examples/filter.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/examples/helloworld.html b/1.3/user_manual/examples/helloworld.html
index 1787c58..56f0ebb 100644
--- a/1.3/user_manual/examples/helloworld.html
+++ b/1.3/user_manual/examples/helloworld.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/examples/index.html b/1.3/user_manual/examples/index.html
index 838e7b7..cba8638 100644
--- a/1.3/user_manual/examples/index.html
+++ b/1.3/user_manual/examples/index.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/examples/mapred.html b/1.3/user_manual/examples/mapred.html
index e18cdf1..4c7b0fb 100644
--- a/1.3/user_manual/examples/mapred.html
+++ b/1.3/user_manual/examples/mapred.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/examples/shard.html b/1.3/user_manual/examples/shard.html
index c2c633b..cca9a75 100644
--- a/1.3/user_manual/examples/shard.html
+++ b/1.3/user_manual/examples/shard.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.3/user_manual/index.html b/1.3/user_manual/index.html
index 44784da..a3e8bf8 100644
--- a/1.3/user_manual/index.html
+++ b/1.3/user_manual/index.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/batch.html b/1.4/examples/batch.html
index 7ede336..ebe879e 100644
--- a/1.4/examples/batch.html
+++ b/1.4/examples/batch.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/bloom.html b/1.4/examples/bloom.html
index 65859a7..7e7ebb8 100644
--- a/1.4/examples/bloom.html
+++ b/1.4/examples/bloom.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/bulkIngest.html b/1.4/examples/bulkIngest.html
index 0a246c3..d135c18 100644
--- a/1.4/examples/bulkIngest.html
+++ b/1.4/examples/bulkIngest.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/combiner.html b/1.4/examples/combiner.html
index 8aa08f1..e6bb658 100644
--- a/1.4/examples/combiner.html
+++ b/1.4/examples/combiner.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/constraints.html b/1.4/examples/constraints.html
index 80e969a..02c53b2 100644
--- a/1.4/examples/constraints.html
+++ b/1.4/examples/constraints.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/dirlist.html b/1.4/examples/dirlist.html
index c5b1ae0..81c744c 100644
--- a/1.4/examples/dirlist.html
+++ b/1.4/examples/dirlist.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/filedata.html b/1.4/examples/filedata.html
index 6244599..adeaee4 100644
--- a/1.4/examples/filedata.html
+++ b/1.4/examples/filedata.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/filter.html b/1.4/examples/filter.html
index 526a4d3..8dedc24 100644
--- a/1.4/examples/filter.html
+++ b/1.4/examples/filter.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/helloworld.html b/1.4/examples/helloworld.html
index b008df9..2aef13c 100644
--- a/1.4/examples/helloworld.html
+++ b/1.4/examples/helloworld.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/index.html b/1.4/examples/index.html
index 3b06b07..659b895 100644
--- a/1.4/examples/index.html
+++ b/1.4/examples/index.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/isolation.html b/1.4/examples/isolation.html
index 62b4671..9bae00a 100644
--- a/1.4/examples/isolation.html
+++ b/1.4/examples/isolation.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/mapred.html b/1.4/examples/mapred.html
index b79955d..c41291c 100644
--- a/1.4/examples/mapred.html
+++ b/1.4/examples/mapred.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/shard.html b/1.4/examples/shard.html
index 5bfd29e..6c12205 100644
--- a/1.4/examples/shard.html
+++ b/1.4/examples/shard.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/examples/visibility.html b/1.4/examples/visibility.html
index 2a3b7a1..d7528ac 100644
--- a/1.4/examples/visibility.html
+++ b/1.4/examples/visibility.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Accumulo_Design.html b/1.4/user_manual/Accumulo_Design.html
index f7414f7..84680dc 100644
--- a/1.4/user_manual/Accumulo_Design.html
+++ b/1.4/user_manual/Accumulo_Design.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Accumulo_Shell.html b/1.4/user_manual/Accumulo_Shell.html
index 8fbb2a7..08e2020 100644
--- a/1.4/user_manual/Accumulo_Shell.html
+++ b/1.4/user_manual/Accumulo_Shell.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Administration.html b/1.4/user_manual/Administration.html
index 0bf5bdb..46a3bfd 100644
--- a/1.4/user_manual/Administration.html
+++ b/1.4/user_manual/Administration.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Analytics.html b/1.4/user_manual/Analytics.html
index 9637fe8..bb4d6a0 100644
--- a/1.4/user_manual/Analytics.html
+++ b/1.4/user_manual/Analytics.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Contents.html b/1.4/user_manual/Contents.html
index a84acf9..bcb4b23 100644
--- a/1.4/user_manual/Contents.html
+++ b/1.4/user_manual/Contents.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Development_Clients.html b/1.4/user_manual/Development_Clients.html
index c6ee21d..30ad78f 100644
--- a/1.4/user_manual/Development_Clients.html
+++ b/1.4/user_manual/Development_Clients.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/High_Speed_Ingest.html b/1.4/user_manual/High_Speed_Ingest.html
index bd912e4..507e458 100644
--- a/1.4/user_manual/High_Speed_Ingest.html
+++ b/1.4/user_manual/High_Speed_Ingest.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Introduction.html b/1.4/user_manual/Introduction.html
index 843285b..045e779 100644
--- a/1.4/user_manual/Introduction.html
+++ b/1.4/user_manual/Introduction.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Security.html b/1.4/user_manual/Security.html
index ffbb5b7..f92fddb 100644
--- a/1.4/user_manual/Security.html
+++ b/1.4/user_manual/Security.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Shell_Commands.html b/1.4/user_manual/Shell_Commands.html
index 1e905ad..83a67eb 100644
--- a/1.4/user_manual/Shell_Commands.html
+++ b/1.4/user_manual/Shell_Commands.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Table_Configuration.html b/1.4/user_manual/Table_Configuration.html
index 51f94e0..1d32f90 100644
--- a/1.4/user_manual/Table_Configuration.html
+++ b/1.4/user_manual/Table_Configuration.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Table_Design.html b/1.4/user_manual/Table_Design.html
index d968f38..0eaf8c0 100644
--- a/1.4/user_manual/Table_Design.html
+++ b/1.4/user_manual/Table_Design.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/Writing_Accumulo_Clients.html b/1.4/user_manual/Writing_Accumulo_Clients.html
index 588a74a..e42402d 100644
--- a/1.4/user_manual/Writing_Accumulo_Clients.html
+++ b/1.4/user_manual/Writing_Accumulo_Clients.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/accumulo_user_manual.html b/1.4/user_manual/accumulo_user_manual.html
index a747772..25977e9 100644
--- a/1.4/user_manual/accumulo_user_manual.html
+++ b/1.4/user_manual/accumulo_user_manual.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.4/user_manual/index.html b/1.4/user_manual/index.html
index a747772..25977e9 100644
--- a/1.4/user_manual/index.html
+++ b/1.4/user_manual/index.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/batch.html b/1.5/examples/batch.html
index f6794ab..5ce2de1 100644
--- a/1.5/examples/batch.html
+++ b/1.5/examples/batch.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/bloom.html b/1.5/examples/bloom.html
index 95c8f06..f1b425e 100644
--- a/1.5/examples/bloom.html
+++ b/1.5/examples/bloom.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/bulkIngest.html b/1.5/examples/bulkIngest.html
index 1627ae6..815285c 100644
--- a/1.5/examples/bulkIngest.html
+++ b/1.5/examples/bulkIngest.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/classpath.html b/1.5/examples/classpath.html
index e14566e..eb36189 100644
--- a/1.5/examples/classpath.html
+++ b/1.5/examples/classpath.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/client.html b/1.5/examples/client.html
index 6a96d4c..afe06ec 100644
--- a/1.5/examples/client.html
+++ b/1.5/examples/client.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/combiner.html b/1.5/examples/combiner.html
index b4cb3a5..2fddfad 100644
--- a/1.5/examples/combiner.html
+++ b/1.5/examples/combiner.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/constraints.html b/1.5/examples/constraints.html
index a392c10..2a0af39 100644
--- a/1.5/examples/constraints.html
+++ b/1.5/examples/constraints.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/dirlist.html b/1.5/examples/dirlist.html
index 743b53d..956f878 100644
--- a/1.5/examples/dirlist.html
+++ b/1.5/examples/dirlist.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/export.html b/1.5/examples/export.html
index 1c56a8b..e5d7001 100644
--- a/1.5/examples/export.html
+++ b/1.5/examples/export.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/filedata.html b/1.5/examples/filedata.html
index 9e90f8f..4c9384e 100644
--- a/1.5/examples/filedata.html
+++ b/1.5/examples/filedata.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/filter.html b/1.5/examples/filter.html
index 526a4d3..8dedc24 100644
--- a/1.5/examples/filter.html
+++ b/1.5/examples/filter.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/helloworld.html b/1.5/examples/helloworld.html
index f24df91..b25d796 100644
--- a/1.5/examples/helloworld.html
+++ b/1.5/examples/helloworld.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/index.html b/1.5/examples/index.html
index d7b48de..b3e1bdf 100644
--- a/1.5/examples/index.html
+++ b/1.5/examples/index.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/isolation.html b/1.5/examples/isolation.html
index 999bba2..a570fcc 100644
--- a/1.5/examples/isolation.html
+++ b/1.5/examples/isolation.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/mapred.html b/1.5/examples/mapred.html
index a8e1274..c40ce63 100644
--- a/1.5/examples/mapred.html
+++ b/1.5/examples/mapred.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/maxmutation.html b/1.5/examples/maxmutation.html
index 8637293..61d4dfe 100644
--- a/1.5/examples/maxmutation.html
+++ b/1.5/examples/maxmutation.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/regex.html b/1.5/examples/regex.html
index 2de0655..c8a23ec 100644
--- a/1.5/examples/regex.html
+++ b/1.5/examples/regex.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/rowhash.html b/1.5/examples/rowhash.html
index af1e4a4..09e2c29 100644
--- a/1.5/examples/rowhash.html
+++ b/1.5/examples/rowhash.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/shard.html b/1.5/examples/shard.html
index 42fec69..4a1baff 100644
--- a/1.5/examples/shard.html
+++ b/1.5/examples/shard.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/tabletofile.html b/1.5/examples/tabletofile.html
index e82e4ab..6976f8a 100644
--- a/1.5/examples/tabletofile.html
+++ b/1.5/examples/tabletofile.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/terasort.html b/1.5/examples/terasort.html
index 2b05e53..cb5eafc 100644
--- a/1.5/examples/terasort.html
+++ b/1.5/examples/terasort.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.5/examples/visibility.html b/1.5/examples/visibility.html
index 2a3b7a1..d7528ac 100644
--- a/1.5/examples/visibility.html
+++ b/1.5/examples/visibility.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/batch.html b/1.6/examples/batch.html
index e83b0cb..d5c3c56 100644
--- a/1.6/examples/batch.html
+++ b/1.6/examples/batch.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/bloom.html b/1.6/examples/bloom.html
index 61f040b..b0f5e21 100644
--- a/1.6/examples/bloom.html
+++ b/1.6/examples/bloom.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/bulkIngest.html b/1.6/examples/bulkIngest.html
index 4974d00..017a4dd 100644
--- a/1.6/examples/bulkIngest.html
+++ b/1.6/examples/bulkIngest.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/classpath.html b/1.6/examples/classpath.html
index 80140ee..9f6c46b 100644
--- a/1.6/examples/classpath.html
+++ b/1.6/examples/classpath.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/client.html b/1.6/examples/client.html
index 399ddb7..a3db32e 100644
--- a/1.6/examples/client.html
+++ b/1.6/examples/client.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/combiner.html b/1.6/examples/combiner.html
index 66f980c..2474140 100644
--- a/1.6/examples/combiner.html
+++ b/1.6/examples/combiner.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/constraints.html b/1.6/examples/constraints.html
index ff028e2..3c4a55b 100644
--- a/1.6/examples/constraints.html
+++ b/1.6/examples/constraints.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/dirlist.html b/1.6/examples/dirlist.html
index a38ca35..fe71218 100644
--- a/1.6/examples/dirlist.html
+++ b/1.6/examples/dirlist.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/export.html b/1.6/examples/export.html
index a0bb523..57630d0 100644
--- a/1.6/examples/export.html
+++ b/1.6/examples/export.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/filedata.html b/1.6/examples/filedata.html
index 49a272a..bb09a73 100644
--- a/1.6/examples/filedata.html
+++ b/1.6/examples/filedata.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/filter.html b/1.6/examples/filter.html
index 51f3785..f703702 100644
--- a/1.6/examples/filter.html
+++ b/1.6/examples/filter.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/helloworld.html b/1.6/examples/helloworld.html
index 6dc0ac6..091c831 100644
--- a/1.6/examples/helloworld.html
+++ b/1.6/examples/helloworld.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/index.html b/1.6/examples/index.html
index 79d40be..f9ef149 100644
--- a/1.6/examples/index.html
+++ b/1.6/examples/index.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/isolation.html b/1.6/examples/isolation.html
index cc0788d..8047f97 100644
--- a/1.6/examples/isolation.html
+++ b/1.6/examples/isolation.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/mapred.html b/1.6/examples/mapred.html
index 4810429..53fad25 100644
--- a/1.6/examples/mapred.html
+++ b/1.6/examples/mapred.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/maxmutation.html b/1.6/examples/maxmutation.html
index 3b28257..cefd90c 100644
--- a/1.6/examples/maxmutation.html
+++ b/1.6/examples/maxmutation.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/regex.html b/1.6/examples/regex.html
index 7f27ddd..277dc31 100644
--- a/1.6/examples/regex.html
+++ b/1.6/examples/regex.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/reservations.html b/1.6/examples/reservations.html
index 99f91f4..d1da7c6 100644
--- a/1.6/examples/reservations.html
+++ b/1.6/examples/reservations.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/rowhash.html b/1.6/examples/rowhash.html
index a85ae40..b286610 100644
--- a/1.6/examples/rowhash.html
+++ b/1.6/examples/rowhash.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/shard.html b/1.6/examples/shard.html
index 5086178..6e68fed 100644
--- a/1.6/examples/shard.html
+++ b/1.6/examples/shard.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/tabletofile.html b/1.6/examples/tabletofile.html
index ff3fa6b..fad56a6 100644
--- a/1.6/examples/tabletofile.html
+++ b/1.6/examples/tabletofile.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/terasort.html b/1.6/examples/terasort.html
index 3f91533..9069dc9 100644
--- a/1.6/examples/terasort.html
+++ b/1.6/examples/terasort.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.6/examples/visibility.html b/1.6/examples/visibility.html
index df02670..d9ade50 100644
--- a/1.6/examples/visibility.html
+++ b/1.6/examples/visibility.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/batch.html b/1.7/examples/batch.html
index e83b0cb..d5c3c56 100644
--- a/1.7/examples/batch.html
+++ b/1.7/examples/batch.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/bloom.html b/1.7/examples/bloom.html
index 5c4124c..92e238a 100644
--- a/1.7/examples/bloom.html
+++ b/1.7/examples/bloom.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/bulkIngest.html b/1.7/examples/bulkIngest.html
index 4974d00..017a4dd 100644
--- a/1.7/examples/bulkIngest.html
+++ b/1.7/examples/bulkIngest.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/classpath.html b/1.7/examples/classpath.html
index a669766..3fd5e02 100644
--- a/1.7/examples/classpath.html
+++ b/1.7/examples/classpath.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/client.html b/1.7/examples/client.html
index 399ddb7..a3db32e 100644
--- a/1.7/examples/client.html
+++ b/1.7/examples/client.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/combiner.html b/1.7/examples/combiner.html
index ff7525b..fc51437 100644
--- a/1.7/examples/combiner.html
+++ b/1.7/examples/combiner.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/constraints.html b/1.7/examples/constraints.html
index a6a51ad..128ebc0 100644
--- a/1.7/examples/constraints.html
+++ b/1.7/examples/constraints.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/dirlist.html b/1.7/examples/dirlist.html
index a38ca35..fe71218 100644
--- a/1.7/examples/dirlist.html
+++ b/1.7/examples/dirlist.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/export.html b/1.7/examples/export.html
index 2203701..49def5b 100644
--- a/1.7/examples/export.html
+++ b/1.7/examples/export.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/filedata.html b/1.7/examples/filedata.html
index 49a272a..bb09a73 100644
--- a/1.7/examples/filedata.html
+++ b/1.7/examples/filedata.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/filter.html b/1.7/examples/filter.html
index 51f3785..f703702 100644
--- a/1.7/examples/filter.html
+++ b/1.7/examples/filter.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/helloworld.html b/1.7/examples/helloworld.html
index 6dc0ac6..091c831 100644
--- a/1.7/examples/helloworld.html
+++ b/1.7/examples/helloworld.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/index.html b/1.7/examples/index.html
index eb08d98..fd96e7c 100644
--- a/1.7/examples/index.html
+++ b/1.7/examples/index.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/isolation.html b/1.7/examples/isolation.html
index cc0788d..8047f97 100644
--- a/1.7/examples/isolation.html
+++ b/1.7/examples/isolation.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/mapred.html b/1.7/examples/mapred.html
index 2a03f60..b1a6428 100644
--- a/1.7/examples/mapred.html
+++ b/1.7/examples/mapred.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/maxmutation.html b/1.7/examples/maxmutation.html
index e2d9211..6dd9ab5 100644
--- a/1.7/examples/maxmutation.html
+++ b/1.7/examples/maxmutation.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/regex.html b/1.7/examples/regex.html
index 461abc7..0717e8c 100644
--- a/1.7/examples/regex.html
+++ b/1.7/examples/regex.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/reservations.html b/1.7/examples/reservations.html
index 99f91f4..d1da7c6 100644
--- a/1.7/examples/reservations.html
+++ b/1.7/examples/reservations.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/rowhash.html b/1.7/examples/rowhash.html
index 960b62e..2a15c05 100644
--- a/1.7/examples/rowhash.html
+++ b/1.7/examples/rowhash.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/shard.html b/1.7/examples/shard.html
index 5086178..6e68fed 100644
--- a/1.7/examples/shard.html
+++ b/1.7/examples/shard.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/tabletofile.html b/1.7/examples/tabletofile.html
index 29e0e2e..0875727 100644
--- a/1.7/examples/tabletofile.html
+++ b/1.7/examples/tabletofile.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/terasort.html b/1.7/examples/terasort.html
index 3f91533..9069dc9 100644
--- a/1.7/examples/terasort.html
+++ b/1.7/examples/terasort.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.7/examples/visibility.html b/1.7/examples/visibility.html
index df02670..d9ade50 100644
--- a/1.7/examples/visibility.html
+++ b/1.7/examples/visibility.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.8/examples/index.html b/1.8/examples/index.html
index 641fb00..06b446e 100644
--- a/1.8/examples/index.html
+++ b/1.8/examples/index.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/1.9/examples/index.html b/1.9/examples/index.html
index 641fb00..06b446e 100644
--- a/1.9/examples/index.html
+++ b/1.9/examples/index.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/api/index.html b/api/index.html
index 40cb884..e9d590f 100644
--- a/api/index.html
+++ b/api/index.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/blog/2014/05/03/accumulo-classloader.html b/blog/2014/05/03/accumulo-classloader.html
index 252c1b2..fb70255 100644
--- a/blog/2014/05/03/accumulo-classloader.html
+++ b/blog/2014/05/03/accumulo-classloader.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/blog/2014/05/27/getting-started-with-accumulo-1.6.0.html b/blog/2014/05/27/getting-started-with-accumulo-1.6.0.html
index c90c100..4a3e4f9 100644
--- a/blog/2014/05/27/getting-started-with-accumulo-1.6.0.html
+++ b/blog/2014/05/27/getting-started-with-accumulo-1.6.0.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/blog/2014/06/25/scaling-accumulo-with-multivolume-support.html b/blog/2014/06/25/scaling-accumulo-with-multivolume-support.html
index ec10f1a..3c6382c 100644
--- a/blog/2014/06/25/scaling-accumulo-with-multivolume-support.html
+++ b/blog/2014/06/25/scaling-accumulo-with-multivolume-support.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/blog/2014/07/09/functional-reads-over-accumulo.html b/blog/2014/07/09/functional-reads-over-accumulo.html
index 854a773..cf367be 100644
--- a/blog/2014/07/09/functional-reads-over-accumulo.html
+++ b/blog/2014/07/09/functional-reads-over-accumulo.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/blog/2014/09/02/generating-keystores-for-configuring-accumulo-with-ssl.html b/blog/2014/09/02/generating-keystores-for-configuring-accumulo-with-ssl.html
index 2529ed0..debce95 100644
--- a/blog/2014/09/02/generating-keystores-for-configuring-accumulo-with-ssl.html
+++ b/blog/2014/09/02/generating-keystores-for-configuring-accumulo-with-ssl.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/blog/2015/03/20/balancing-groups-of-tablets.html b/blog/2015/03/20/balancing-groups-of-tablets.html
index df21dd0..790b12d 100644
--- a/blog/2015/03/20/balancing-groups-of-tablets.html
+++ b/blog/2015/03/20/balancing-groups-of-tablets.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/blog/2015/04/06/replicating-data-across-accumulo-clusters.html b/blog/2015/04/06/replicating-data-across-accumulo-clusters.html
index eea6c45..7120bfb 100644
--- a/blog/2015/04/06/replicating-data-across-accumulo-clusters.html
+++ b/blog/2015/04/06/replicating-data-across-accumulo-clusters.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/blog/2016/11/02/durability-performance.html b/blog/2016/11/02/durability-performance.html
index 01e5228..af40269 100644
--- a/blog/2016/11/02/durability-performance.html
+++ b/blog/2016/11/02/durability-performance.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/blog/2016/11/16/simpler-scripts-and-config.html b/blog/2016/11/16/simpler-scripts-and-config.html
index d46fc17..be516d9 100644
--- a/blog/2016/11/16/simpler-scripts-and-config.html
+++ b/blog/2016/11/16/simpler-scripts-and-config.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/blog/2016/12/19/running-on-fedora-25.html b/blog/2016/12/19/running-on-fedora-25.html
index de5a91d..e35c7bf 100644
--- a/blog/2016/12/19/running-on-fedora-25.html
+++ b/blog/2016/12/19/running-on-fedora-25.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/blog/2017/03/06/security-performance-implications.html b/blog/2017/03/06/security-performance-implications.html
index ec5dc43..9814cef 100644
--- a/blog/2017/03/06/security-performance-implications.html
+++ b/blog/2017/03/06/security-performance-implications.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/blog/2017/03/21/happy-anniversary-accumulo.html b/blog/2017/03/21/happy-anniversary-accumulo.html
index ef1aa9a..50a6dd1 100644
--- a/blog/2017/03/21/happy-anniversary-accumulo.html
+++ b/blog/2017/03/21/happy-anniversary-accumulo.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/blog/2017/04/21/introducing-uno-and-muchos.html b/blog/2017/04/21/introducing-uno-and-muchos.html
index da57356..16283f8 100644
--- a/blog/2017/04/21/introducing-uno-and-muchos.html
+++ b/blog/2017/04/21/introducing-uno-and-muchos.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/blog/2017/06/29/accumulo-documentation-improvements.html b/blog/2017/06/29/accumulo-documentation-improvements.html
index 575868b..648b065 100644
--- a/blog/2017/06/29/accumulo-documentation-improvements.html
+++ b/blog/2017/06/29/accumulo-documentation-improvements.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/blog/2017/07/27/accumulo-summmit-on-october-16.html b/blog/2017/07/27/accumulo-summmit-on-october-16.html
index 69fe794..618c103 100644
--- a/blog/2017/07/27/accumulo-summmit-on-october-16.html
+++ b/blog/2017/07/27/accumulo-summmit-on-october-16.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/blog/2017/12/12/take-the-accumulo-tour.html b/blog/2017/12/12/take-the-accumulo-tour.html
index 76e2b10..a25f21c 100644
--- a/blog/2017/12/12/take-the-accumulo-tour.html
+++ b/blog/2017/12/12/take-the-accumulo-tour.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/blog/2018/03/16/moving-to-github-issues.html b/blog/2018/03/16/moving-to-github-issues.html
index af3c377..293733b 100644
--- a/blog/2018/03/16/moving-to-github-issues.html
+++ b/blog/2018/03/16/moving-to-github-issues.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/blog/2018/03/22/view-metrics-in-grafana.html b/blog/2018/03/22/view-metrics-in-grafana.html
index 501c613..bca9940 100644
--- a/blog/2018/03/22/view-metrics-in-grafana.html
+++ b/blog/2018/03/22/view-metrics-in-grafana.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/blog/2018/07/05/accumulo-summit.html b/blog/2018/07/05/accumulo-summit.html
index f986ea4..9bc111b 100644
--- a/blog/2018/07/05/accumulo-summit.html
+++ b/blog/2018/07/05/accumulo-summit.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/contact-us/index.html b/contact-us/index.html
index 2c822e0..e092aa4 100644
--- a/contact-us/index.html
+++ b/contact-us/index.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/contributor/bylaws.html b/contributor/bylaws.html
index 070bba4..7a7a614 100644
--- a/contributor/bylaws.html
+++ b/contributor/bylaws.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/contributor/consensusBuilding.html b/contributor/consensusBuilding.html
index 6fa2f77..fd23642 100644
--- a/contributor/consensusBuilding.html
+++ b/contributor/consensusBuilding.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/contributor/contrib-projects.html b/contributor/contrib-projects.html
index e299c0c..ebe14f6 100644
--- a/contributor/contrib-projects.html
+++ b/contributor/contrib-projects.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/contributor/lazyConsensus.html b/contributor/lazyConsensus.html
index 6694baa..1bc0893 100644
--- a/contributor/lazyConsensus.html
+++ b/contributor/lazyConsensus.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/contributor/making-release.html b/contributor/making-release.html
index 8fb72db..ca02994 100644
--- a/contributor/making-release.html
+++ b/contributor/making-release.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/contributor/rb.html b/contributor/rb.html
index 50f7361..6ed908f 100644
--- a/contributor/rb.html
+++ b/contributor/rb.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/contributor/release-management.html b/contributor/release-management.html
index 607b5d9..e77a528 100644
--- a/contributor/release-management.html
+++ b/contributor/release-management.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/contributor/verifying-release.html b/contributor/verifying-release.html
index e6c72c0..fe0bbaa 100644
--- a/contributor/verifying-release.html
+++ b/contributor/verifying-release.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/contributor/versioning.html b/contributor/versioning.html
index 3748d08..6c88f9f 100644
--- a/contributor/versioning.html
+++ b/contributor/versioning.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/contributor/voting.html b/contributor/voting.html
index fc0e5b2..f0b1b3b 100644
--- a/contributor/voting.html
+++ b/contributor/voting.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/contributors-guide/index.html b/contributors-guide/index.html
index a68bbbd..9f9dd17 100644
--- a/contributors-guide/index.html
+++ b/contributors-guide/index.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/doap/accumulo.rdf b/doap/accumulo.rdf
index 73f1e7c..073dc52 100644
--- a/doap/accumulo.rdf
+++ b/doap/accumulo.rdf
@@ -37,6 +37,13 @@
     <release>
       <Version>
         <name>Apache Accumulo</name>
+        <created>2019-01-31</created>
+        <revision>2.0.0-alpha-2</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>Apache Accumulo</name>
         <created>2018-10-14</created>
         <revision>2.0.0-alpha-1</revision>
       </Version>
diff --git a/docs-archive/index.html b/docs-archive/index.html
index 6386238..56bd545 100644
--- a/docs-archive/index.html
+++ b/docs-archive/index.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/docs/2.x/administration/caching.html b/docs/2.x/administration/caching.html
index 2f22de6..7caac17 100644
--- a/docs/2.x/administration/caching.html
+++ b/docs/2.x/administration/caching.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
@@ -457,7 +457,7 @@ setting <a href="/docs/2.x/configuration/server-properties#table_cache_block_ena
 <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>config -t mytable -s table.cache.block.enable=true
 </code></pre></div></div>
 
-<p>Or programmatically using <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/admin/TableOperations.html#setProperty-java.lang.String-java.lang.String-java.lang.String-">TableOperations.setProperty()</a>:</p>
+<p>Or programmatically using <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-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">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>
diff --git a/docs/2.x/administration/fate.html b/docs/2.x/administration/fate.html
index 573f1a8..f840fd7 100644
--- a/docs/2.x/administration/fate.html
+++ b/docs/2.x/administration/fate.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/docs/2.x/administration/in-depth-install.html b/docs/2.x/administration/in-depth-install.html
index 85a200f..f6598f5 100644
--- a/docs/2.x/administration/in-depth-install.html
+++ b/docs/2.x/administration/in-depth-install.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
@@ -535,8 +535,8 @@ at the low end of the range to, and including, the high end of the range.</p>
 sufficient space:</p>
 
 <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>cd &lt;install directory&gt;
-tar xzf accumulo-2.0.0-alpha-1-bin.tar.gz
-cd accumulo-2.0.0-alpha-1
+tar xzf accumulo-2.0.0-alpha-2-bin.tar.gz
+cd accumulo-2.0.0-alpha-2
 </code></pre></div></div>
 
 <p>Repeat this step on each machine in your cluster. Typically, the same <code class="highlighter-rouge">&lt;install directory&gt;</code>
diff --git a/docs/2.x/administration/monitoring-metrics.html b/docs/2.x/administration/monitoring-metrics.html
index 6860f60..16379b4 100644
--- a/docs/2.x/administration/monitoring-metrics.html
+++ b/docs/2.x/administration/monitoring-metrics.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/docs/2.x/administration/multivolume.html b/docs/2.x/administration/multivolume.html
index 3fe9a8f..fcec350 100644
--- a/docs/2.x/administration/multivolume.html
+++ b/docs/2.x/administration/multivolume.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
diff --git a/docs/2.x/administration/replication.html b/docs/2.x/administration/replication.html
index 17f28bc..8b76fbf 100644
--- a/docs/2.x/administration/replication.html
+++ b/docs/2.x/administration/replication.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
@@ -548,15 +548,15 @@ Monitor server, using the <code class="highlighter-rouge">Replication</code> lin
 
 <h2 id="work-assignment">Work Assignment</h2>
 
-<p>Depending on the schema of a table, different implementations of the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/WorkAssigner.html">WorkAssigner</a>
+<p>Depending on the schema of a table, different implementations of the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-2/org/apache/accumulo/server/replication/WorkAssigner.html">WorkAssigner</a>
 used could be configured. The implementation is controlled via the property <a href="/docs/2.x/configuration/server-properties#replication_work_assigner">replication.work.assigner</a>
 and the full class name for the implementation. This can be configured via the shell or <code class="highlighter-rouge">accumulo.properties</code>.</p>
 
-<p>Two implementations of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/WorkAssigner.html">WorkAssigner</a> are provided:</p>
+<p>Two implementations of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-2/org/apache/accumulo/server/replication/WorkAssigner.html">WorkAssigner</a> are provided:</p>
 
 <ol>
   <li>
-    <p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-master/2.0.0-alpha-1/org/apache/accumulo/master/replication/UnorderedWorkAssigner.html">UnorderedWorkAssigner</a> can be used to overcome the limitation
+    <p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-master/2.0.0-alpha-2/org/apache/accumulo/master/replication/UnorderedWorkAssigner.html">UnorderedWorkAssigner</a> can be used to overcome the limitation
 of only a single WAL being replicated to a target and peer at any time. Depending on the table schema,
 it’s possible that multiple versions of the same Key with different values are infrequent or nonexistent.
 In this case, parallel replication to a peer and target is possible without any downsides. In the case
@@ -564,7 +564,7 @@ where this implementation is used were column updates are frequent, it is possib
 an inconsistency between the primary and the peer.</p>
   </li>
   <li>
-    <p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-master/2.0.0-alpha-1/org/apache/accumulo/master/replication/SequentialWorkAssigner.html">SequentialWorkAssigner</a> is configured for an
+    <p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-master/2.0.0-alpha-2/org/apache/accumulo/master/replication/SequentialWorkAssigner.html">SequentialWorkAssigner</a> is configured for an
 instance. The SequentialWorkAssigner ensures that, per peer and each remote identifier, each WAL is
 replicated in the order in which they were created. This is sufficient to ensure that updates to a table
 will be replayed in the correct order on the peer. This implementation has the downside of only replicating
@@ -574,15 +574,15 @@ a single WAL at a time.</p>
 
 <h2 id="replicasystems">ReplicaSystems</h2>
 
-<p><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/ReplicaSystem.html">ReplicaSystem</a> is the interface which allows abstraction of replication of data
-to peers of various types. Presently, only an <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/AccumuloReplicaSystem.html">AccumuloReplicaSystem</a> is provided
-which will replicate data to another Accumulo instance. A <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/ReplicaSystem.html">ReplicaSystem</a> implementation
+<p><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-2/org/apache/accumulo/server/replication/ReplicaSystem.html">ReplicaSystem</a> is the interface which allows abstraction of replication of data
+to peers of various types. Presently, only an <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-2/org/apache/accumulo/server/replication/AccumuloReplicaSystem.html">AccumuloReplicaSystem</a> is provided
+which will replicate data to another Accumulo instance. A <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-2/org/apache/accumulo/server/replication/ReplicaSystem.html">ReplicaSystem</a> implementation
 is run inside of the TabletServer process, and can be configured as mentioned in <a href="/docs/2.x/administration/replication#instance-configuration">Instance Configuration</a>
 section of this document. Theoretically, an implementation of this interface could send data to other filesystems, databases, etc.</p>
 
 <h3 id="accumuloreplicasystem">AccumuloReplicaSystem</h3>
 
-<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/AccumuloReplicaSystem.html">AccumuloReplicaSystem</a> uses Thrift to communicate with a peer Accumulo instance
+<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-2/org/apache/accumulo/server/replication/AccumuloReplicaSystem.html">AccumuloReplicaSystem</a> uses Thrift to communicate with a peer Accumulo instance
 and replicate the necessary data. The TabletServer running on the primary will communicate
 with the Master on the peer to request the address of a TabletServer on the peer which
 this TabletServer will use to replicate the data.</p>
@@ -600,14 +600,14 @@ the implementation of various components operate.</p>
 
 <ul>
   <li><a href="/docs/2.x/configuration/server-properties#replication_max_work_queue">replication.max.work.queue</a> - Maximum number of files queued for replication at one time</li>
-  <li><a href="/docs/2.x/configuration/server-properties#replication_work_assignment_sleep">replication.work.assignment.sleep</a> - Time between invocations of the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/WorkAssigner.html">WorkAssigner</a></li>
+  <li><a href="/docs/2.x/configuration/server-properties#replication_work_assignment_sleep">replication.work.assignment.sleep</a> - Time between invocations of the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-2/org/apache/accumulo/server/replication/WorkAssigner.html">WorkAssigner</a></li>
   <li><a href="/docs/2.x/configuration/server-properties#replication_worker_threads">replication.worker.threads</a> - Size of threadpool used to replicate data to peers</li>
   <li><a href="/docs/2.x/configuration/server-properties#replication_receipt_service_port">replication.receipt.service.port</a> - Thrift service port to listen for replication requests, can use ‘0’ for a random port</li>
   <li><a href="/docs/2.x/configuration/server-properties#replication_work_attempts">replication.work.attempts</a> - Number of attempts to replicate to a peer before aborting the attempt</li>
   <li><a href="/docs/2.x/configuration/server-properties#replication_receiver_min_threads">replication.receiver.min.threads</a> - Minimum number of idle threads for handling incoming replication</li>
   <li><a href="/docs/2.x/configuration/server-properties#replication_receiver_threadcheck_time">replication.receiver.threadcheck.time</a> - Time between attempting adjustments of thread pool for incoming replications</li>
   <li><a href="/docs/2.x/configuration/server-properties#replication_max_unit_size">replication.max.unit.size</a> - Maximum amount of data to be replicated in one RPC</li>
-  <li><a href="/docs/2.x/configuration/server-properties#replication_work_assigner">replication.work.assigner</a> - <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/WorkAssigner.html">WorkAssigner</a> implementation</li>
+  <li><a href="/docs/2.x/configuration/server-properties#replication_work_assigner">replication.work.assigner</a> - <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-2/org/apache/accumulo/server/replication/WorkAssigner.html">WorkAssigner</a> implementation</li>
   <li><a href="/docs/2.x/configuration/server-properties#tserver_replication_batchwriter_replayer_memory">tserver.replication.batchwriter.replayer.memory</a> - Size of BatchWriter cache to use in applying replication requests</li>
 </ul>
 
@@ -670,8 +670,8 @@ root@peer&gt; tables -l
 
 <h4 id="define-the-peer-as-a-replication-peer-to-the-primary">Define the Peer as a replication peer to the Primary</h4>
 
-<p>We’re defining the instance with <a href="/docs/2.x/configuration/server-properties#replication_name">replication.name</a> of <code class="highlighter-rouge">peer</code> as a peer. We provide the implementation of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/ReplicaSystem.html">ReplicaSystem</a>
-that we want to use, and the configuration for the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/AccumuloReplicaSystem.html">AccumuloReplicaSystem</a>. In this case, the configuration is the Accumulo
+<p>We’re defining the instance with <a href="/docs/2.x/configuration/server-properties#replication_name">replication.name</a> of <code class="highlighter-rouge">peer</code> as a peer. We provide the implementation of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-2/org/apache/accumulo/server/replication/ReplicaSystem.html">ReplicaSystem</a>
+that we want to use, and the configuration for the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-2/org/apache/accumulo/server/replication/AccumuloReplicaSystem.html">AccumuloReplicaSystem</a>. In this case, the configuration is the Accumulo
 Instance name for <code class="highlighter-rouge">peer</code> and the ZooKeeper quorum string. The configuration key is of the form
 <code class="highlighter-rouge">replication.peer.$peer_name</code>.</p>
 
@@ -690,8 +690,8 @@ root@primary&gt; config -s replication.peer.password.peer=peer
 <h4 id="enable-replication-on-the-table">Enable replication on the table</h4>
 
 <p>Now that we have defined the peer on the primary and provided the authentication credentials, we need to configure
-our table with the implementation of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/ReplicaSystem.html">ReplicaSystem</a> we want to use to replicate to the peer. In this case, our peer
-is an Accumulo instance, so we want to use the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/AccumuloReplicaSystem.html">AccumuloReplicaSystem</a>.</p>
+our table with the implementation of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-2/org/apache/accumulo/server/replication/ReplicaSystem.html">ReplicaSystem</a> we want to use to replicate to the peer. In this case, our peer
+is an Accumulo instance, so we want to use the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-2/org/apache/accumulo/server/replication/AccumuloReplicaSystem.html">AccumuloReplicaSystem</a>.</p>
 
 <p>The configuration for the AccumuloReplicaSystem is the table ID for the table on the peer instance that we
 want to replicate into. Be sure to use the correct value for $peer_table_id. The configuration key is of
diff --git a/docs/2.x/administration/scan-executors.html b/docs/2.x/administration/scan-executors.html
index 19959ab..bb9aaad 100644
--- a/docs/2.x/administration/scan-executors.html
+++ b/docs/2.x/administration/scan-executors.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
@@ -461,7 +461,7 @@ tserver.scan.executors.&lt;name&gt;.prioritizer.opts.&lt;key&gt;=&lt;value&gt;
 </code></pre></div></div>
 
 <p>After creating an executor, configure <a href="/docs/2.x/configuration/server-properties#table_scan_dispatcher">table.scan.dispatcher</a> to use it.  A
-dispatcher is Java subclass of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/spi/scan/ScanDispatcher.html">ScanDispatcher</a>
+dispatcher is Java subclass of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/spi/scan/ScanDispatcher.html">ScanDispatcher</a>
 that decides which scan executor should service a table.  Set the following table
 property to configure a dispatcher.</p>
 
@@ -473,7 +473,7 @@ property to configure a dispatcher.</p>
 <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>table.scan.dispatcher.opts.&lt;key&gt;=&lt;value&gt;
 </code></pre></div></div>
 
-<p>The default value for <code class="highlighter-rouge">table.scan.dispatcher</code> is <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/spi/scan/SimpleScanDispatcher.html">SimpleScanDispatcher</a>.
+<p>The default value for <code class="highlighter-rouge">table.scan.dispatcher</code> is <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/spi/scan/SimpleScanDispatcher.html">SimpleScanDispatcher</a>.
 SimpleScanDispatcher supports an <code class="highlighter-rouge">executor</code> option for choosing a scan
 executor.  If this option is not set, then SimpleScanDispatcher will dispatch
 to the scan executor named <code class="highlighter-rouge">default</code>.</p>
@@ -517,8 +517,8 @@ for each table.  This ensures things work as expected in the case where
 <h3 id="configuring-and-using-scan-prioritizers">Configuring and using Scan Prioritizers.</h3>
 
 <p>When all scan executor threads are busy, incoming work is queued.  By
-default this queue has a FIFO order.  A <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/spi/scan/ScanPrioritizer.html">ScanPrioritizer</a> can be configured to
-reorder the queue.  Accumulo ships with the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/spi/scan/IdleRatioScanPrioritizer.html">IdleRatioScanPrioritizer</a> which
+default this queue has a FIFO order.  A <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/spi/scan/ScanPrioritizer.html">ScanPrioritizer</a> can be configured to
+reorder the queue.  Accumulo ships with the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/spi/scan/IdleRatioScanPrioritizer.html">IdleRatioScanPrioritizer</a> which
 orders the queue by the ratio of run time to idle time.  For example, a scan
 with a run time of 50ms and an idle time of 200ms would have a ratio of .25.
 If .25 were the lowest ratio on the queue, then it would be the next in line.
@@ -535,7 +535,7 @@ In this test the average lookup time for the 5 threads went from 250ms to 5 ms.<
 <h3 id="providing-hints-from-the-client-side">Providing hints from the client side.</h3>
 
 <p>Scanners can provide hints to ScanDispatchers and ScanPriotizers by calling
-<a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/ScannerBase.html#setExecutionHints-java.util.Map-">setExecutionHints</a> on the Scanner.  What, if anything, is done with these
+<a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/client/ScannerBase.html#setExecutionHints-java.util.Map-">setExecutionHints</a> on the Scanner.  What, if anything, is done with these
 hints depends on what is configured for the table and system.  Accumulo’s
 default configuration ignores hints. The following shell commands make it
 possible to choose an executor and set priorities from a scanner for the
@@ -548,7 +548,7 @@ config -t tex -s table.scan.dispatcher=org.apache.accumulo.core.spi.scan.SimpleS
 config -t tex -s table.scan.dispatcher.opts.heed_hints=true
 </code></pre></div></div>
 
-<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/spi/scan/HintScanPrioritizer.html">HintScanPrioritizer</a> honors
+<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/spi/scan/HintScanPrioritizer.html">HintScanPrioritizer</a> honors
 hints of the form <code class="highlighter-rouge">priority=&lt;integer&gt;</code> to prioritize scans, with lower integers
 resulting in a higher priority. The <code class="highlighter-rouge">SimpleScanDispatcher</code>, which is the
 default dispatcher, supports the <code class="highlighter-rouge">heed_hints</code> option. By default the
diff --git a/docs/2.x/administration/upgrading.html b/docs/2.x/administration/upgrading.html
index e25a82a..17c742d 100644
--- a/docs/2.x/administration/upgrading.html
+++ b/docs/2.x/administration/upgrading.html
@@ -91,7 +91,7 @@
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/release/accumulo-2.0.0-alpha-1/">2.0.0-alpha-1 (Preview Release)</a></li>
+            <li><a href="/release/accumulo-2.0.0-alpha-2/">2.0.0-alpha-2 (Preview Release)</a></li>
             <li><a href="/release/accumulo-1.9.2/">1.9.2 (Latest)</a></li>
             <li><a href="/release/">Archive</a></li>
           </ul>
@@ -520,8 +520,8 @@ that users start using the new API, the old API will continue to be supported th
 <ul>
   <li>The API for <a href="/docs/2.x/getting-started/clients#creating-an-accumulo-client">creating Accumulo clients</a> has changed in 2.0.
     <ul>
-      <li>The old API using <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/ZooKeeperInstance.html">ZooKeeeperInstance</a>, <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/Connector.html">Connector</a>, <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/Instance.html">Instance</a>, and <a href [...]
-      <li><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/Connector.html">Connector</a> objects can be created from an <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a> object using <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/Connector.html#from-org [...]
+      <li>The old API using <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/client/ZooKeeperInstance.html">ZooKeeeperInstance</a>, <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/client/Connector.html">Connector</a>, <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/client/Instance.html">Instance</a>, and <a href [...]
+      <li><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/client/Connector.html">Connector</a> objects can be created from an <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a> object using <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/client/Connector.html#from-org [...]
     </ul>
   </li>
   <li>Accumulo’s <a href="/docs/2.x/development/mapreduce">MapReduce API</a> has changed in 2.0.
diff --git a/docs/2.x/apidocs/allclasses-frame.html b/docs/2.x/apidocs/allclasses-frame.html
index 2aa22ee..ff3c7d3 100644
--- a/docs/2.x/apidocs/allclasses-frame.html
+++ b/docs/2.x/apidocs/allclasses-frame.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:36 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:13 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>All Classes (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>All Classes (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -21,10 +21,8 @@
 <li><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapreduce" target="classFrame">AbstractInputFormat.AbstractRecordReader</a></li>
 <li><a href="org/apache/accumulo/core/client/Accumulo.html" title="class in org.apache.accumulo.core.client" target="classFrame">Accumulo</a></li>
 <li><a href="org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client" target="classFrame"><span class="interfaceName">AccumuloClient</span></a></li>
-<li><a href="org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client" target="classFrame"><span class="interfaceName">AccumuloClient.AccumuloClientFactory</span></a></li>
 <li><a href="org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client" target="classFrame"><span class="interfaceName">AccumuloClient.AuthenticationArgs</span></a></li>
-<li><a href="org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html" title="interface in org.apache.accumulo.core.client" target="classFrame"><span class="interfaceName">AccumuloClient.ClientInfoFactory</span></a></li>
-<li><a href="org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html" title="interface in org.apache.accumulo.core.client" target="classFrame"><span class="interfaceName">AccumuloClient.ClientInfoOptions</span></a></li>
+<li><a href="org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="interface in org.apache.accumulo.core.client" target="classFrame"><span class="interfaceName">AccumuloClient.ClientFactory</span></a></li>
 <li><a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client" target="classFrame"><span class="interfaceName">AccumuloClient.ConnectionOptions</span></a></li>
 <li><a href="org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client" target="classFrame"><span class="interfaceName">AccumuloClient.FromOptions</span></a></li>
 <li><a href="org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html" title="interface in org.apache.accumulo.core.client" target="classFrame"><span class="interfaceName">AccumuloClient.InstanceArgs</span></a></li>
@@ -56,6 +54,7 @@
 <li><a href="org/apache/accumulo/core/client/security/tokens/AuthenticationToken.TokenProperty.html" title="class in org.apache.accumulo.core.client.security.tokens" target="classFrame">AuthenticationToken.TokenProperty</a></li>
 <li><a href="org/apache/accumulo/core/security/AuthorizationContainer.html" title="interface in org.apache.accumulo.core.security" target="classFrame"><span class="interfaceName">AuthorizationContainer</span></a></li>
 <li><a href="org/apache/accumulo/core/security/Authorizations.html" title="class in org.apache.accumulo.core.security" target="classFrame">Authorizations</a></li>
+<li><a href="org/apache/accumulo/core/client/summary/summarizers/AuthorizationSummarizer.html" title="class in org.apache.accumulo.core.client.summary.summarizers" target="classFrame">AuthorizationSummarizer</a></li>
 <li><a href="org/apache/accumulo/core/client/BatchDeleter.html" title="interface in org.apache.accumulo.core.client" target="classFrame"><span class="interfaceName">BatchDeleter</span></a></li>
 <li><a href="org/apache/accumulo/core/client/BatchScanner.html" title="interface in org.apache.accumulo.core.client" target="classFrame"><span class="interfaceName">BatchScanner</span></a></li>
 <li><a href="org/apache/accumulo/core/client/BatchWriter.html" title="interface in org.apache.accumulo.core.client" target="classFrame"><span class="interfaceName">BatchWriter</span></a></li>
@@ -65,7 +64,6 @@
 <li><a href="org/apache/accumulo/core/client/lexicoder/BytesLexicoder.html" title="class in org.apache.accumulo.core.client.lexicoder" target="classFrame">BytesLexicoder</a></li>
 <li><a href="org/apache/accumulo/core/client/ClientConfiguration.html" title="class in org.apache.accumulo.core.client" target="classFrame">ClientConfiguration</a></li>
 <li><a href="org/apache/accumulo/core/client/ClientConfiguration.ClientProperty.html" title="enum in org.apache.accumulo.core.client" target="classFrame">ClientConfiguration.ClientProperty</a></li>
-<li><a href="org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client" target="classFrame"><span class="interfaceName">ClientInfo</span></a></li>
 <li><a href="org/apache/accumulo/core/client/ClientSideIteratorScanner.html" title="class in org.apache.accumulo.core.client" target="classFrame">ClientSideIteratorScanner</a></li>
 <li><a href="org/apache/accumulo/core/data/Column.html" title="class in org.apache.accumulo.core.data" target="classFrame">Column</a></li>
 <li><a href="org/apache/accumulo/core/data/ColumnUpdate.html" title="class in org.apache.accumulo.core.data" target="classFrame">ColumnUpdate</a></li>
diff --git a/docs/2.x/apidocs/allclasses-noframe.html b/docs/2.x/apidocs/allclasses-noframe.html
index 9a3b1fb..cd75795 100644
--- a/docs/2.x/apidocs/allclasses-noframe.html
+++ b/docs/2.x/apidocs/allclasses-noframe.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:36 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:13 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>All Classes (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>All Classes (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -21,10 +21,8 @@
 <li><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat.AbstractRecordReader</a></li>
 <li><a href="org/apache/accumulo/core/client/Accumulo.html" title="class in org.apache.accumulo.core.client">Accumulo</a></li>
 <li><a href="org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client"><span class="interfaceName">AccumuloClient</span></a></li>
-<li><a href="org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client"><span class="interfaceName">AccumuloClient.AccumuloClientFactory</span></a></li>
 <li><a href="org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client"><span class="interfaceName">AccumuloClient.AuthenticationArgs</span></a></li>
-<li><a href="org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html" title="interface in org.apache.accumulo.core.client"><span class="interfaceName">AccumuloClient.ClientInfoFactory</span></a></li>
-<li><a href="org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html" title="interface in org.apache.accumulo.core.client"><span class="interfaceName">AccumuloClient.ClientInfoOptions</span></a></li>
+<li><a href="org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="interface in org.apache.accumulo.core.client"><span class="interfaceName">AccumuloClient.ClientFactory</span></a></li>
 <li><a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client"><span class="interfaceName">AccumuloClient.ConnectionOptions</span></a></li>
 <li><a href="org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client"><span class="interfaceName">AccumuloClient.FromOptions</span></a></li>
 <li><a href="org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html" title="interface in org.apache.accumulo.core.client"><span class="interfaceName">AccumuloClient.InstanceArgs</span></a></li>
@@ -56,6 +54,7 @@
 <li><a href="org/apache/accumulo/core/client/security/tokens/AuthenticationToken.TokenProperty.html" title="class in org.apache.accumulo.core.client.security.tokens">AuthenticationToken.TokenProperty</a></li>
 <li><a href="org/apache/accumulo/core/security/AuthorizationContainer.html" title="interface in org.apache.accumulo.core.security"><span class="interfaceName">AuthorizationContainer</span></a></li>
 <li><a href="org/apache/accumulo/core/security/Authorizations.html" title="class in org.apache.accumulo.core.security">Authorizations</a></li>
+<li><a href="org/apache/accumulo/core/client/summary/summarizers/AuthorizationSummarizer.html" title="class in org.apache.accumulo.core.client.summary.summarizers">AuthorizationSummarizer</a></li>
 <li><a href="org/apache/accumulo/core/client/BatchDeleter.html" title="interface in org.apache.accumulo.core.client"><span class="interfaceName">BatchDeleter</span></a></li>
 <li><a href="org/apache/accumulo/core/client/BatchScanner.html" title="interface in org.apache.accumulo.core.client"><span class="interfaceName">BatchScanner</span></a></li>
 <li><a href="org/apache/accumulo/core/client/BatchWriter.html" title="interface in org.apache.accumulo.core.client"><span class="interfaceName">BatchWriter</span></a></li>
@@ -65,7 +64,6 @@
 <li><a href="org/apache/accumulo/core/client/lexicoder/BytesLexicoder.html" title="class in org.apache.accumulo.core.client.lexicoder">BytesLexicoder</a></li>
 <li><a href="org/apache/accumulo/core/client/ClientConfiguration.html" title="class in org.apache.accumulo.core.client">ClientConfiguration</a></li>
 <li><a href="org/apache/accumulo/core/client/ClientConfiguration.ClientProperty.html" title="enum in org.apache.accumulo.core.client">ClientConfiguration.ClientProperty</a></li>
-<li><a href="org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client"><span class="interfaceName">ClientInfo</span></a></li>
 <li><a href="org/apache/accumulo/core/client/ClientSideIteratorScanner.html" title="class in org.apache.accumulo.core.client">ClientSideIteratorScanner</a></li>
 <li><a href="org/apache/accumulo/core/data/Column.html" title="class in org.apache.accumulo.core.data">Column</a></li>
 <li><a href="org/apache/accumulo/core/data/ColumnUpdate.html" title="class in org.apache.accumulo.core.data">ColumnUpdate</a></li>
diff --git a/docs/2.x/apidocs/constant-values.html b/docs/2.x/apidocs/constant-values.html
index add1093..d3c6be8 100644
--- a/docs/2.x/apidocs/constant-values.html
+++ b/docs/2.x/apidocs/constant-values.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:35 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:13 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Constant Field Values (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>Constant Field Values (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Constant Field Values (Apache Accumulo Project 2.0.0-alpha-1 API)";
+            parent.document.title="Constant Field Values (Apache Accumulo Project 2.0.0-alpha-2 API)";
         }
     }
     catch(err) {
@@ -360,6 +360,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2019 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/docs/2.x/apidocs/deprecated-list.html b/docs/2.x/apidocs/deprecated-list.html
index d8afdc7..39cfccf 100644
--- a/docs/2.x/apidocs/deprecated-list.html
+++ b/docs/2.x/apidocs/deprecated-list.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:35 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:13 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Deprecated List (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>Deprecated List (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Deprecated List (Apache Accumulo Project 2.0.0-alpha-1 API)";
+            parent.document.title="Deprecated List (Apache Accumulo Project 2.0.0-alpha-2 API)";
         }
     }
     catch(err) {
@@ -93,7 +93,8 @@
 <tbody>
 <tr class="altColor">
 <td class="colOne"><a href="org/apache/accumulo/core/client/Instance.html" title="interface in org.apache.accumulo.core.client">org.apache.accumulo.core.client.Instance</a>
-<div class="block"><span class="deprecationComment">since 2.0.0, use <a href="org/apache/accumulo/core/client/Accumulo.html#newClient--"><code>Accumulo.newClient()</code></a> and <a href="org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client"><code>ClientInfo</code></a> instead</span></div>
+<div class="block"><span class="deprecationComment">since 2.0.0, use <a href="org/apache/accumulo/core/client/Accumulo.html#newClient--"><code>Accumulo.newClient()</code></a> and <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util"><code>Properties</code></a>
+             instead</span></div>
 </td>
 </tr>
 </tbody>
@@ -112,265 +113,302 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/ClientConfiguration.html" title="class in org.apache.accumulo.core.client">org.apache.accumulo.core.client.ClientConfiguration</a>
-<div class="block"><span class="deprecationComment">since 2.0.0, replaced by <a href="org/apache/accumulo/core/client/Accumulo.html#newClient--"><code>Accumulo.newClient()</code></a></span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">org.apache.accumulo.core.client.mapred.AbstractInputFormat</a>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapred instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/Connector.html" title="class in org.apache.accumulo.core.client">org.apache.accumulo.core.client.Connector</a>
-<div class="block"><span class="deprecationComment">since 2.0.0. Use <a href="org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client"><code>AccumuloClient</code></a> for wiriting new code. Connector is available
-             for existing code. Use <a href="org/apache/accumulo/core/client/Connector.html#from-org.apache.accumulo.core.client.AccumuloClient-"><code>Connector.from(AccumuloClient)</code></a> as a bridge between the two.</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">org.apache.accumulo.core.client.mapreduce.AbstractInputFormat</a>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapreduce instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/minicluster/MiniAccumuloInstance.html" title="class in org.apache.accumulo.minicluster">org.apache.accumulo.minicluster.MiniAccumuloInstance</a>
-<div class="block"><span class="deprecationComment">since 2.0.0, Use <a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getClientInfo-java.io.File-"><code>MiniAccumuloCluster.getClientInfo(File)</code></a> instead</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">org.apache.accumulo.core.client.mapred.AccumuloFileOutputFormat</a>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapred instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/ZooKeeperInstance.html" title="class in org.apache.accumulo.core.client">org.apache.accumulo.core.client.ZooKeeperInstance</a>
-<div class="block"><span class="deprecationComment">since 2.0.0, Use <a href="org/apache/accumulo/core/client/Accumulo.html#newClient--"><code>Accumulo.newClient()</code></a> instead</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">org.apache.accumulo.core.client.mapreduce.AccumuloFileOutputFormat</a>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapreduce instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
 </td>
 </tr>
-</tbody>
-</table>
-</li>
-</ul>
-<a name="method">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<table class="deprecatedSummary" border="0" cellpadding="3" cellspacing="0" summary="Deprecated Methods table, listing deprecated methods, and an explanation">
-<caption><span>Deprecated Methods</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Method and Description</th>
-</tr>
-<tbody>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/admin/SecurityOperations.html#authenticateUser-java.lang.String-byte:A-">org.apache.accumulo.core.client.admin.SecurityOperations.authenticateUser(String, byte[])</a>
-<div class="block"><span class="deprecationComment">since 1.5.0; use <a href="org/apache/accumulo/core/client/admin/SecurityOperations.html#authenticateUser-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-"><code>SecurityOperations.authenticateUser(String, AuthenticationToken)</code></a> instead.</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">org.apache.accumulo.core.client.mapred.AccumuloInputFormat</a>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapred instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/admin/SecurityOperations.html#changeUserPassword-java.lang.String-byte:A-">org.apache.accumulo.core.client.admin.SecurityOperations.changeUserPassword(String, byte[])</a>
-<div class="block"><span class="deprecationComment">since 1.5.0; use <a href="org/apache/accumulo/core/client/admin/SecurityOperations.html#changeLocalUserPassword-java.lang.String-org.apache.accumulo.core.client.security.tokens.PasswordToken-"><code>SecurityOperations.changeLocalUserPassword(String, PasswordToken)</code></a> or the
-             user management functions of your configured authenticator instead.</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat</a>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapreduce instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/admin/TableOperations.html#create-java.lang.String-boolean-">org.apache.accumulo.core.client.admin.TableOperations.create(String, boolean)</a>
-<div class="block"><span class="deprecationComment">since 1.7.0; use <a href="org/apache/accumulo/core/client/admin/TableOperations.html#create-java.lang.String-org.apache.accumulo.core.client.admin.NewTableConfiguration-"><code>TableOperations.create(String, NewTableConfiguration)</code></a> instead.</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">org.apache.accumulo.core.client.mapred.AccumuloMultiTableInputFormat</a>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapred instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/admin/TableOperations.html#create-java.lang.String-boolean-org.apache.accumulo.core.client.admin.TimeType-">org.apache.accumulo.core.client.admin.TableOperations.create(String, boolean, TimeType)</a>
-<div class="block"><span class="deprecationComment">since 1.7.0; use <a href="org/apache/accumulo/core/client/admin/TableOperations.html#create-java.lang.String-org.apache.accumulo.core.client.admin.NewTableConfiguration-"><code>TableOperations.create(String, NewTableConfiguration)</code></a> instead.</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">org.apache.accumulo.core.client.mapreduce.AccumuloMultiTableInputFormat</a>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapreduce instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/Connector.html#createBatchDeleter-java.lang.String-org.apache.accumulo.core.security.Authorizations-int-long-long-int-">org.apache.accumulo.core.client.Connector.createBatchDeleter(String, Authorizations, int, long, long, int)</a>
-<div class="block"><span class="deprecationComment">since 1.5.0; Use
-             <a href="org/apache/accumulo/core/client/Connector.html#createBatchDeleter-java.lang.String-org.apache.accumulo.core.security.Authorizations-int-org.apache.accumulo.core.client.BatchWriterConfig-"><code>Connector.createBatchDeleter(String, Authorizations, int, BatchWriterConfig)</code></a>
-             instead.</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">org.apache.accumulo.core.client.mapred.AccumuloOutputFormat</a>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapred instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/Connector.html#createBatchWriter-java.lang.String-long-long-int-">org.apache.accumulo.core.client.Connector.createBatchWriter(String, long, long, int)</a>
-<div class="block"><span class="deprecationComment">since 1.5.0; Use <a href="org/apache/accumulo/core/client/Connector.html#createBatchWriter-java.lang.String-org.apache.accumulo.core.client.BatchWriterConfig-"><code>Connector.createBatchWriter(String, BatchWriterConfig)</code></a> instead.</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat</a>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapreduce instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/Connector.html#createMultiTableBatchWriter-long-long-int-">org.apache.accumulo.core.client.Connector.createMultiTableBatchWriter(long, long, int)</a>
-<div class="block"><span class="deprecationComment">since 1.5.0; Use <a href="org/apache/accumulo/core/client/Connector.html#createMultiTableBatchWriter-org.apache.accumulo.core.client.BatchWriterConfig-"><code>Connector.createMultiTableBatchWriter(BatchWriterConfig)</code></a> instead.</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">org.apache.accumulo.core.client.mapred.AccumuloRowInputFormat</a>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapred instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/admin/SecurityOperations.html#createUser-java.lang.String-byte:A-org.apache.accumulo.core.security.Authorizations-">org.apache.accumulo.core.client.admin.SecurityOperations.createUser(String, byte[], Authorizations)</a>
-<div class="block"><span class="deprecationComment">since 1.5.0; use <a href="org/apache/accumulo/core/client/admin/SecurityOperations.html#createLocalUser-java.lang.String-org.apache.accumulo.core.client.security.tokens.PasswordToken-"><code>SecurityOperations.createLocalUser(String, PasswordToken)</code></a> or the user
-             management functions of your configured authenticator instead.</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">org.apache.accumulo.core.client.mapreduce.AccumuloRowInputFormat</a>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapreduce instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/admin/SecurityOperations.html#dropUser-java.lang.String-">org.apache.accumulo.core.client.admin.SecurityOperations.dropUser(String)</a>
-<div class="block"><span class="deprecationComment">since 1.5.0; use <a href="org/apache/accumulo/core/client/admin/SecurityOperations.html#dropLocalUser-java.lang.String-"><code>SecurityOperations.dropLocalUser(String)</code></a> or the user management functions of
-             your configured authenticator instead.</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/ClientConfiguration.html" title="class in org.apache.accumulo.core.client">org.apache.accumulo.core.client.ClientConfiguration</a>
+<div class="block"><span class="deprecationComment">since 2.0.0, replaced by <a href="org/apache/accumulo/core/client/Accumulo.html#newClient--"><code>Accumulo.newClient()</code></a></span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/data/PartialKey.html#getByDepth-int-">org.apache.accumulo.core.data.PartialKey.getByDepth(int)</a>
-<div class="block"><span class="deprecationComment">since 1.7.0</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/Connector.html" title="class in org.apache.accumulo.core.client">org.apache.accumulo.core.client.Connector</a>
+<div class="block"><span class="deprecationComment">since 2.0.0. Use <a href="org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client"><code>AccumuloClient</code></a> for writing new code. Connector is available
+             for existing code. Use <a href="org/apache/accumulo/core/client/Connector.html#from-org.apache.accumulo.core.client.AccumuloClient-"><code>Connector.from(AccumuloClient)</code></a> as a bridge between the two.</span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getClientConfig--">org.apache.accumulo.minicluster.MiniAccumuloCluster.getClientConfig()</a>
-<div class="block"><span class="deprecationComment">since 2.0.0, replaced by <a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getClientInfo--"><code>MiniAccumuloCluster.getClientInfo()</code></a></span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapred">org.apache.accumulo.core.client.mapred.InputFormatBase</a>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapred instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#getClientConfiguration-org.apache.hadoop.mapred.JobConf-">org.apache.accumulo.core.client.mapred.AbstractInputFormat.getClientConfiguration(JobConf)</a>
-<div class="block"><span class="deprecationComment">since 2.0.0, replaced by <a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#getClientInfo-org.apache.hadoop.mapred.JobConf-"><code>AbstractInputFormat.getClientInfo(JobConf)</code></a></span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapreduce">org.apache.accumulo.core.client.mapreduce.InputFormatBase</a>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapreduce instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getClientConfiguration-org.apache.hadoop.mapreduce.JobContext-">org.apache.accumulo.core.client.mapreduce.AbstractInputFormat.getClientConfiguration(JobContext)</a>
-<div class="block"><span class="deprecationComment">since 2.0.0; use <a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getClientInfo-org.apache.hadoop.mapreduce.JobContext-"><code>AbstractInputFormat.getClientInfo(JobContext)</code></a> instead</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">org.apache.accumulo.core.client.mapreduce.InputTableConfig</a>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapreduce instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/Instance.html#getConnector-java.lang.String-byte:A-">org.apache.accumulo.core.client.Instance.getConnector(String, byte[])</a>
-<div class="block"><span class="deprecationComment">since 1.5, use <a href="org/apache/accumulo/core/client/Instance.html#getConnector-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-"><code>Instance.getConnector(String, AuthenticationToken)</code></a> with
-             <a href="org/apache/accumulo/core/client/security/tokens/PasswordToken.html" title="class in org.apache.accumulo.core.client.security.tokens"><code>PasswordToken</code></a></span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/lib/partition/KeyRangePartitioner.html" title="class in org.apache.accumulo.core.client.mapreduce.lib.partition">org.apache.accumulo.core.client.mapreduce.lib.partition.KeyRangePartitioner</a>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapreduce.partition instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/Instance.html#getConnector-java.lang.String-java.nio.ByteBuffer-">org.apache.accumulo.core.client.Instance.getConnector(String, ByteBuffer)</a>
-<div class="block"><span class="deprecationComment">since 1.5, use <a href="org/apache/accumulo/core/client/Instance.html#getConnector-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-"><code>Instance.getConnector(String, AuthenticationToken)</code></a> with
-             <a href="org/apache/accumulo/core/client/security/tokens/PasswordToken.html" title="class in org.apache.accumulo.core.client.security.tokens"><code>PasswordToken</code></a></span></div>
+<td class="colOne"><a href="org/apache/accumulo/minicluster/MiniAccumuloInstance.html" title="class in org.apache.accumulo.minicluster">org.apache.accumulo.minicluster.MiniAccumuloInstance</a>
+<div class="block"><span class="deprecationComment">since 2.0.0, Use <a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getClientProperties-java.io.File-"><code>MiniAccumuloCluster.getClientProperties(File)</code></a> instead</span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/Instance.html#getConnector-java.lang.String-java.lang.CharSequence-">org.apache.accumulo.core.client.Instance.getConnector(String, CharSequence)</a>
-<div class="block"><span class="deprecationComment">since 1.5, use <a href="org/apache/accumulo/core/client/Instance.html#getConnector-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-"><code>Instance.getConnector(String, AuthenticationToken)</code></a> with
-             <a href="org/apache/accumulo/core/client/security/tokens/PasswordToken.html" title="class in org.apache.accumulo.core.client.security.tokens"><code>PasswordToken</code></a></span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapred">org.apache.accumulo.core.client.mapred.RangeInputSplit</a>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapred instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getConnector-java.lang.String-java.lang.String-">org.apache.accumulo.minicluster.MiniAccumuloCluster.getConnector(String, String)</a>
-<div class="block"><span class="deprecationComment">since 2.0.0, replaced by <a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getAccumuloClient-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-"><code>MiniAccumuloCluster.getAccumuloClient(String, AuthenticationToken)</code></a></span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">org.apache.accumulo.core.client.mapreduce.RangeInputSplit</a>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapreduce instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/Connector.html#getInstance--">org.apache.accumulo.core.client.Connector.getInstance()</a>
-<div class="block"><span class="deprecationComment">since 2.0.0, use <a href="org/apache/accumulo/core/client/AccumuloClient.html#info--"><code>AccumuloClient.info()</code></a> instead</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.html" title="class in org.apache.accumulo.core.client.mapreduce.lib.partition">org.apache.accumulo.core.client.mapreduce.lib.partition.RangePartitioner</a>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapreduce.partition instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#getInstance-org.apache.hadoop.mapred.JobConf-">org.apache.accumulo.core.client.mapred.AbstractInputFormat.getInstance(JobConf)</a>
-<div class="block"><span class="deprecationComment">since 2.0.0, Use <a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#getClientInfo-org.apache.hadoop.mapred.JobConf-"><code>AbstractInputFormat.getClientInfo(JobConf)</code></a> instead</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/ZooKeeperInstance.html" title="class in org.apache.accumulo.core.client">org.apache.accumulo.core.client.ZooKeeperInstance</a>
+<div class="block"><span class="deprecationComment">since 2.0.0, Use <a href="org/apache/accumulo/core/client/Accumulo.html#newClient--"><code>Accumulo.newClient()</code></a> instead</span></div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+<a name="method">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<table class="deprecatedSummary" border="0" cellpadding="3" cellspacing="0" summary="Deprecated Methods table, listing deprecated methods, and an explanation">
+<caption><span>Deprecated Methods</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="org/apache/accumulo/core/client/Connector.html#createBatchDeleter-java.lang.String-org.apache.accumulo.core.security.Authorizations-int-long-long-int-">org.apache.accumulo.core.client.Connector.createBatchDeleter(String, Authorizations, int, long, long, int)</a>
+<div class="block"><span class="deprecationComment">since 1.5.0; Use
+             <a href="org/apache/accumulo/core/client/Connector.html#createBatchDeleter-java.lang.String-org.apache.accumulo.core.security.Authorizations-int-org.apache.accumulo.core.client.BatchWriterConfig-"><code>Connector.createBatchDeleter(String, Authorizations, int, BatchWriterConfig)</code></a>
+             instead.</span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#getInstance-org.apache.hadoop.mapred.JobConf-">org.apache.accumulo.core.client.mapred.AccumuloOutputFormat.getInstance(JobConf)</a>
-<div class="block"><span class="deprecationComment">since 2.0.0; Use <a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#getClientInfo-org.apache.hadoop.mapred.JobConf-"><code>AccumuloOutputFormat.getClientInfo(JobConf)</code></a> instead</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/Connector.html#createBatchWriter-java.lang.String-long-long-int-">org.apache.accumulo.core.client.Connector.createBatchWriter(String, long, long, int)</a>
+<div class="block"><span class="deprecationComment">since 1.5.0; Use <a href="org/apache/accumulo/core/client/Connector.html#createBatchWriter-java.lang.String-org.apache.accumulo.core.client.BatchWriterConfig-"><code>Connector.createBatchWriter(String, BatchWriterConfig)</code></a> instead.</span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getInstance-org.apache.hadoop.mapreduce.JobContext-">org.apache.accumulo.core.client.mapreduce.AbstractInputFormat.getInstance(JobContext)</a>
-<div class="block"><span class="deprecationComment">since 2.0.0, use <a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getClientInfo-org.apache.hadoop.mapreduce.JobContext-"><code>AbstractInputFormat.getClientInfo(JobContext)</code></a> instead</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/Connector.html#createMultiTableBatchWriter-long-long-int-">org.apache.accumulo.core.client.Connector.createMultiTableBatchWriter(long, long, int)</a>
+<div class="block"><span class="deprecationComment">since 1.5.0; Use <a href="org/apache/accumulo/core/client/Connector.html#createMultiTableBatchWriter-org.apache.accumulo.core.client.BatchWriterConfig-"><code>Connector.createMultiTableBatchWriter(BatchWriterConfig)</code></a> instead.</span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#getInstance-org.apache.hadoop.mapreduce.JobContext-">org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat.getInstance(JobContext)</a>
-<div class="block"><span class="deprecationComment">since 2.0.0; Use <a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#getClientInfo-org.apache.hadoop.mapreduce.JobContext-"><code>AccumuloOutputFormat.getClientInfo(JobContext)</code></a> instead.</span></div>
+<td class="colOne"><a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getClientConfig--">org.apache.accumulo.minicluster.MiniAccumuloCluster.getClientConfig()</a>
+<div class="block"><span class="deprecationComment">since 2.0.0, replaced by <a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getClientProperties--"><code>MiniAccumuloCluster.getClientProperties()</code></a></span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/admin/TableOperations.html#getSplits-java.lang.String-">org.apache.accumulo.core.client.admin.TableOperations.getSplits(String)</a>
-<div class="block"><span class="deprecationComment">since 1.5.0; use <a href="org/apache/accumulo/core/client/admin/TableOperations.html#listSplits-java.lang.String-"><code>TableOperations.listSplits(String)</code></a> instead.</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/Instance.html#getConnector-java.lang.String-byte:A-">org.apache.accumulo.core.client.Instance.getConnector(String, byte[])</a>
+<div class="block"><span class="deprecationComment">since 1.5, use <a href="org/apache/accumulo/core/client/Instance.html#getConnector-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-"><code>Instance.getConnector(String, AuthenticationToken)</code></a> with
+             <a href="org/apache/accumulo/core/client/security/tokens/PasswordToken.html" title="class in org.apache.accumulo.core.client.security.tokens"><code>PasswordToken</code></a></span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/admin/TableOperations.html#getSplits-java.lang.String-int-">org.apache.accumulo.core.client.admin.TableOperations.getSplits(String, int)</a>
-<div class="block"><span class="deprecationComment">since 1.5.0; use <a href="org/apache/accumulo/core/client/admin/TableOperations.html#listSplits-java.lang.String-int-"><code>TableOperations.listSplits(String, int)</code></a> instead.</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/Instance.html#getConnector-java.lang.String-java.nio.ByteBuffer-">org.apache.accumulo.core.client.Instance.getConnector(String, ByteBuffer)</a>
+<div class="block"><span class="deprecationComment">since 1.5, use <a href="org/apache/accumulo/core/client/Instance.html#getConnector-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-"><code>Instance.getConnector(String, AuthenticationToken)</code></a> with
+             <a href="org/apache/accumulo/core/client/security/tokens/PasswordToken.html" title="class in org.apache.accumulo.core.client.security.tokens"><code>PasswordToken</code></a></span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/IsolatedScanner.html#getTimeOut--">org.apache.accumulo.core.client.IsolatedScanner.getTimeOut()</a></td>
+<td class="colOne"><a href="org/apache/accumulo/core/client/Instance.html#getConnector-java.lang.String-java.lang.CharSequence-">org.apache.accumulo.core.client.Instance.getConnector(String, CharSequence)</a>
+<div class="block"><span class="deprecationComment">since 1.5, use <a href="org/apache/accumulo/core/client/Instance.html#getConnector-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-"><code>Instance.getConnector(String, AuthenticationToken)</code></a> with
+             <a href="org/apache/accumulo/core/client/security/tokens/PasswordToken.html" title="class in org.apache.accumulo.core.client.security.tokens"><code>PasswordToken</code></a></span></div>
+</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/Scanner.html#getTimeOut--">org.apache.accumulo.core.client.Scanner.getTimeOut()</a>
-<div class="block"><span class="deprecationComment">Since 1.5. See <a href="org/apache/accumulo/core/client/ScannerBase.html#getTimeout-java.util.concurrent.TimeUnit-"><code>ScannerBase.getTimeout(java.util.concurrent.TimeUnit)</code></a></span></div>
+<td class="colOne"><a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getConnector-java.lang.String-java.lang.String-">org.apache.accumulo.minicluster.MiniAccumuloCluster.getConnector(String, String)</a>
+<div class="block"><span class="deprecationComment">since 2.0.0, replaced by <a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#createAccumuloClient-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-"><code>MiniAccumuloCluster.createAccumuloClient(String, AuthenticationToken)</code></a></span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/ClientSideIteratorScanner.html#getTimeOut--">org.apache.accumulo.core.client.ClientSideIteratorScanner.getTimeOut()</a></td>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#getInstance--">org.apache.accumulo.core.client.mapreduce.RangeInputSplit.getInstance()</a>
+<div class="block"><span class="deprecationComment">since 1.7.0, use getInstance(ClientConfiguration) instead.</span></div>
+</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/admin/TableOperations.html#importDirectory-java.lang.String-java.lang.String-java.lang.String-boolean-">org.apache.accumulo.core.client.admin.TableOperations.importDirectory(String, String, String, boolean)</a>
-<div class="block"><span class="deprecationComment">since 2.0.0 use <a href="org/apache/accumulo/core/client/admin/TableOperations.html#importDirectory-java.lang.String-"><code>TableOperations.importDirectory(String)</code></a> instead.</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#getTable--">org.apache.accumulo.core.client.mapreduce.RangeInputSplit.getTable()</a>
+<div class="block"><span class="deprecationComment">since 1.6.1, use getTableName() instead.</span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/admin/SecurityOperations.html#listUsers--">org.apache.accumulo.core.client.admin.SecurityOperations.listUsers()</a>
-<div class="block"><span class="deprecationComment">since 1.5.0; use <a href="org/apache/accumulo/core/client/admin/SecurityOperations.html#listLocalUsers--"><code>SecurityOperations.listLocalUsers()</code></a> or the user management functions of your
-             configured authenticator instead.</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#getToken-org.apache.hadoop.mapred.JobConf-">org.apache.accumulo.core.client.mapred.AccumuloOutputFormat.getToken(JobConf)</a>
+<div class="block"><span class="deprecationComment">since 1.6.0; Use <a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#getAuthenticationToken-org.apache.hadoop.mapred.JobConf-"><code>AccumuloOutputFormat.getAuthenticationToken(JobConf)</code></a> instead.</span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#setConnectorInfo-org.apache.hadoop.mapred.JobConf-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-">org.apache.accumulo.core.client.mapred.AbstractInputFormat.setConnectorInfo(JobConf, String, AuthenticationToken)</a>
-<div class="block"><span class="deprecationComment">since 2.0.0, use <a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#setClientInfo-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.ClientInfo-"><code>AbstractInputFormat.setClientInfo(JobConf, ClientInfo)</code></a> instead</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getToken-org.apache.hadoop.mapreduce.JobContext-">org.apache.accumulo.core.client.mapreduce.AbstractInputFormat.getToken(JobContext)</a>
+<div class="block"><span class="deprecationComment">since 1.6.0; Use <a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getAuthenticationToken-org.apache.hadoop.mapreduce.JobContext-"><code>AbstractInputFormat.getAuthenticationToken(JobContext)</code></a> instead.</span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#setConnectorInfo-org.apache.hadoop.mapred.JobConf-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-">org.apache.accumulo.core.client.mapred.AccumuloOutputFormat.setConnectorInfo(JobConf, String, AuthenticationToken)</a>
-<div class="block"><span class="deprecationComment">since 2.0.0, use <a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#setClientInfo-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.ClientInfo-"><code>AccumuloOutputFormat.setClientInfo(JobConf, ClientInfo)</code></a> instead.</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#getToken-org.apache.hadoop.mapreduce.JobContext-">org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat.getToken(JobContext)</a>
+<div class="block"><span class="deprecationComment">since 1.6.0; Use <a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#getAuthenticationToken-org.apache.hadoop.mapreduce.JobContext-"><code>AccumuloOutputFormat.getAuthenticationToken(JobContext)</code></a> instead.</span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#setConnectorInfo-org.apache.hadoop.mapred.JobConf-java.lang.String-java.lang.String-">org.apache.accumulo.core.client.mapred.AbstractInputFormat.setConnectorInfo(JobConf, String, String)</a>
-<div class="block"><span class="deprecationComment">since 2.0.0, use <a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#setClientPropertiesFile-org.apache.hadoop.mapred.JobConf-java.lang.String-"><code>AbstractInputFormat.setClientPropertiesFile(JobConf, String)</code></a> instead</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#getTokenClass-org.apache.hadoop.mapred.JobConf-">org.apache.accumulo.core.client.mapred.AccumuloOutputFormat.getTokenClass(JobConf)</a>
+<div class="block"><span class="deprecationComment">since 1.6.0; Use <a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#getAuthenticationToken-org.apache.hadoop.mapred.JobConf-"><code>AccumuloOutputFormat.getAuthenticationToken(JobConf)</code></a> instead.</span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#setConnectorInfo-org.apache.hadoop.mapred.JobConf-java.lang.String-java.lang.String-">org.apache.accumulo.core.client.mapred.AccumuloOutputFormat.setConnectorInfo(JobConf, String, String)</a>
-<div class="block"><span class="deprecationComment">since 2.0.0, use <a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#setClientPropertiesFile-org.apache.hadoop.mapred.JobConf-java.lang.String-"><code>AccumuloOutputFormat.setClientPropertiesFile(JobConf, String)</code></a> instead</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getTokenClass-org.apache.hadoop.mapreduce.JobContext-">org.apache.accumulo.core.client.mapreduce.AbstractInputFormat.getTokenClass(JobContext)</a>
+<div class="block"><span class="deprecationComment">since 1.6.0; Use <a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getAuthenticationToken-org.apache.hadoop.mapreduce.JobContext-"><code>AbstractInputFormat.getAuthenticationToken(JobContext)</code></a> instead.</span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#setConnectorInfo-org.apache.hadoop.mapreduce.Job-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-">org.apache.accumulo.core.client.mapreduce.AbstractInputFormat.setConnectorInfo(Job, String, AuthenticationToken)</a>
-<div class="block"><span class="deprecationComment">since 2.0.0; use <a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#setClientInfo-org.apache.hadoop.mapreduce.Job-org.apache.accumulo.core.client.ClientInfo-"><code>AbstractInputFormat.setClientInfo(Job, ClientInfo)</code></a> instead.</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#getTokenClass-org.apache.hadoop.mapreduce.JobContext-">org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat.getTokenClass(JobContext)</a>
+<div class="block"><span class="deprecationComment">since 1.6.0; Use <a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#getAuthenticationToken-org.apache.hadoop.mapreduce.JobContext-"><code>AccumuloOutputFormat.getAuthenticationToken(JobContext)</code></a> instead.</span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#setConnectorInfo-org.apache.hadoop.mapreduce.Job-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-">org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat.setConnectorInfo(Job, String, AuthenticationToken)</a>
-<div class="block"><span class="deprecationComment">since 2.0.0, replaced by <a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#setClientInfo-org.apache.hadoop.mapreduce.Job-org.apache.accumulo.core.client.ClientInfo-"><code>AccumuloOutputFormat.setClientInfo(Job, ClientInfo)</code></a></span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/admin/TableOperations.html#importDirectory-java.lang.String-java.lang.String-java.lang.String-boolean-">org.apache.accumulo.core.client.admin.TableOperations.importDirectory(String, String, String, boolean)</a>
+<div class="block"><span class="deprecationComment">since 2.0.0 use <a href="org/apache/accumulo/core/client/admin/TableOperations.html#importDirectory-java.lang.String-"><code>TableOperations.importDirectory(String)</code></a> instead.</span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#setConnectorInfo-org.apache.hadoop.mapreduce.Job-java.lang.String-java.lang.String-">org.apache.accumulo.core.client.mapreduce.AbstractInputFormat.setConnectorInfo(Job, String, String)</a>
-<div class="block"><span class="deprecationComment">since 2.0.0, use <a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#setClientPropertiesFile-org.apache.hadoop.mapreduce.Job-java.lang.String-"><code>AbstractInputFormat.setClientPropertiesFile(Job, String)</code></a></span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#setTable-java.lang.String-">org.apache.accumulo.core.client.mapreduce.RangeInputSplit.setTable(String)</a>
+<div class="block"><span class="deprecationComment">since 1.6.1, use setTableName() instead.</span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#setConnectorInfo-org.apache.hadoop.mapreduce.Job-java.lang.String-java.lang.String-">org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat.setConnectorInfo(Job, String, String)</a>
-<div class="block"><span class="deprecationComment">since 2.0.0, replaced by <a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#setClientPropertiesFile-org.apache.hadoop.mapreduce.Job-java.lang.String-"><code>AccumuloOutputFormat.setClientPropertiesFile(Job, String)</code></a></span></div>
-</td>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.RecordReaderBase.html#setupIterators-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.Scanner-">org.apache.accumulo.core.client.mapred.InputFormatBase.RecordReaderBase.setupIterators(JobConf, Scanner)</a></td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/IsolatedScanner.html#setTimeOut-int-">org.apache.accumulo.core.client.IsolatedScanner.setTimeOut(int)</a></td>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html#setupIterators-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.Scanner-java.lang.String-org.apache.accumulo.core.client.mapred.RangeInputSplit-">org.apache.accumulo.core.client.mapred.AbstractInputFormat.AbstractRecordReader.setupIterators(JobConf, Scanner, String, RangeInputSplit)</a>
+<div class="block"><span class="deprecationComment">since 1.7.0; Use <a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html#jobIterators-org.apache.hadoop.mapred.JobConf-java.lang.String-"><code>AbstractInputFormat.AbstractRecordReader.jobIterators(org.apache.hadoop.mapred.JobConf, java.lang.String)</code></a> instead.</span></div>
+</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/Scanner.html#setTimeOut-int-">org.apache.accumulo.core.client.Scanner.setTimeOut(int)</a>
-<div class="block"><span class="deprecationComment">Since 1.5. See <a href="org/apache/accumulo/core/client/ScannerBase.html#setTimeout-long-java.util.concurrent.TimeUnit-"><code>ScannerBase.setTimeout(long, java.util.concurrent.TimeUnit)</code></a></span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.RecordReaderBase.html#setupIterators-java.util.List-org.apache.accumulo.core.client.Scanner-">org.apache.accumulo.core.client.mapred.InputFormatBase.RecordReaderBase.setupIterators(List&lt;IteratorSetting&gt;, Scanner)</a>
+<div class="block"><span class="deprecationComment">since 1.7.0; Use <a href="org/apache/accumulo/core/client/mapred/InputFormatBase.RecordReaderBase.html#jobIterators-org.apache.hadoop.mapred.JobConf-java.lang.String-"><code>InputFormatBase.RecordReaderBase.jobIterators(org.apache.hadoop.mapred.JobConf, java.lang.String)</code></a> instead.</span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/ClientSideIteratorScanner.html#setTimeOut-int-">org.apache.accumulo.core.client.ClientSideIteratorScanner.setTimeOut(int)</a></td>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.RecordReaderBase.html#setupIterators-org.apache.hadoop.mapreduce.TaskAttemptContext-org.apache.accumulo.core.client.Scanner-">org.apache.accumulo.core.client.mapreduce.InputFormatBase.RecordReaderBase.setupIterators(TaskAttemptContext, Scanner)</a>
+<div class="block"><span class="deprecationComment">since 1.7.0; Use <a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.RecordReaderBase.html#contextIterators-org.apache.hadoop.mapreduce.TaskAttemptContext-java.lang.String-"><code>InputFormatBase.RecordReaderBase.contextIterators(org.apache.hadoop.mapreduce.TaskAttemptContext, java.lang.String)</code></a> instead.</span></div>
+</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#setZooKeeperInstance-org.apache.hadoop.mapreduce.Job-org.apache.accumulo.core.client.ClientConfiguration-">org.apache.accumulo.core.client.mapreduce.AbstractInputFormat.setZooKeeperInstance(Job, ClientConfiguration)</a>
-<div class="block"><span class="deprecationComment">since 2.0.0; Use <a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#setClientInfo-org.apache.hadoop.mapreduce.Job-org.apache.accumulo.core.client.ClientInfo-"><code>AbstractInputFormat.setClientInfo(Job, ClientInfo)</code></a> instead.</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.RecordReaderBase.html#setupIterators-org.apache.hadoop.mapreduce.TaskAttemptContext-org.apache.accumulo.core.client.Scanner-org.apache.accumulo.core.client.mapreduce.RangeInputSplit-">org.apache.accumulo.core.client.mapreduce.InputFormatBase.RecordReaderBase.setupIterators(TaskAttemptContext, Scanner, RangeInputSplit)</a>
+<div class="block"><span class="deprecationComment">since 1.7.0; Use <a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.RecordReaderBase.html#contextIterators-org.apache.hadoop.mapreduce.TaskAttemptContext-java.lang.String-"><code>InputFormatBase.RecordReaderBase.contextIterators(org.apache.hadoop.mapreduce.TaskAttemptContext, java.lang.String)</code></a> instead.</span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#setZooKeeperInstance-org.apache.hadoop.mapreduce.Job-org.apache.accumulo.core.client.ClientConfiguration-">org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat.setZooKeeperInstance(Job, ClientConfiguration)</a>
-<div class="block"><span class="deprecationComment">since 2.0.0; Use <a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#setClientInfo-org.apache.hadoop.mapreduce.Job-org.apache.accumulo.core.client.ClientInfo-"><code>AccumuloOutputFormat.setClientInfo(Job, ClientInfo)</code></a> instead.</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html#setupIterators-org.apache.hadoop.mapreduce.TaskAttemptContext-org.apache.accumulo.core.client.Scanner-java.lang.String-org.apache.accumulo.core.client.mapreduce.RangeInputSplit-">org.apache.accumulo.core.client.mapreduce.AbstractInputFormat.AbstractRecordReader.setupIterators(TaskAttemptContext, Scanner, String, RangeInputSplit)</a>
+<div class="block"><span class="deprecationComment">since 1.7.0; Use <a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html#contextIterators-org.apache.hadoop.mapreduce.TaskAttemptContext-java.lang.String-"><code>AbstractInputFormat.AbstractRecordReader.contextIterators(org.apache.hadoop.mapreduce.TaskAttemptContext, java.lang.String)</code></a> instead.</span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#setZooKeeperInstance-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.ClientConfiguration-">org.apache.accumulo.core.client.mapred.AbstractInputFormat.setZooKeeperInstance(JobConf, ClientConfiguration)</a>
-<div class="block"><span class="deprecationComment">since 2.0.0; Use <a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#setClientInfo-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.ClientInfo-"><code>AbstractInputFormat.setClientInfo(JobConf, ClientInfo)</code></a> instead.</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#setZooKeeperInstance-org.apache.hadoop.mapred.JobConf-java.lang.String-java.lang.String-">org.apache.accumulo.core.client.mapred.AbstractInputFormat.setZooKeeperInstance(JobConf, String, String)</a>
+<div class="block"><span class="deprecationComment">since 1.6.0; Use
+             <a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#setZooKeeperInstance-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.ClientConfiguration-"><code>AbstractInputFormat.setZooKeeperInstance(JobConf, org.apache.accumulo.core.client.ClientConfiguration)</code></a>
+             instead.</span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#setZooKeeperInstance-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.ClientConfiguration-">org.apache.accumulo.core.client.mapred.AccumuloOutputFormat.setZooKeeperInstance(JobConf, ClientConfiguration)</a>
-<div class="block"><span class="deprecationComment">since 2.0.0; Use <a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#setClientInfo-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.ClientInfo-"><code>AccumuloOutputFormat.setClientInfo(JobConf, ClientInfo)</code></a> instead.</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#setZooKeeperInstance-org.apache.hadoop.mapred.JobConf-java.lang.String-java.lang.String-">org.apache.accumulo.core.client.mapred.AccumuloOutputFormat.setZooKeeperInstance(JobConf, String, String)</a>
+<div class="block"><span class="deprecationComment">since 1.6.0; Use
+             <a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#setZooKeeperInstance-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.ClientConfiguration-"><code>AccumuloOutputFormat.setZooKeeperInstance(JobConf, org.apache.accumulo.core.client.ClientConfiguration)</code></a>
+             instead.</span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/data/Value.html#toArray-java.util.List-">org.apache.accumulo.core.data.Value.toArray(List&lt;byte[]&gt;)</a>
-<div class="block"><span class="deprecationComment">since 1.7.0; this utility method is not appropriate for the <a href="org/apache/accumulo/core/data/Value.html" title="class in org.apache.accumulo.core.data"><code>Value</code></a> object</span></div>
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#setZooKeeperInstance-org.apache.hadoop.mapreduce.Job-java.lang.String-java.lang.String-">org.apache.accumulo.core.client.mapreduce.AbstractInputFormat.setZooKeeperInstance(Job, String, String)</a>
+<div class="block"><span class="deprecationComment">since 1.6.0</span></div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#setZooKeeperInstance-org.apache.hadoop.mapreduce.Job-java.lang.String-java.lang.String-">org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat.setZooKeeperInstance(Job, String, String)</a>
+<div class="block"><span class="deprecationComment">since 1.6.0; Use
+             <a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#setZooKeeperInstance-org.apache.hadoop.mapreduce.Job-org.apache.accumulo.core.client.ClientConfiguration-"><code>AccumuloOutputFormat.setZooKeeperInstance(Job, org.apache.accumulo.core.client.ClientConfiguration)</code></a>
+             instead.</span></div>
 </td>
 </tr>
 </tbody>
@@ -389,37 +427,16 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/security/tokens/KerberosToken.html#KerberosToken-java.lang.String-java.io.File-boolean-">org.apache.accumulo.core.client.security.tokens.KerberosToken(String, File, boolean)</a>
-<div class="block"><span class="deprecationComment">since 1.8.0, @see #KerberosToken(String, File)</span></div>
-</td>
-</tr>
-<tr class="rowColor">
 <td class="colOne"><a href="org/apache/accumulo/core/client/MutationsRejectedException.html#MutationsRejectedException-org.apache.accumulo.core.client.Instance-java.util.List-java.util.Map-java.util.Collection-int-java.lang.Throwable-">org.apache.accumulo.core.client.MutationsRejectedException(Instance, List&lt;ConstraintViolationSummary&gt;, Map&lt;TabletId, Set&lt;SecurityErrorCode&gt;&gt;, Collection&lt;String&gt;, int, Throwable)</a>
 <div class="block"><span class="deprecationComment">since 2.0.0, replaced by
-             <a href="org/apache/accumulo/core/client/MutationsRejectedException.html#MutationsRejectedException-org.apache.accumulo.core.client.ClientInfo-java.util.List-java.util.Map-java.util.Collection-int-java.lang.Throwable-"><code>MutationsRejectedException.MutationsRejectedException(ClientInfo, List, Map, Collection, int, Throwable)</code></a></span></div>
+             <a href="org/apache/accumulo/core/client/MutationsRejectedException.html#MutationsRejectedException-org.apache.accumulo.core.client.AccumuloClient-java.util.List-java.util.Map-java.util.Collection-int-java.lang.Throwable-"><code>MutationsRejectedException.MutationsRejectedException(AccumuloClient, List, Map, Collection, int, Throwable)</code></a></span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/accumulo/core/client/TableOfflineException.html#TableOfflineException-org.apache.accumulo.core.client.Instance-java.lang.String-">org.apache.accumulo.core.client.TableOfflineException(Instance, String)</a>
 <div class="block"><span class="deprecationComment">since 2.0.0, replaced by <a href="org/apache/accumulo/core/client/TableOfflineException.html#TableOfflineException-java.lang.String-"><code>TableOfflineException.TableOfflineException(String)</code></a></span></div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/data/Value.html#Value-java.nio.ByteBuffer-boolean-">org.apache.accumulo.core.data.Value(ByteBuffer, boolean)</a>
-<div class="block"><span class="deprecationComment">A copy of the bytes in the buffer is always made. Use <a href="org/apache/accumulo/core/data/Value.html#Value-java.nio.ByteBuffer-"><code>Value.Value(ByteBuffer)</code></a>
-             instead.</span></div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/ZooKeeperInstance.html#ZooKeeperInstance-org.apache.accumulo.core.client.ClientConfiguration-">org.apache.accumulo.core.client.ZooKeeperInstance(ClientConfiguration)</a>
-<div class="block"><span class="deprecationComment">since 2.0.0; use <a href="org/apache/accumulo/core/client/Accumulo.html#newClient--"><code>Accumulo.newClient()</code></a> instead</span></div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="org/apache/accumulo/core/client/ZooKeeperInstance.html#ZooKeeperInstance-java.lang.String-java.lang.String-">org.apache.accumulo.core.client.ZooKeeperInstance(String, String)</a>
-<div class="block"><span class="deprecationComment">since 2.0.0; use <a href="org/apache/accumulo/core/client/Accumulo.html#newClient--"><code>Accumulo.newClient()</code></a> instead</span></div>
-</td>
-</tr>
 </tbody>
 </table>
 </li>
@@ -472,6 +489,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2019 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/docs/2.x/apidocs/help-doc.html b/docs/2.x/apidocs/help-doc.html
index 3da184a..349fe4d 100644
--- a/docs/2.x/apidocs/help-doc.html
+++ b/docs/2.x/apidocs/help-doc.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:36 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:13 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>API Help (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>API Help (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="API Help (Apache Accumulo Project 2.0.0-alpha-1 API)";
+            parent.document.title="API Help (Apache Accumulo Project 2.0.0-alpha-2 API)";
         }
     }
     catch(err) {
@@ -226,6 +226,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2019 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/docs/2.x/apidocs/index-all.html b/docs/2.x/apidocs/index-all.html
index b9e2b0c..64c7e6a 100644
--- a/docs/2.x/apidocs/index-all.html
+++ b/docs/2.x/apidocs/index-all.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:35 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:13 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Index (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>Index (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Index (Apache Accumulo Project 2.0.0-alpha-1 API)";
+            parent.document.title="Index (Apache Accumulo Project 2.0.0-alpha-2 API)";
         }
     }
     catch(err) {
@@ -91,34 +91,46 @@
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred"><span class="typeNameLink">AbstractInputFormat</span></a>&lt;<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="type parameter in AbstractInputFormat">K</a>,<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="type parameter in AbstractInputFormat">V</a>&gt; - Class in <a href="org/apache/accumulo/c [...]
 <dd>
-<div class="block">An abstract input format to provide shared methods common to all other input format classes.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapred instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
+</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#AbstractInputFormat--">AbstractInputFormat()</a></span> - Constructor for class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce"><span class="typeNameLink">AbstractInputFormat</span></a>&lt;<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="type parameter in AbstractInputFormat">K</a>,<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="type parameter in AbstractInputFormat">V</a>&gt; - Class in <a href="org/apach [...]
 <dd>
-<div class="block">An abstract input format to provide shared methods common to all other input format classes.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapreduce instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
+</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#AbstractInputFormat--">AbstractInputFormat()</a></span> - Constructor for class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapred"><span class="typeNameLink">AbstractInputFormat.AbstractRecordReader</span></a>&lt;<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html" title="type parameter in AbstractInputFormat.AbstractRecordReader">K</a>,<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReade [...]
 <dd>
-<div class="block">An abstract base class to be used to create <code>RecordReader</code>
- instances that convert from Accumulo
- <a href="org/apache/accumulo/core/data/Key.html" title="class in org.apache.accumulo.core.data"><code>Key</code></a>/<a href="org/apache/accumulo/core/data/Value.html" title="class in org.apache.accumulo.core.data"><code>Value</code></a> pairs to
- the user's K/V types.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">An abstract base class to be used to create <code>RecordReader</code> instances that convert from
+ Accumulo <a href="org/apache/accumulo/core/data/Key.html" title="class in org.apache.accumulo.core.data"><code>Key</code></a>/<a href="org/apache/accumulo/core/data/Value.html" title="class in org.apache.accumulo.core.data"><code>Value</code></a> pairs to the user's K/V types.</div>
 </dd>
 <dt><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapreduce"><span class="typeNameLink">AbstractInputFormat.AbstractRecordReader</span></a>&lt;<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html" title="type parameter in AbstractInputFormat.AbstractRecordReader">K</a>,<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.Abstrac [...]
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">An abstract base class to be used to create <code>RecordReader</code>
- instances that convert from Accumulo
- <a href="org/apache/accumulo/core/data/Key.html" title="class in org.apache.accumulo.core.data"><code>Key</code></a>/<a href="org/apache/accumulo/core/data/Value.html" title="class in org.apache.accumulo.core.data"><code>Value</code></a> pairs to
- the user's K/V types.</div>
+ instances that convert from Accumulo <a href="org/apache/accumulo/core/data/Key.html" title="class in org.apache.accumulo.core.data"><code>Key</code></a>/<a href="org/apache/accumulo/core/data/Value.html" title="class in org.apache.accumulo.core.data"><code>Value</code></a> pairs to the user's K/V types.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html#AbstractRecordReader--">AbstractRecordReader()</a></span> - Constructor for class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat.AbstractRecordReader</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html#AbstractRecordReader--">AbstractRecordReader()</a></span> - Constructor for class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat.AbstractRecordReader</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/sample/AbstractHashSampler.html#accept-org.apache.accumulo.core.data.Key-">accept(Key)</a></span> - Method in class org.apache.accumulo.core.client.sample.<a href="org/apache/accumulo/core/client/sample/AbstractHashSampler.html" title="class in org.apache.accumulo.core.client.sample">AbstractHashSampler</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/sample/Sampler.html#accept-org.apache.accumulo.core.data.Key-">accept(Key)</a></span> - Method in interface org.apache.accumulo.core.client.sample.<a href="org/apache/accumulo/core/client/sample/Sampler.html" title="interface in org.apache.accumulo.core.client.sample">Sampler</a></dt>
@@ -137,39 +149,33 @@
 <dd>
 <div class="block">Client connection to an Accumulo instance.</div>
 </dd>
-<dt><a href="org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">AccumuloClient.AccumuloClientFactory</span></a> - Interface in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
-<dd>
-<div class="block">Builds AccumuloClient</div>
-</dd>
-<dt><a href="org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">AccumuloClient.AuthenticationArgs</span></a> - Interface in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
+<dt><a href="org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">AccumuloClient.AuthenticationArgs</span></a>&lt;<a href="org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="type parameter in AccumuloClient.AuthenticationArgs">T</a>&gt; - Interface in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
 <dd>
-<div class="block">Build methods for authentication</div>
+<div class="block">Builder methods for authentication</div>
 </dd>
-<dt><a href="org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">AccumuloClient.ClientInfoFactory</span></a> - Interface in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
+<dt><a href="org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">AccumuloClient.ClientFactory</span></a>&lt;<a href="org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="type parameter in AccumuloClient.ClientFactory">T</a>&gt; - Interface in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
 <dd>
-<div class="block">Builds ClientInfo after all options have been specified</div>
+<div class="block">Builds AccumuloClient or client Properties after all options have been specified</div>
 </dd>
-<dt><a href="org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">AccumuloClient.ClientInfoOptions</span></a> - Interface in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">AccumuloClient.ConnectionOptions</span></a> - Interface in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
+<dt><a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">AccumuloClient.ConnectionOptions</span></a>&lt;<a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="type parameter in AccumuloClient.ConnectionOptions">T</a>&gt; - Interface in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
 <dd>
 <div class="block">Build methods for connection options</div>
 </dd>
-<dt><a href="org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">AccumuloClient.FromOptions</span></a> - Interface in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
+<dt><a href="org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">AccumuloClient.FromOptions</span></a>&lt;<a href="org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="type parameter in AccumuloClient.FromOptions">T</a>&gt; - Interface in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">AccumuloClient.InstanceArgs</span></a> - Interface in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
+<dt><a href="org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">AccumuloClient.InstanceArgs</span></a>&lt;<a href="org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html" title="type parameter in AccumuloClient.InstanceArgs">T</a>&gt; - Interface in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
 <dd>
 <div class="block">Builder method for setting Accumulo instance and zookeepers</div>
 </dd>
-<dt><a href="org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">AccumuloClient.PropertyOptions</span></a> - Interface in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
+<dt><a href="org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">AccumuloClient.PropertyOptions</span></a>&lt;<a href="org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="type parameter in AccumuloClient.PropertyOptions">T</a>&gt; - Interface in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
 <dd>
 <div class="block">Builder methods for creating AccumuloClient using properties</div>
 </dd>
-<dt><a href="org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">AccumuloClient.SaslOptions</span></a> - Interface in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
+<dt><a href="org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">AccumuloClient.SaslOptions</span></a>&lt;<a href="org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="type parameter in AccumuloClient.SaslOptions">T</a>&gt; - Interface in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
 <dd>
 <div class="block">Build methods for SASL</div>
 </dd>
-<dt><a href="org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">AccumuloClient.SslOptions</span></a> - Interface in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
+<dt><a href="org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">AccumuloClient.SslOptions</span></a>&lt;<a href="org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="type parameter in AccumuloClient.SslOptions">T</a>&gt; - Interface in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
 <dd>
 <div class="block">Build methods for SSL/TLS</div>
 </dd>
@@ -185,96 +191,148 @@
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred"><span class="typeNameLink">AccumuloFileOutputFormat</span></a> - Class in <a href="org/apache/accumulo/core/client/mapred/package-summary.html">org.apache.accumulo.core.client.mapred</a></dt>
 <dd>
-<div class="block">This class allows MapReduce jobs to write output in the Accumulo data file format.<br>
- Care should be taken to write only sorted data (sorted by <a href="org/apache/accumulo/core/data/Key.html" title="class in org.apache.accumulo.core.data"><code>Key</code></a>), as this is an important
- requirement of Accumulo data files.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapred instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
+</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html#AccumuloFileOutputFormat--">AccumuloFileOutputFormat()</a></span> - Constructor for class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloFileOutputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce"><span class="typeNameLink">AccumuloFileOutputFormat</span></a> - Class in <a href="org/apache/accumulo/core/client/mapreduce/package-summary.html">org.apache.accumulo.core.client.mapreduce</a></dt>
 <dd>
-<div class="block">This class allows MapReduce jobs to write output in the Accumulo data file format.<br>
- Care should be taken to write only sorted data (sorted by <a href="org/apache/accumulo/core/data/Key.html" title="class in org.apache.accumulo.core.data"><code>Key</code></a>), as this is an important
- requirement of Accumulo data files.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapreduce instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
+</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html#AccumuloFileOutputFormat--">AccumuloFileOutputFormat()</a></span> - Constructor for class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloFileOutputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html" title="class in org.apache.accumulo.core.client.mapred"><span class="typeNameLink">AccumuloInputFormat</span></a> - Class in <a href="org/apache/accumulo/core/client/mapred/package-summary.html">org.apache.accumulo.core.client.mapred</a></dt>
 <dd>
-<div class="block">This class allows MapReduce jobs to use Accumulo as the source of data.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapred instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
+</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html#AccumuloInputFormat--">AccumuloInputFormat()</a></span> - Constructor for class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloInputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce"><span class="typeNameLink">AccumuloInputFormat</span></a> - Class in <a href="org/apache/accumulo/core/client/mapreduce/package-summary.html">org.apache.accumulo.core.client.mapreduce</a></dt>
 <dd>
-<div class="block">This class allows MapReduce jobs to use Accumulo as the source of data.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapreduce instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
+</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.html#AccumuloInputFormat--">AccumuloInputFormat()</a></span> - Constructor for class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloInputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.html" title="class in org.apache.accumulo.core.client.mapred"><span class="typeNameLink">AccumuloMultiTableInputFormat</span></a> - Class in <a href="org/apache/accumulo/core/client/mapred/package-summary.html">org.apache.accumulo.core.client.mapred</a></dt>
 <dd>
-<div class="block">This class allows MapReduce jobs to use multiple Accumulo tables as the source of data.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapred instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
+</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.html#AccumuloMultiTableInputFormat--">AccumuloMultiTableInputFormat()</a></span> - Constructor for class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloMultiTableInputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce"><span class="typeNameLink">AccumuloMultiTableInputFormat</span></a> - Class in <a href="org/apache/accumulo/core/client/mapreduce/package-summary.html">org.apache.accumulo.core.client.mapreduce</a></dt>
 <dd>
-<div class="block">This class allows MapReduce jobs to use multiple Accumulo tables as the source of data.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapreduce instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
+</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.html#AccumuloMultiTableInputFormat--">AccumuloMultiTableInputFormat()</a></span> - Constructor for class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloMultiTableInputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred"><span class="typeNameLink">AccumuloOutputFormat</span></a> - Class in <a href="org/apache/accumulo/core/client/mapred/package-summary.html">org.apache.accumulo.core.client.mapred</a></dt>
 <dd>
-<div class="block">This class allows MapReduce jobs to use Accumulo as the sink for data.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapred instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
+</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#AccumuloOutputFormat--">AccumuloOutputFormat()</a></span> - Constructor for class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce"><span class="typeNameLink">AccumuloOutputFormat</span></a> - Class in <a href="org/apache/accumulo/core/client/mapreduce/package-summary.html">org.apache.accumulo.core.client.mapreduce</a></dt>
 <dd>
-<div class="block">This class allows MapReduce jobs to use Accumulo as the sink for data.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapreduce instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
+</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#AccumuloOutputFormat--">AccumuloOutputFormat()</a></span> - Constructor for class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.AccumuloRecordWriter.html" title="class in org.apache.accumulo.core.client.mapred"><span class="typeNameLink">AccumuloOutputFormat.AccumuloRecordWriter</span></a> - Class in <a href="org/apache/accumulo/core/client/mapred/package-summary.html">org.apache.accumulo.core.client.mapred</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">A base class to be used to create <code>RecordWriter</code> instances that write to Accumulo.</div>
 </dd>
 <dt><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.AccumuloRecordWriter.html" title="class in org.apache.accumulo.core.client.mapreduce"><span class="typeNameLink">AccumuloOutputFormat.AccumuloRecordWriter</span></a> - Class in <a href="org/apache/accumulo/core/client/mapreduce/package-summary.html">org.apache.accumulo.core.client.mapreduce</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">A base class to be used to create <code>RecordWriter</code> instances that write to Accumulo.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.AccumuloRecordWriter.html#AccumuloRecordWriter-org.apache.hadoop.mapred.JobConf-">AccumuloRecordWriter(JobConf)</a></span> - Constructor for class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.AccumuloRecordWriter.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat.AccumuloRecordWriter</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.AccumuloRecordWriter.html#AccumuloRecordWriter-org.apache.hadoop.mapreduce.TaskAttemptContext-">AccumuloRecordWriter(TaskAttemptContext)</a></span> - Constructor for class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.AccumuloRecordWriter.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputF [...]
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.html" title="class in org.apache.accumulo.core.client.mapred"><span class="typeNameLink">AccumuloRowInputFormat</span></a> - Class in <a href="org/apache/accumulo/core/client/mapred/package-summary.html">org.apache.accumulo.core.client.mapred</a></dt>
 <dd>
-<div class="block">This class allows MapReduce jobs to use Accumulo as the source of data.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapred instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
+</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.html#AccumuloRowInputFormat--">AccumuloRowInputFormat()</a></span> - Constructor for class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloRowInputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce"><span class="typeNameLink">AccumuloRowInputFormat</span></a> - Class in <a href="org/apache/accumulo/core/client/mapreduce/package-summary.html">org.apache.accumulo.core.client.mapreduce</a></dt>
 <dd>
-<div class="block">This class allows MapReduce jobs to use Accumulo as the source of data.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapreduce instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
+</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.html#AccumuloRowInputFormat--">AccumuloRowInputFormat()</a></span> - Constructor for class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloRowInputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/AccumuloSecurityException.html" title="class in org.apache.accumulo.core.client"><span class="typeNameLink">AccumuloSecurityException</span></a> - Exception in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
 <dd>
 <div class="block">An Accumulo Exception for security violations, authentication failures, authorization failures,
  etc.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloSecurityException.html#AccumuloSecurityException-org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException-">AccumuloSecurityException(ThriftSecurityException)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloSecurityException.html" title="class in org.apache.accumulo.core.client">AccumuloSecurityException</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloSecurityException.html#AccumuloSecurityException-org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException-">AccumuloSecurityException(ThriftSecurityException)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloSecurityException.html" title="class in org.apache.accumulo.core.client">AccumuloSecurityException</a></dt>
 <dd>
 <div class="block">Construct a user-facing exception from a serialized version.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloSecurityException.html#AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode-java.lang.Throwable-">AccumuloSecurityException(String, SecurityErrorCode, Throwable)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloSecurityException.html" title="class in org.apache.accumulo.core.client">Acc [...]
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloSecurityException.html#AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode-java.lang.Throwable-">AccumuloSecurityException(String, SecurityErrorCode, Throwable)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloSecurityException.html" title="class in org.apache.accumulo.core.client">Accu [...]
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloSecurityException.html#AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode-java.lang.String-java.lang.Throwable-">AccumuloSecurityException(String, SecurityErrorCode, String, Throwable)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloSecurityException.html" title="class in org.apache. [...]
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloSecurityException.html#AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode-java.lang.String-java.lang.Throwable-">AccumuloSecurityException(String, SecurityErrorCode, String, Throwable)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloSecurityException.html" title="class in org.apache.a [...]
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloSecurityException.html#AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode-">AccumuloSecurityException(String, SecurityErrorCode)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloSecurityException.html" title="class in org.apache.accumulo.core.client">AccumuloSecurityException</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloSecurityException.html#AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode-">AccumuloSecurityException(String, SecurityErrorCode)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloSecurityException.html" title="class in org.apache.accumulo.core.client">AccumuloSecurityException</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloSecurityException.html#AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode-java.lang.String-">AccumuloSecurityException(String, SecurityErrorCode, String)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloSecurityException.html" title="class in org.apache.accumulo.core.client">AccumuloS [...]
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloSecurityException.html#AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode-java.lang.String-">AccumuloSecurityException(String, SecurityErrorCode, String)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloSecurityException.html" title="class in org.apache.accumulo.core.client">AccumuloSe [...]
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/admin/ActiveCompaction.html" title="class in org.apache.accumulo.core.client.admin"><span class="typeNameLink">ActiveCompaction</span></a> - Class in <a href="org/apache/accumulo/core/client/admin/package-summary.html">org.apache.accumulo.core.client.admin</a></dt>
 <dd>&nbsp;</dd>
@@ -308,10 +366,12 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html#addIterator-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.IteratorSetting-">addIterator(JobConf, IteratorSetting)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Encode an iterator on the input for this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html#addIterator-org.apache.hadoop.mapreduce.Job-org.apache.accumulo.core.client.IteratorSetting-">addIterator(Job, IteratorSetting)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapreduce">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Encode an iterator on the single input table for this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/BatchWriter.html#addMutation-org.apache.accumulo.core.data.Mutation-">addMutation(Mutation)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/BatchWriter.html" title="interface in org.apache.accumulo.core.client">BatchWriter</a></dt>
@@ -373,9 +433,13 @@
 <div class="block">Enables summary generation for this table for future compactions.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.AccumuloRecordWriter.html#addTable-org.apache.hadoop.io.Text-">addTable(Text)</a></span> - Method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.AccumuloRecordWriter.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat.AccumuloRecordWriter</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.AccumuloRecordWriter.html#addTable-org.apache.hadoop.io.Text-">addTable(Text)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.AccumuloRecordWriter.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat.AccumuloRecordWriter</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/Range.html#afterEndKey-org.apache.accumulo.core.data.Key-">afterEndKey(Key)</a></span> - Method in class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/Range.html" title="class in org.apache.accumulo.core.data">Range</a></dt>
 <dd>
 <div class="block">Determines if the given key is after the ending key of this range.</div>
@@ -425,6 +489,18 @@
 <dd>
 <div class="block">Copy constructor.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html#as-java.lang.CharSequence-java.lang.CharSequence-">as(CharSequence, CharSequence)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AuthenticationArgs</a></dt>
+<dd>
+<div class="block">Build using password-based credentials</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html#as-java.lang.CharSequence-java.nio.file.Path-">as(CharSequence, Path)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AuthenticationArgs</a></dt>
+<dd>
+<div class="block">Build using Kerberos credentials</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html#as-java.lang.CharSequence-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-">as(CharSequence, AuthenticationToken)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AuthenticationArgs</a></dt>
+<dd>
+<div class="block">Build using specified credentials</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloSecurityException.html#asThriftException--">asThriftException()</a></span> - Method in exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloSecurityException.html" title="class in org.apache.accumulo.core.client">AccumuloSecurityException</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/Mutation.html#at--">at()</a></span> - Method in class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/Mutation.html" title="class in org.apache.accumulo.core.data">Mutation</a></dt>
@@ -456,12 +532,6 @@
 <dd>
 <div class="block">Add an iterator to a table on the given scopes.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/SecurityOperations.html#authenticateUser-java.lang.String-byte:A-">authenticateUser(String, byte[])</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/SecurityOperations.html" title="interface in org.apache.accumulo.core.client.admin">SecurityOperations</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 1.5.0; use <a href="org/apache/accumulo/core/client/admin/SecurityOperations.html#authenticateUser-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-"><code>SecurityOperations.authenticateUser(String, AuthenticationToken)</code></a> instead.</span></div>
-</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/SecurityOperations.html#authenticateUser-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-">authenticateUser(String, AuthenticationToken)</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/SecurityOperations.html" title="interface in org.apache.accumulo.core.client.admin">SecurityOperations</a></dt>
 <dd>
 <div class="block">Verify a username/password combination is valid</div>
@@ -510,6 +580,12 @@
 <dd>
 <div class="block">Constructs an authorizations object from a set of human-readable authorizations.</div>
 </dd>
+<dt><a href="org/apache/accumulo/core/client/summary/summarizers/AuthorizationSummarizer.html" title="class in org.apache.accumulo.core.client.summary.summarizers"><span class="typeNameLink">AuthorizationSummarizer</span></a> - Class in <a href="org/apache/accumulo/core/client/summary/summarizers/package-summary.html">org.apache.accumulo.core.client.summary.summarizers</a></dt>
+<dd>
+<div class="block">Counts unique authorizations in column visibility labels.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/summary/summarizers/AuthorizationSummarizer.html#AuthorizationSummarizer--">AuthorizationSummarizer()</a></span> - Constructor for class org.apache.accumulo.core.client.summary.summarizers.<a href="org/apache/accumulo/core/client/summary/summarizers/AuthorizationSummarizer.html" title="class in org.apache.accumulo.core.client.summary.summarizers">AuthorizationSummarizer</a></dt>
+<dd>&nbsp;</dd>
 </dl>
 <a name="I:B">
 <!--   -->
@@ -527,10 +603,19 @@
  
  Looking up multiple ranges in parallel.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#batchScannerQueryThreads-int-">batchScannerQueryThreads(int)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a></dt>
+<dd>
+<div class="block">Build with default number of query threads for BatchScanner</div>
+</dd>
 <dt><a href="org/apache/accumulo/core/client/BatchWriter.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">BatchWriter</span></a> - Interface in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
 <dd>
 <div class="block">Send Mutations to a single Table in Accumulo.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#batchWriterConfig-org.apache.accumulo.core.client.BatchWriterConfig-">batchWriterConfig(BatchWriterConfig)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a></dt>
+<dd>
+<div class="block">Build with BatchWriterConfig defaults for BatchWriter, MultiTableBatchWriter &amp;
+ BatchDeleter</div>
+</dd>
 <dt><a href="org/apache/accumulo/core/client/BatchWriterConfig.html" title="class in org.apache.accumulo.core.client"><span class="typeNameLink">BatchWriterConfig</span></a> - Class in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
 <dd>
 <div class="block">This object holds configuration settings used to instantiate a <a href="org/apache/accumulo/core/client/BatchWriter.html" title="interface in org.apache.accumulo.core.client"><code>BatchWriter</code></a></div>
@@ -551,9 +636,9 @@
 <dd>
 <div class="block">Creates a new range that is bounded by the columns passed in.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html#build--">build()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AccumuloClientFactory</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html#build--">build()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientFactory</a></dt>
 <dd>
-<div class="block">Builds AccumuloClient after all options have been specified</div>
+<div class="block">Builds AccumuloClient or client Properties</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/rfile/RFile.ScannerOptions.html#build--">build()</a></span> - Method in interface org.apache.accumulo.core.client.rfile.<a href="org/apache/accumulo/core/client/rfile/RFile.ScannerOptions.html" title="interface in org.apache.accumulo.core.client.rfile">RFile.ScannerOptions</a></dt>
 <dd>&nbsp;</dd>
@@ -620,31 +705,22 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#canCreateTables-org.apache.hadoop.mapred.JobConf-">canCreateTables(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Determines whether tables are permitted to be created as needed.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#canCreateTables-org.apache.hadoop.mapreduce.JobContext-">canCreateTables(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Determines whether tables are permitted to be created as needed.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/SecurityOperations.html#changeLocalUserPassword-java.lang.String-org.apache.accumulo.core.client.security.tokens.PasswordToken-">changeLocalUserPassword(String, PasswordToken)</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/SecurityOperations.html" title="interface in org.apache.accumulo.core.client.admin">SecurityOperations</a></dt>
 <dd>
 <div class="block">Set the user's password</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.html#changeUser-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-">changeUser(String, AuthenticationToken)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client">AccumuloClient</a></dt>
-<dd>
-<div class="block">Change user</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/SecurityOperations.html#changeUserAuthorizations-java.lang.String-org.apache.accumulo.core.security.Authorizations-">changeUserAuthorizations(String, Authorizations)</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/SecurityOperations.html" title="interface in org.apache.accumulo.core.client.admin">SecurityOperations</a></dt>
 <dd>
 <div class="block">Set the user's record-level authorizations</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/SecurityOperations.html#changeUserPassword-java.lang.String-byte:A-">changeUserPassword(String, byte[])</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/SecurityOperations.html" title="interface in org.apache.accumulo.core.client.admin">SecurityOperations</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 1.5.0; use <a href="org/apache/accumulo/core/client/admin/SecurityOperations.html#changeLocalUserPassword-java.lang.String-org.apache.accumulo.core.client.security.tokens.PasswordToken-"><code>SecurityOperations.changeLocalUserPassword(String, PasswordToken)</code></a> or the
-             user management functions of your configured authenticator instead.</span></div>
-</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/NamespaceOperations.html#checkIteratorConflicts-java.lang.String-org.apache.accumulo.core.client.IteratorSetting-java.util.EnumSet-">checkIteratorConflicts(String, IteratorSetting, EnumSet&lt;IteratorUtil.IteratorScope&gt;)</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/NamespaceOperations.html" title="interface in org.apache.accumulo.core [...]
 <dd>
 <div class="block">Check whether a given iterator configuration conflicts with existing configuration; in
@@ -656,13 +732,21 @@
  particular, determine if the name or priority are already in use for the specified scopes.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#checkOutputSpecs-org.apache.hadoop.fs.FileSystem-org.apache.hadoop.mapred.JobConf-">checkOutputSpecs(FileSystem, JobConf)</a></span> - Method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#checkOutputSpecs-org.apache.hadoop.mapreduce.JobContext-">checkOutputSpecs(JobContext)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#CLASS">CLASS</a></span> - Static variable in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#CLASS">CLASS</a></span> - Static variable in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/security/tokens/KerberosToken.html#CLASS_NAME">CLASS_NAME</a></span> - Static variable in class org.apache.accumulo.core.client.security.tokens.<a href="org/apache/accumulo/core/client/security/tokens/KerberosToken.html" title="class in org.apache.accumulo.core.client.security.tokens">KerberosToken</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/IsolatedScanner.MemoryRowBuffer.html#clear--">clear()</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/IsolatedScanner.MemoryRowBuffer.html" title="class in org.apache.accumulo.core.client">IsolatedScanner.MemoryRowBuffer</a></dt>
@@ -717,10 +801,6 @@
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 &nbsp;</dd>
-<dt><a href="org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">ClientInfo</span></a> - Interface in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
-<dd>
-<div class="block">Accumulo client information.</div>
-</dd>
 <dt><a href="org/apache/accumulo/core/client/ClientSideIteratorScanner.html" title="class in org.apache.accumulo.core.client"><span class="typeNameLink">ClientSideIteratorScanner</span></a> - Class in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
 <dd>
 <div class="block">A scanner that instantiates iterators on the client side instead of on the tablet server.</div>
@@ -753,6 +833,10 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/Key.html#clone--">clone()</a></span> - Method in class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/Key.html" title="class in org.apache.accumulo.core.data">Key</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.html#close--">close()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client">AccumuloClient</a></dt>
+<dd>
+<div class="block">Cleans up any resources created by an AccumuloClient like threads and sockets.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/BatchDeleter.html#close--">close()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/BatchDeleter.html" title="interface in org.apache.accumulo.core.client">BatchDeleter</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/BatchScanner.html#close--">close()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/BatchScanner.html" title="interface in org.apache.accumulo.core.client">BatchScanner</a></dt>
@@ -761,18 +845,30 @@
 <dd>
 <div class="block">Flush and release any resources.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ClientSideIteratorScanner.html#close--">close()</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ClientSideIteratorScanner.html" title="class in org.apache.accumulo.core.client">ClientSideIteratorScanner</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ConditionalWriter.html#close--">close()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ConditionalWriter.html" title="interface in org.apache.accumulo.core.client">ConditionalWriter</a></dt>
 <dd>
 <div class="block">release any resources (like threads pools) used by conditional writer</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html#close--">close()</a></span> - Method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat.AbstractRecordReader</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/IsolatedScanner.html#close--">close()</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/IsolatedScanner.html" title="class in org.apache.accumulo.core.client">IsolatedScanner</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html#close--">close()</a></span> - Method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat.AbstractRecordReader</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.AccumuloRecordWriter.html#close-org.apache.hadoop.mapred.Reporter-">close(Reporter)</a></span> - Method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.AccumuloRecordWriter.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat.AccumuloRecordWriter</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html#close--">close()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat.AbstractRecordReader</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.AccumuloRecordWriter.html#close-org.apache.hadoop.mapreduce.TaskAttemptContext-">close(TaskAttemptContext)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.AccumuloRecordWriter.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat.AccumuloRecordWriter</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/MultiTableBatchWriter.html#close--">close()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/MultiTableBatchWriter.html" title="interface in org.apache.accumulo.core.client">MultiTableBatchWriter</a></dt>
 <dd>
 <div class="block">Flush and release all resources.</div>
@@ -817,7 +913,7 @@
 <dd>
 <div class="block">Creates a new column.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/Column.html#Column-org.apache.accumulo.core.data.thrift.TColumn-">Column(TColumn)</a></span> - Constructor for class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/Column.html" title="class in org.apache.accumulo.core.data">Column</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/Column.html#Column-org.apache.accumulo.core.dataImpl.thrift.TColumn-">Column(TColumn)</a></span> - Constructor for class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/Column.html" title="class in org.apache.accumulo.core.data">Column</a></dt>
 <dd>
 <div class="block">Creates a new column.</div>
 </dd>
@@ -1011,7 +1107,7 @@
 <dt><a href="org/apache/accumulo/core/client/Connector.html" title="class in org.apache.accumulo.core.client"><span class="typeNameLink">Connector</span></a> - Class in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0. Use <a href="org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client"><code>AccumuloClient</code></a> for wiriting new code. Connector is available
+<div class="block"><span class="deprecationComment">since 2.0.0. Use <a href="org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client"><code>AccumuloClient</code></a> for writing new code. Connector is available
              for existing code. Use <a href="org/apache/accumulo/core/client/Connector.html#from-org.apache.accumulo.core.client.AccumuloClient-"><code>Connector.from(AccumuloClient)</code></a> as a bridge between the two.</span></div>
 </div>
 </dd>
@@ -1029,7 +1125,7 @@
 <dd>
 <div class="block">Creates a new summary.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/ConstraintViolationSummary.html#ConstraintViolationSummary-org.apache.accumulo.core.data.thrift.TConstraintViolationSummary-">ConstraintViolationSummary(TConstraintViolationSummary)</a></span> - Constructor for class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/ConstraintViolationSummary.html" title="class in org.apache.accumulo.core.data">ConstraintViolationSummary</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/ConstraintViolationSummary.html#ConstraintViolationSummary-org.apache.accumulo.core.dataImpl.thrift.TConstraintViolationSummary-">ConstraintViolationSummary(TConstraintViolationSummary)</a></span> - Constructor for class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/ConstraintViolationSummary.html" title="class in org.apache.accumulo.core.data">ConstraintViolationSummary</a></dt>
 <dd>
 <div class="block">Creates a new summary from Thrift.</div>
 </dd>
@@ -1067,16 +1163,21 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html#contextIterators-org.apache.hadoop.mapreduce.TaskAttemptContext-java.lang.String-">contextIterators(TaskAttemptContext, String)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapreduce">Abstra [...]
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Extracts Iterators settings from the context to be used by RecordReader.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.RecordReaderBase.html#contextIterators-org.apache.hadoop.mapreduce.TaskAttemptContext-java.lang.String-">contextIterators(TaskAttemptContext, String)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.RecordReaderBase.html" title="class in org.apache.accumulo.core.client.mapreduce">InputFormatBase.Record [...]
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/summary/CountingSummarizer.Converter.html#convert-org.apache.accumulo.core.data.Key-org.apache.accumulo.core.data.Value-java.util.function.Consumer-">convert(Key, Value, Consumer&lt;K&gt;)</a></span> - Method in interface org.apache.accumulo.core.client.summary.<a href="org/apache/accumulo/core/client/summary/CountingSummarizer.Converter.html" title="interface in org.apache.accumulo.core.client.summary">CountingSum [...]
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloRunner.PropertiesConverter.html#convert-java.lang.String-">convert(String)</a></span> - Method in class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloRunner.PropertiesConverter.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloRunner.PropertiesConverter</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/summary/CountingSummarizer.html#converter--">converter()</a></span> - Method in class org.apache.accumulo.core.client.summary.<a href="org/apache/accumulo/core/client/summary/CountingSummarizer.html" title="class in org.apache.accumulo.core.client.summary">CountingSummarizer</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/summary/summarizers/AuthorizationSummarizer.html#converter--">converter()</a></span> - Method in class org.apache.accumulo.core.client.summary.summarizers.<a href="org/apache/accumulo/core/client/summary/summarizers/AuthorizationSummarizer.html" title="class in org.apache.accumulo.core.client.summary.summarizers">AuthorizationSummarizer</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/summary/summarizers/FamilySummarizer.html#converter--">converter()</a></span> - Method in class org.apache.accumulo.core.client.summary.summarizers.<a href="org/apache/accumulo/core/client/summary/summarizers/FamilySummarizer.html" title="class in org.apache.accumulo.core.client.summary.summarizers">FamilySummarizer</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/summary/summarizers/VisibilitySummarizer.html#converter--">converter()</a></span> - Method in class org.apache.accumulo.core.client.summary.summarizers.<a href="org/apache/accumulo/core/client/summary/summarizers/VisibilitySummarizer.html" title="class in org.apache.accumulo.core.client.summary.summarizers">VisibilitySummarizer</a></dt>
@@ -1128,18 +1229,6 @@
 <dd>
 <div class="block">Create a table with no special configuration</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/TableOperations.html#create-java.lang.String-boolean-">create(String, boolean)</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/TableOperations.html" title="interface in org.apache.accumulo.core.client.admin">TableOperations</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 1.7.0; use <a href="org/apache/accumulo/core/client/admin/TableOperations.html#create-java.lang.String-org.apache.accumulo.core.client.admin.NewTableConfiguration-"><code>TableOperations.create(String, NewTableConfiguration)</code></a> instead.</span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/TableOperations.html#create-java.lang.String-boolean-org.apache.accumulo.core.client.admin.TimeType-">create(String, boolean, TimeType)</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/TableOperations.html" title="interface in org.apache.accumulo.core.client.admin">TableOperations</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 1.7.0; use <a href="org/apache/accumulo/core/client/admin/TableOperations.html#create-java.lang.String-org.apache.accumulo.core.client.admin.NewTableConfiguration-"><code>TableOperations.create(String, NewTableConfiguration)</code></a> instead.</span></div>
-</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/TableOperations.html#create-java.lang.String-org.apache.accumulo.core.client.admin.NewTableConfiguration-">create(String, NewTableConfiguration)</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/TableOperations.html" title="interface in org.apache.accumulo.core.client.admin">TableOperations</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ClientConfiguration.html#create--">create()</a></span> - Static method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ClientConfiguration.html" title="class in org.apache.accumulo.core.client">ClientConfiguration</a></dt>
@@ -1148,6 +1237,10 @@
 <div class="block">Initializes an empty configuration object to be further configured with other methods on the
  class.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#createAccumuloClient-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-">createAccumuloClient(String, AuthenticationToken)</a></span> - Method in class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloCluster</a></dt>
+<dd>
+<div class="block">Utility method to create an <a href="org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client"><code>AccumuloClient</code></a> with connection to the MAC.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.html#createBatchDeleter-java.lang.String-org.apache.accumulo.core.security.Authorizations-int-org.apache.accumulo.core.client.BatchWriterConfig-">createBatchDeleter(String, Authorizations, int, BatchWriterConfig)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client">AccumuloCl [...]
 <dd>
 <div class="block">Factory method to create BatchDeleter</div>
@@ -1177,6 +1270,11 @@
 <dd>
 <div class="block">Factory method to create a BatchScanner connected to Accumulo.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.html#createBatchScanner-java.lang.String-">createBatchScanner(String)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client">AccumuloClient</a></dt>
+<dd>
+<div class="block">Factory method to create a BatchScanner with all of user's authorizations and the number of
+ query threads configured when AccumuloClient was created.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/Connector.html#createBatchScanner-java.lang.String-org.apache.accumulo.core.security.Authorizations-int-">createBatchScanner(String, Authorizations, int)</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/Connector.html" title="class in org.apache.accumulo.core.client">Connector</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
@@ -1238,27 +1336,30 @@
 <div class="block">Create the new table in an offline state.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.html#createRecordReader-org.apache.hadoop.mapreduce.InputSplit-org.apache.hadoop.mapreduce.TaskAttemptContext-">createRecordReader(InputSplit, TaskAttemptContext)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloInputForma [...]
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.html#createRecordReader-org.apache.hadoop.mapreduce.InputSplit-org.apache.hadoop.mapreduce.TaskAttemptContext-">createRecordReader(InputSplit, TaskAttemptContext)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce [...]
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.html#createRecordReader-org.apache.hadoop.mapreduce.InputSplit-org.apache.hadoop.mapreduce.TaskAttemptContext-">createRecordReader(InputSplit, TaskAttemptContext)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloRowI [...]
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.html#createScanner-java.lang.String-org.apache.accumulo.core.security.Authorizations-">createScanner(String, Authorizations)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client">AccumuloClient</a></dt>
 <dd>
 <div class="block">Factory method to create a Scanner connected to Accumulo.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.html#createScanner-java.lang.String-">createScanner(String)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client">AccumuloClient</a></dt>
+<dd>
+<div class="block">Factory method to create a Scanner with all of the user's authorizations.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/Connector.html#createScanner-java.lang.String-org.apache.accumulo.core.security.Authorizations-">createScanner(String, Authorizations)</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/Connector.html" title="class in org.apache.accumulo.core.client">Connector</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Factory method to create a Scanner connected to Accumulo.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/SecurityOperations.html#createUser-java.lang.String-byte:A-org.apache.accumulo.core.security.Authorizations-">createUser(String, byte[], Authorizations)</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/SecurityOperations.html" title="interface in org.apache.accumulo.core.client.admin">SecurityOperations</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 1.5.0; use <a href="org/apache/accumulo/core/client/admin/SecurityOperations.html#createLocalUser-java.lang.String-org.apache.accumulo.core.client.security.tokens.PasswordToken-"><code>SecurityOperations.createLocalUser(String, PasswordToken)</code></a> or the user
-             management functions of your configured authenticator instead.</span></div>
-</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.html#CREDENTIAL_PROVIDERS_PROPERTY">CREDENTIAL_PROVIDERS_PROPERTY</a></span> - Static variable in class org.apache.accumulo.core.client.security.tokens.<a href="org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.html" title="class in org.apache.accumulo.core.client.security.tokens">CredentialProviderToken</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.html" title="class in org.apache.accumulo.core.client.security.tokens"><span class="typeNameLink">CredentialProviderToken</span></a> - Class in <a href="org/apache/accumulo/core/client/security/tokens/package-summary.html">org.apache.accumulo.core.client.security.tokens</a></dt>
@@ -1271,16 +1372,21 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html#currentK">currentK</a></span> - Variable in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat.AbstractRecordReader</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">The Key that should be returned to the client</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html#currentKey">currentKey</a></span> - Variable in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat.AbstractRecordReader</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html#currentKey">currentKey</a></span> - Variable in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat.AbstractRecordReader</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">The Key that is used to determine progress in the current InputSplit.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html#currentV">currentV</a></span> - Variable in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat.AbstractRecordReader</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">The Value that should be return to the client</div>
 </dd>
 </dl>
@@ -1480,13 +1586,6 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/Mutation.html#droppingOldTimestamp-long-">droppingOldTimestamp(long)</a></span> - Method in class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/Mutation.html" title="class in org.apache.accumulo.core.data">Mutation</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/SecurityOperations.html#dropUser-java.lang.String-">dropUser(String)</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/SecurityOperations.html" title="interface in org.apache.accumulo.core.client.admin">SecurityOperations</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 1.5.0; use <a href="org/apache/accumulo/core/client/admin/SecurityOperations.html#dropLocalUser-java.lang.String-"><code>SecurityOperations.dropLocalUser(String)</code></a> or the user management functions of
-             your configured authenticator instead.</span></div>
-</div>
-</dd>
 <dt><a href="org/apache/accumulo/core/client/Durability.html" title="enum in org.apache.accumulo.core.client"><span class="typeNameLink">Durability</span></a> - Enum in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
 <dd>
 <div class="block">The value for the durability of a BatchWriter or ConditionalWriter.</div>
@@ -1593,7 +1692,9 @@
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/IteratorSetting.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/IteratorSetting.html" title="class in org.apache.accumulo.core.client">IteratorSetting</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/sample/SamplerConfiguration.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class org.apache.accumulo.core.client.sample.<a href="org/apache/accumulo/core/client/sample/SamplerConfiguration.html" title="class in org.apache.accumulo.core.client.sample">SamplerConfiguration</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/security/tokens/AuthenticationToken.TokenProperty.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class org.apache.accumulo.core.client.security.tokens.<a href="org/apache/accumulo/core/client/security/tokens/AuthenticationToken.TokenProperty.html" title="class in org.apache.accumulo.core.client.security.tokens">AuthenticationToken.TokenProperty</a></dt>
@@ -1775,14 +1876,17 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html#fetchColumns-org.apache.hadoop.mapred.JobConf-java.util.Collection-">fetchColumns(JobConf, Collection&lt;Pair&lt;Text, Text&gt;&gt;)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Restricts the columns that will be mapped over for this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html#fetchColumns-org.apache.hadoop.mapreduce.Job-java.util.Collection-">fetchColumns(Job, Collection&lt;Pair&lt;Text, Text&gt;&gt;)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapreduce">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Restricts the columns that will be mapped over for this job for the default input table.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#fetchColumns-java.util.Collection-">fetchColumns(Collection&lt;Pair&lt;Text, Text&gt;&gt;)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Restricts the columns that will be mapped over for this job for the default input table.</div>
 </dd>
 <dt><a href="org/apache/accumulo/core/client/admin/FindMax.html" title="class in org.apache.accumulo.core.client.admin"><span class="typeNameLink">FindMax</span></a> - Class in <a href="org/apache/accumulo/core/client/admin/package-summary.html">org.apache.accumulo.core.client.admin</a></dt>
@@ -1830,12 +1934,18 @@
 <dd>
 <div class="block">Returns a Text that sorts just after all Texts beginning with a prefix.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html#forInstance-java.lang.String-java.lang.String-">forInstance(String, String)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.InstanceArgs</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ClientInfo.html#from-java.util.Properties-">from(Properties)</a></span> - Static method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client">ClientInfo</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ClientInfo.html#from-java.util.Properties-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-">from(Properties, AuthenticationToken)</a></span> - Static method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client">ClientInfo</a></dt>
-<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html#from-java.lang.String-">from(String)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.PropertyOptions</a></dt>
+<dd>
+<div class="block">Build using properties file.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html#from-java.nio.file.Path-">from(Path)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.PropertyOptions</a></dt>
+<dd>
+<div class="block">Build using properties file.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html#from-java.util.Properties-">from(Properties)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.PropertyOptions</a></dt>
+<dd>
+<div class="block">Build using Java properties object.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/Connector.html#from-org.apache.accumulo.core.client.AccumuloClient-">from(AccumuloClient)</a></span> - Static method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/Connector.html" title="class in org.apache.accumulo.core.client">Connector</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
@@ -1893,10 +2003,6 @@
 <dd>
 <div class="block">Gets the byte data of this value.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getAccumuloClient-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-">getAccumuloClient(String, AuthenticationToken)</a></span> - Method in class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloCluster</a></dt>
-<dd>
-<div class="block">Utility method to get a client connection to the MAC.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/InstanceOperations.html#getActiveCompactions-java.lang.String-">getActiveCompactions(String)</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/InstanceOperations.html" title="interface in org.apache.accumulo.core.client.admin">InstanceOperations</a></dt>
 <dd>
 <div class="block">List the active compaction running on a tablet server</div>
@@ -1914,25 +2020,27 @@
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets all properties under the given prefix in this configuration.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ClientInfo.html#getAuthenticationToken--">getAuthenticationToken()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client">ClientInfo</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#getAuthenticationToken-org.apache.hadoop.mapred.JobConf-">getAuthenticationToken(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the authenticated token from either the specified token file or directly from the
  configuration, whichever was used when the job was configured.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#getAuthenticationToken-org.apache.hadoop.mapred.JobConf-">getAuthenticationToken(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the authenticated token from either the specified token file or directly from the
  configuration, whichever was used when the job was configured.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getAuthenticationToken-org.apache.hadoop.mapreduce.JobContext-">getAuthenticationToken(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the authenticated token from either the specified token file or directly from the
  configuration, whichever was used when the job was configured.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#getAuthenticationToken-org.apache.hadoop.mapreduce.JobContext-">getAuthenticationToken(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the authenticated token from either the specified token file or directly from the
  configuration, whichever was used when the job was configured.</div>
 </dd>
@@ -1958,12 +2066,18 @@
 <dd>
 <div class="block">Gets the authorizations in sorted order.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#getAuths--">getAuths()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html#getAutoAdjustRanges-org.apache.hadoop.mapred.JobConf-">getAutoAdjustRanges(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Determines whether a configuration has auto-adjust ranges enabled.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html#getAutoAdjustRanges-org.apache.hadoop.mapreduce.JobContext-">getAutoAdjustRanges(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapreduce">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Determines whether a configuration has auto-adjust ranges enabled.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/ArrayByteSequence.html#getBackingArray--">getBackingArray()</a></span> - Method in class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/ArrayByteSequence.html" title="class in org.apache.accumulo.core.data">ArrayByteSequence</a></dt>
@@ -1991,18 +2105,14 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#getBatchWriterOptions-org.apache.hadoop.mapred.JobConf-">getBatchWriterOptions(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the <a href="org/apache/accumulo/core/client/BatchWriterConfig.html" title="class in org.apache.accumulo.core.client"><code>BatchWriterConfig</code></a> settings.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#getBatchWriterOptions-org.apache.hadoop.mapreduce.JobContext-">getBatchWriterOptions(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the <a href="org/apache/accumulo/core/client/BatchWriterConfig.html" title="class in org.apache.accumulo.core.client"><code>BatchWriterConfig</code></a> settings.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/PartialKey.html#getByDepth-int-">getByDepth(int)</a></span> - Static method in enum org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/PartialKey.html" title="enum in org.apache.accumulo.core.data">PartialKey</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 1.7.0</span></div>
-</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/security/ColumnVisibility.Node.html#getChildren--">getChildren()</a></span> - Method in class org.apache.accumulo.core.security.<a href="org/apache/accumulo/core/security/ColumnVisibility.Node.html" title="class in org.apache.accumulo.core.security">ColumnVisibility.Node</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ConditionalWriterConfig.html#getClassLoaderContext--">getClassLoaderContext()</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ConditionalWriterConfig.html" title="class in org.apache.accumulo.core.client">ConditionalWriterConfig</a></dt>
@@ -2011,10 +2121,12 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#getClassLoaderContext-org.apache.hadoop.mapred.JobConf-">getClassLoaderContext(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Returns the name of the current classloader context set on this scanner</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getClassLoaderContext-org.apache.hadoop.mapreduce.JobContext-">getClassLoaderContext(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Returns the name of the current classloader context set on this scanner</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ScannerBase.html#getClassLoaderContext--">getClassLoaderContext()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ScannerBase.html" title="interface in org.apache.accumulo.core.client">ScannerBase</a></dt>
@@ -2030,42 +2142,25 @@
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getClientConfig--">getClientConfig()</a></span> - Method in class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloCluster</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0, replaced by <a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getClientInfo--"><code>MiniAccumuloCluster.getClientInfo()</code></a></span></div>
+<div class="block"><span class="deprecationComment">since 2.0.0, replaced by <a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getClientProperties--"><code>MiniAccumuloCluster.getClientProperties()</code></a></span></div>
 </div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#getClientConfiguration-org.apache.hadoop.mapred.JobConf-">getClientConfiguration(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0, replaced by <a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#getClientInfo-org.apache.hadoop.mapred.JobConf-"><code>AbstractInputFormat.getClientInfo(JobConf)</code></a></span></div>
-</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Fetch the client configuration from the job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getClientConfiguration-org.apache.hadoop.mapreduce.JobContext-">getClientConfiguration(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0; use <a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getClientInfo-org.apache.hadoop.mapreduce.JobContext-"><code>AbstractInputFormat.getClientInfo(JobContext)</code></a> instead</span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#getClientInfo-org.apache.hadoop.mapred.JobConf-">getClientInfo(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
-<dd>
-<div class="block">Retrieves <a href="org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client"><code>ClientInfo</code></a> from the configuration</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#getClientInfo-org.apache.hadoop.mapred.JobConf-">getClientInfo(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
-<dd>
-<div class="block">Get the connection information needed to communication with Accumulo</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getClientInfo-org.apache.hadoop.mapreduce.JobContext-">getClientInfo(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
-<dd>
-<div class="block">Gets the <a href="org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client"><code>ClientInfo</code></a> from the configuration</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#getClientInfo-org.apache.hadoop.mapreduce.JobContext-">getClientInfo(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
-<dd>
-<div class="block">Get connection information from this job</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Construct the <a href="org/apache/accumulo/core/client/ClientConfiguration.html" title="class in org.apache.accumulo.core.client"><code>ClientConfiguration</code></a> given the provided
+ context.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getClientInfo--">getClientInfo()</a></span> - Method in class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloCluster</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getClientProperties--">getClientProperties()</a></span> - Method in class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloCluster</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getClientInfo-java.io.File-">getClientInfo(File)</a></span> - Static method in class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloCluster</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getClientProperties-java.io.File-">getClientProperties(File)</a></span> - Static method in class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloCluster</a></dt>
 <dd>
-<div class="block">Construct a <a href="org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client"><code>ClientInfo</code></a> using a <a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html" title="class in org.apache.accumulo.minicluster"><code>MiniAccumuloCluster</code></a> directory</div>
+<div class="block">Construct client <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util"><code>Properties</code></a> using a <a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html" title="class in org.apache.accumulo.minicluster"><code>MiniAccumuloCluster</code></a> directory</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/IteratorSetting.Column.html#getColumnFamily--">getColumnFamily()</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/IteratorSetting.Column.html" title="class in org.apache.accumulo.core.client">IteratorSetting.Column</a></dt>
 <dd>&nbsp;</dd>
@@ -2142,9 +2237,13 @@
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/ConditionalMutation.html#getConditions--">getConditions()</a></span> - Method in class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/ConditionalMutation.html" title="class in org.apache.accumulo.core.data">ConditionalMutation</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/lib/partition/KeyRangePartitioner.html#getConf--">getConf()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.lib.partition.<a href="org/apache/accumulo/core/client/mapreduce/lib/partition/KeyRangePartitioner.html" title="class in org.apache.accumulo.core.client.mapreduce.lib.partition">KeyRangePartitioner</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.html#getConf--">getConf()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.lib.partition.<a href="org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.html" title="class in org.apache.accumulo.core.client.mapreduce.lib.partition">RangePartitioner</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getConfig--">getConfig()</a></span> - Method in class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloCluster</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/Instance.html#getConnector-java.lang.String-byte:A-">getConnector(String, byte[])</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/Instance.html" title="interface in org.apache.accumulo.core.client">Instance</a></dt>
@@ -2180,7 +2279,7 @@
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getConnector-java.lang.String-java.lang.String-">getConnector(String, String)</a></span> - Method in class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloCluster</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0, replaced by <a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getAccumuloClient-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-"><code>MiniAccumuloCluster.getAccumuloClient(String, AuthenticationToken)</code></a></span></div>
+<div class="block"><span class="deprecationComment">since 2.0.0, replaced by <a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#createAccumuloClient-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-"><code>MiniAccumuloCluster.createAccumuloClient(String, AuthenticationToken)</code></a></span></div>
 </div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/ConstraintViolationSummary.html#getConstrainClass--">getConstrainClass()</a></span> - Method in class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/ConstraintViolationSummary.html" title="class in org.apache.accumulo.core.data">ConstraintViolationSummary</a></dt>
@@ -2192,19 +2291,25 @@
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.html#getCredentialProviders--">getCredentialProviders()</a></span> - Method in class org.apache.accumulo.core.client.security.tokens.<a href="org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.html" title="class in org.apache.accumulo.core.client.security.tokens">CredentialProviderToken</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html#getCurrentKey--">getCurrentKey()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat.AbstractRecordReader</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html#getCurrentValue--">getCurrentValue()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat.AbstractRecordReader</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getDebugPorts--">getDebugPorts()</a></span> - Method in class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloCluster</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloConfig.html#getDefaultMemory--">getDefaultMemory()</a></span> - Method in class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloConfig.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloConfig</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#getDefaultTableName-org.apache.hadoop.mapred.JobConf-">getDefaultTableName(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the default table name from the configuration.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#getDefaultTableName-org.apache.hadoop.mapreduce.JobContext-">getDefaultTableName(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the default table name from the configuration.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ClientConfiguration.ClientProperty.html#getDefaultValue--">getDefaultValue()</a></span> - Method in enum org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ClientConfiguration.ClientProperty.html" title="enum in org.apache.accumulo.core.client">ClientConfiguration.ClientProperty</a></dt>
@@ -2263,10 +2368,6 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/MutationsRejectedException.html#getErrorServers--">getErrorServers()</a></span> - Method in exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/MutationsRejectedException.html" title="class in org.apache.accumulo.core.client">MutationsRejectedException</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#getExecutionHints--">getExecutionHints()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#getExecutionHints--">getExecutionHints()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/security/ColumnVisibility.html#getExpression--">getExpression()</a></span> - Method in class org.apache.accumulo.core.security.<a href="org/apache/accumulo/core/security/ColumnVisibility.html" title="class in org.apache.accumulo.core.security">ColumnVisibility</a></dt>
 <dd>
 <div class="block">Accessor for the underlying byte string.</div>
@@ -2279,18 +2380,23 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html#getFetchedColumns-org.apache.hadoop.mapred.JobConf-">getFetchedColumns(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the columns to be mapped over from this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html#getFetchedColumns-org.apache.hadoop.mapreduce.JobContext-">getFetchedColumns(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapreduce">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the columns to be mapped over from this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#getFetchedColumns--">getFetchedColumns()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Returns the columns to be fetched for this configuration</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#getFetchedColumns--">getFetchedColumns()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/LoadPlan.Destination.html#getFileName--">getFileName()</a></span> - Method in class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/LoadPlan.Destination.html" title="class in org.apache.accumulo.core.data">LoadPlan.Destination</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/summary/Summary.html#getFileStatistics--">getFileStatistics()</a></span> - Method in class org.apache.accumulo.core.client.summary.<a href="org/apache/accumulo/core/client/summary/Summary.html" title="class in org.apache.accumulo.core.client.summary">Summary</a></dt>
@@ -2325,58 +2431,75 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#getInputTableConfig-org.apache.hadoop.mapred.JobConf-java.lang.String-">getInputTableConfig(JobConf, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
 <dd>
-<div class="block">Fetches a <a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce"><code>InputTableConfig</code></a> that has been set on the configuration for a specific table.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Fetches a <a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce"><code>InputTableConfig</code></a> that has been set
+ on the configuration for a specific table.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getInputTableConfig-org.apache.hadoop.mapreduce.JobContext-java.lang.String-">getInputTableConfig(JobContext, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Fetches a <a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce"><code>InputTableConfig</code></a> that has been set on the configuration for a specific table.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#getInputTableConfigs-org.apache.hadoop.mapred.JobConf-">getInputTableConfigs(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
 <dd>
-<div class="block">Fetches all <a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce"><code>InputTableConfig</code></a>s that have been set on the given Hadoop job.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Fetches all <a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce"><code>InputTableConfig</code></a>s that have been
+ set on the given Hadoop job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getInputTableConfigs-org.apache.hadoop.mapreduce.JobContext-">getInputTableConfigs(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Fetches all <a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce"><code>InputTableConfig</code></a>s that have been set on the given job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html#getInputTableName-org.apache.hadoop.mapred.JobConf-">getInputTableName(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the table name from the configuration.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html#getInputTableName-org.apache.hadoop.mapreduce.JobContext-">getInputTableName(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapreduce">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the table name from the configuration.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/Connector.html#getInstance--">getInstance()</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/Connector.html" title="class in org.apache.accumulo.core.client">Connector</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0, use <a href="org/apache/accumulo/core/client/AccumuloClient.html#info--"><code>AccumuloClient.info()</code></a> instead</span></div>
-</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Accessor method for internal instance object.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#getInstance-org.apache.hadoop.mapred.JobConf-">getInstance(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0, Use <a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#getClientInfo-org.apache.hadoop.mapred.JobConf-"><code>AbstractInputFormat.getClientInfo(JobConf)</code></a> instead</span></div>
-</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Initializes an Accumulo <a href="org/apache/accumulo/core/client/Instance.html" title="interface in org.apache.accumulo.core.client"><code>Instance</code></a> based on the
+ configuration.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#getInstance-org.apache.hadoop.mapred.JobConf-">getInstance(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0; Use <a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#getClientInfo-org.apache.hadoop.mapred.JobConf-"><code>AccumuloOutputFormat.getClientInfo(JobConf)</code></a> instead</span></div>
-</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Initializes an Accumulo <a href="org/apache/accumulo/core/client/Instance.html" title="interface in org.apache.accumulo.core.client"><code>Instance</code></a> based on the
+ configuration.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getInstance-org.apache.hadoop.mapreduce.JobContext-">getInstance(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0, use <a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getClientInfo-org.apache.hadoop.mapreduce.JobContext-"><code>AbstractInputFormat.getClientInfo(JobContext)</code></a> instead</span></div>
-</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Initializes an Accumulo <a href="org/apache/accumulo/core/client/Instance.html" title="interface in org.apache.accumulo.core.client"><code>Instance</code></a> based on the
+ configuration.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#getInstance-org.apache.hadoop.mapreduce.JobContext-">getInstance(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Initializes an Accumulo <a href="org/apache/accumulo/core/client/Instance.html" title="interface in org.apache.accumulo.core.client"><code>Instance</code></a> based on the
+ configuration.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#getInstance--">getInstance()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
+<dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0; Use <a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#getClientInfo-org.apache.hadoop.mapreduce.JobContext-"><code>AccumuloOutputFormat.getClientInfo(JobContext)</code></a> instead.</span></div>
+<div class="block"><span class="deprecationComment">since 1.7.0, use getInstance(ClientConfiguration) instead.</span></div>
 </div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#getInstance-org.apache.accumulo.core.client.ClientConfiguration-">getInstance(ClientConfiguration)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.html#getInstanceID--">getInstanceID()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client">AccumuloClient</a></dt>
 <dd>
 <div class="block">Returns a unique string that identifies this instance of accumulo.</div>
@@ -2390,13 +2513,15 @@
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 &nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ClientInfo.html#getInstanceName--">getInstanceName()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client">ClientInfo</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/Instance.html#getInstanceName--">getInstanceName()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/Instance.html" title="interface in org.apache.accumulo.core.client">Instance</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Returns the instance name given at system initialization time.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#getInstanceName--">getInstanceName()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ZooKeeperInstance.html#getInstanceName--">getInstanceName()</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ZooKeeperInstance.html" title="class in org.apache.accumulo.core.client">ZooKeeperInstance</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
@@ -2415,20 +2540,25 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html#getIterators-org.apache.hadoop.mapred.JobConf-">getIterators(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets a list of the iterator settings (for iterators to apply to a scanner) from this
  configuration.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html#getIterators-org.apache.hadoop.mapreduce.JobContext-">getIterators(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapreduce">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets a list of the iterator settings (for iterators to apply to a scanner) from this
  configuration.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#getIterators--">getIterators()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Returns the iterators to be set on this configuration</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#getIterators--">getIterators()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/Condition.html#getIterators--">getIterators()</a></span> - Method in class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/Condition.html" title="class in org.apache.accumulo.core.data">Condition</a></dt>
 <dd>
 <div class="block">Gets the iterators for this condition.</div>
@@ -2467,6 +2597,7 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#getLength--">getLength()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">This implementation of length is only an estimate, it does not provide exact values.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/rfile/RFileSource.html#getLength--">getLength()</a></span> - Method in class org.apache.accumulo.core.client.rfile.<a href="org/apache/accumulo/core/client/rfile/RFileSource.html" title="class in org.apache.accumulo.core.client.rfile">RFileSource</a></dt>
@@ -2483,25 +2614,33 @@
 <div class="block">Gets the locality groups currently set for a table.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#getLocations--">getLocations()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#getLogLevel-org.apache.hadoop.mapred.JobConf-">getLogLevel(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the log level from this configuration.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#getLogLevel-org.apache.hadoop.mapred.JobConf-">getLogLevel(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the log level from this configuration.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getLogLevel-org.apache.hadoop.mapreduce.JobContext-">getLogLevel(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the log level from this configuration.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#getLogLevel-org.apache.hadoop.mapreduce.JobContext-">getLogLevel(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the log level from this configuration.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#getLogLevel--">getLogLevel()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/security/tokens/AuthenticationToken.TokenProperty.html#getMask--">getMask()</a></span> - Method in class org.apache.accumulo.core.client.security.tokens.<a href="org/apache/accumulo/core/client/security/tokens/AuthenticationToken.TokenProperty.html" title="class in org.apache.accumulo.core.client.security.tokens">AuthenticationToken.TokenProperty</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/Instance.html#getMasterLocations--">getMasterLocations()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/Instance.html" title="interface in org.apache.accumulo.core.client">Instance</a></dt>
@@ -2562,7 +2701,9 @@
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/summary/SummarizerConfiguration.html#getOptions--">getOptions()</a></span> - Method in class org.apache.accumulo.core.client.summary.<a href="org/apache/accumulo/core/client/summary/SummarizerConfiguration.html" title="class in org.apache.accumulo.core.client.summary">SummarizerConfiguration</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#getOutputCommitter-org.apache.hadoop.mapreduce.TaskAttemptContext-">getOutputCommitter(TaskAttemptContext)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/ActiveCompaction.html#getOutputFile--">getOutputFile()</a></span> - Method in class org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/ActiveCompaction.html" title="class in org.apache.accumulo.core.client.admin">ActiveCompaction</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/security/ColumnVisibility.html#getParseTree--">getParseTree()</a></span> - Method in class org.apache.accumulo.core.security.<a href="org/apache/accumulo/core/security/ColumnVisibility.html" title="class in org.apache.accumulo.core.security">ColumnVisibility</a></dt>
@@ -2570,9 +2711,13 @@
 <div class="block">Gets the parse tree for this column visibility.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/lib/partition/KeyRangePartitioner.html#getPartition-org.apache.accumulo.core.data.Key-org.apache.hadoop.io.Writable-int-">getPartition(Key, Writable, int)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.lib.partition.<a href="org/apache/accumulo/core/client/mapreduce/lib/partition/KeyRangePartitioner.html" title="class in org.apache.accumulo.core.client.mapreduce.lib.partition">KeyR [...]
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.html#getPartition-org.apache.hadoop.io.Text-org.apache.hadoop.io.Writable-int-">getPartition(Text, Writable, int)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.lib.partition.<a href="org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.html" title="class in org.apache.accumulo.core.client.mapreduce.lib.partition">RangePartitioner< [...]
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/security/tokens/PasswordToken.html#getPassword--">getPassword()</a></span> - Method in class org.apache.accumulo.core.client.security.tokens.<a href="org/apache/accumulo/core/client/security/tokens/PasswordToken.html" title="class in org.apache.accumulo.core.client.security.tokens">PasswordToken</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/security/NamespacePermission.html#getPermissionById-byte-">getPermissionById(byte)</a></span> - Static method in enum org.apache.accumulo.core.security.<a href="org/apache/accumulo/core/security/NamespacePermission.html" title="enum in org.apache.accumulo.core.security">NamespacePermission</a></dt>
@@ -2588,27 +2733,35 @@
 <div class="block">Gets the permission matching the given byte ID.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html#getPos--">getPos()</a></span> - Method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat.AbstractRecordReader</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/TabletId.html#getPrevEndRow--">getPrevEndRow()</a></span> - Method in interface org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/TabletId.html" title="interface in org.apache.accumulo.core.data">TabletId</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ClientInfo.html#getPrincipal--">getPrincipal()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client">ClientInfo</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#getPrincipal-org.apache.hadoop.mapred.JobConf-">getPrincipal(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the user name from the configuration.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#getPrincipal-org.apache.hadoop.mapred.JobConf-">getPrincipal(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the principal from the configuration.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getPrincipal-org.apache.hadoop.mapreduce.JobContext-">getPrincipal(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the user name from the configuration.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#getPrincipal-org.apache.hadoop.mapreduce.JobContext-">getPrincipal(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the user name from the configuration.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#getPrincipal--">getPrincipal()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/security/tokens/KerberosToken.html#getPrincipal--">getPrincipal()</a></span> - Method in class org.apache.accumulo.core.client.security.tokens.<a href="org/apache/accumulo/core/client/security/tokens/KerberosToken.html" title="class in org.apache.accumulo.core.client.security.tokens">KerberosToken</a></dt>
 <dd>
 <div class="block">The identity of the user to which this token belongs to according to Kerberos</div>
@@ -2618,13 +2771,21 @@
 <div class="block">Get layer at which this iterator applies.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html#getProgress--">getProgress()</a></span> - Method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat.AbstractRecordReader</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html#getProgress--">getProgress()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat.AbstractRecordReader</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#getProgress-org.apache.accumulo.core.data.ByteSequence-org.apache.accumulo.core.data.ByteSequence-org.apache.accumulo.core.data.ByteSequence-">getProgress(ByteSequence, ByteSequence, ByteSequence)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.cor [...]
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#getProgress-org.apache.accumulo.core.data.Key-">getProgress(Key)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/NamespaceOperations.html#getProperties-java.lang.String-">getProperties(String)</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/NamespaceOperations.html" title="interface in org.apache.accumulo.core.client.admin">NamespaceOperations</a></dt>
 <dd>
 <div class="block">Gets properties of a namespace, which are inherited by tables in this namespace.</div>
@@ -2638,8 +2799,6 @@
 <dd>
 <div class="block">Gets properties of a table.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ClientInfo.html#getProperties--">getProperties()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client">ClientInfo</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/security/tokens/AuthenticationToken.html#getProperties--">getProperties()</a></span> - Method in interface org.apache.accumulo.core.client.security.tokens.<a href="org/apache/accumulo/core/client/security/tokens/AuthenticationToken.html" title="interface in org.apache.accumulo.core.client.security.tokens">AuthenticationToken</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.html#getProperties--">getProperties()</a></span> - Method in class org.apache.accumulo.core.client.security.tokens.<a href="org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.html" title="class in org.apache.accumulo.core.client.security.tokens">CredentialProviderToken</a></dt>
@@ -2667,21 +2826,26 @@
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/IsolatedScanner.html#getRange--">getRange()</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/IsolatedScanner.html" title="class in org.apache.accumulo.core.client">IsolatedScanner</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#getRange--">getRange()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/Scanner.html#getRange--">getRange()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/Scanner.html" title="interface in org.apache.accumulo.core.client">Scanner</a></dt>
 <dd>
 <div class="block">Returns the range of keys to scan over.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html#getRanges-org.apache.hadoop.mapred.JobConf-">getRanges(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the ranges to scan over from a job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html#getRanges-org.apache.hadoop.mapreduce.JobContext-">getRanges(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapreduce">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the ranges to scan over from a job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#getRanges--">getRanges()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Returns the ranges to be queried in the configuration</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/LoadPlan.Destination.html#getRangeType--">getRangeType()</a></span> - Method in class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/LoadPlan.Destination.html" title="class in org.apache.accumulo.core.data">LoadPlan.Destination</a></dt>
@@ -2698,19 +2862,33 @@
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/ActiveCompaction.html#getReason--">getReason()</a></span> - Method in class org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/ActiveCompaction.html" title="class in org.apache.accumulo.core.client.admin">ActiveCompaction</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html#getRecordReader-org.apache.hadoop.mapred.InputSplit-org.apache.hadoop.mapred.JobConf-org.apache.hadoop.mapred.Reporter-">getRecordReader(InputSplit, JobConf, Reporter)</a></span> - Method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloInputFormat< [...]
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.html#getRecordReader-org.apache.hadoop.mapred.InputSplit-org.apache.hadoop.mapred.JobConf-org.apache.hadoop.mapred.Reporter-">getRecordReader(InputSplit, JobConf, Reporter)</a></span> - Method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.html" title="class in org.apache.accumulo.core.client.mapred"> [...]
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.html#getRecordReader-org.apache.hadoop.mapred.InputSplit-org.apache.hadoop.mapred.JobConf-org.apache.hadoop.mapred.Reporter-">getRecordReader(InputSplit, JobConf, Reporter)</a></span> - Method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloRowInp [...]
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html#getRecordWriter-org.apache.hadoop.fs.FileSystem-org.apache.hadoop.mapred.JobConf-java.lang.String-org.apache.hadoop.util.Progressable-">getRecordWriter(FileSystem, JobConf, String, Progressable)</a></span> - Method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.cor [...]
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#getRecordWriter-org.apache.hadoop.fs.FileSystem-org.apache.hadoop.mapred.JobConf-java.lang.String-org.apache.hadoop.util.Progressable-">getRecordWriter(FileSystem, JobConf, String, Progressable)</a></span> - Method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client [...]
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html#getRecordWriter-org.apache.hadoop.mapreduce.TaskAttemptContext-">getRecordWriter(TaskAttemptContext)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloFileOutputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#getRecordWriter-org.apache.hadoop.mapreduce.TaskAttemptContext-">getRecordWriter(TaskAttemptContext)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/Mutation.html#getReplicationSources--">getReplicationSources()</a></span> - Method in class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/Mutation.html" title="class in org.apache.accumulo.core.data">Mutation</a></dt>
 <dd>
 <div class="block">Return the replication sources for this Mutation</div>
@@ -2749,17 +2927,23 @@
 <div class="block">Reads the sampling configuration properties for a table.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#getSamplerConfiguration--">getSamplerConfiguration()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#getSamplerConfiguration--">getSamplerConfiguration()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ScannerBase.html#getSamplerConfiguration--">getSamplerConfiguration()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ScannerBase.html" title="interface in org.apache.accumulo.core.client">ScannerBase</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#getScanAuthorizations-org.apache.hadoop.mapred.JobConf-">getScanAuthorizations(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the authorizations to set for the scans from the configuration.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getScanAuthorizations-org.apache.hadoop.mapreduce.JobContext-">getScanAuthorizations(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the authorizations to set for the scans from the configuration.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/ActiveScan.html#getScanid--">getScanid()</a></span> - Method in class org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/ActiveScan.html" title="class in org.apache.accumulo.core.client.admin">ActiveScan</a></dt>
@@ -2776,10 +2960,12 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#getSimulationMode-org.apache.hadoop.mapred.JobConf-">getSimulationMode(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Determines whether this feature is enabled.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#getSimulationMode-org.apache.hadoop.mapreduce.JobContext-">getSimulationMode(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Determines whether this feature is enabled.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloConfig.html#getSiteConfig--">getSiteConfig()</a></span> - Method in class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloConfig.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloConfig</a></dt>
@@ -2798,25 +2984,15 @@
 <dd>
 <div class="block">Return Collection of split values.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/TableOperations.html#getSplits-java.lang.String-">getSplits(String)</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/TableOperations.html" title="interface in org.apache.accumulo.core.client.admin">TableOperations</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 1.5.0; use <a href="org/apache/accumulo/core/client/admin/TableOperations.html#listSplits-java.lang.String-"><code>TableOperations.listSplits(String)</code></a> instead.</span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/TableOperations.html#getSplits-java.lang.String-int-">getSplits(String, int)</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/TableOperations.html" title="interface in org.apache.accumulo.core.client.admin">TableOperations</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 1.5.0; use <a href="org/apache/accumulo/core/client/admin/TableOperations.html#listSplits-java.lang.String-int-"><code>TableOperations.listSplits(String, int)</code></a> instead.</span></div>
-</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#getSplits-org.apache.hadoop.mapred.JobConf-int-">getSplits(JobConf, int)</a></span> - Method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the splits of the tables that have been set on the job by reading the metadata table for
  the specified ranges.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getSplits-org.apache.hadoop.mapreduce.JobContext-">getSplits(JobContext)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Gets the splits of the tables that have been set on the job by reading the metadata table for
  the specified ranges.</div>
 </dd>
@@ -2853,8 +3029,16 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/ActiveScan.html#getTable--">getTable()</a></span> - Method in class org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/ActiveScan.html" title="class in org.apache.accumulo.core.client.admin">ActiveScan</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#getTable--">getTable()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 1.6.1, use getTableName() instead.</span></div>
+</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#getTableId--">getTableId()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/TableDeletedException.html#getTableId--">getTableId()</a></span> - Method in exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/TableDeletedException.html" title="class in org.apache.accumulo.core.client">TableDeletedException</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/TabletId.html#getTableId--">getTableId()</a></span> - Method in interface org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/TabletId.html" title="interface in org.apache.accumulo.core.data">TabletId</a></dt>
@@ -2862,7 +3046,9 @@
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloSecurityException.html#getTableInfo--">getTableInfo()</a></span> - Method in exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloSecurityException.html" title="class in org.apache.accumulo.core.client">AccumuloSecurityException</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#getTableName--">getTableName()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/TableNotFoundException.html#getTableName--">getTableName()</a></span> - Method in exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/TableNotFoundException.html" title="class in org.apache.accumulo.core.client">TableNotFoundException</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/DiskUsage.html#getTables--">getTables()</a></span> - Method in class org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/DiskUsage.html" title="class in org.apache.accumulo.core.client.admin">DiskUsage</a></dt>
@@ -2892,22 +3078,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/BatchWriterConfig.html#getTimeout-java.util.concurrent.TimeUnit-">getTimeout(TimeUnit)</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/BatchWriterConfig.html" title="class in org.apache.accumulo.core.client">BatchWriterConfig</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ClientSideIteratorScanner.html#getTimeOut--">getTimeOut()</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ClientSideIteratorScanner.html" title="class in org.apache.accumulo.core.client">ClientSideIteratorScanner</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ConditionalWriterConfig.html#getTimeout-java.util.concurrent.TimeUnit-">getTimeout(TimeUnit)</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ConditionalWriterConfig.html" title="class in org.apache.accumulo.core.client">ConditionalWriterConfig</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/IsolatedScanner.html#getTimeOut--">getTimeOut()</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/IsolatedScanner.html" title="class in org.apache.accumulo.core.client">IsolatedScanner</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/Scanner.html#getTimeOut--">getTimeOut()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/Scanner.html" title="interface in org.apache.accumulo.core.client">Scanner</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Since 1.5. See <a href="org/apache/accumulo/core/client/ScannerBase.html#getTimeout-java.util.concurrent.TimeUnit-"><code>ScannerBase.getTimeout(java.util.concurrent.TimeUnit)</code></a></span></div>
-</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ScannerBase.html#getTimeout-java.util.concurrent.TimeUnit-">getTimeout(TimeUnit)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ScannerBase.html" title="interface in org.apache.accumulo.core.client">ScannerBase</a></dt>
 <dd>
 <div class="block">Returns the setting for how long a scanner will automatically retry when a failure occurs.</div>
@@ -2928,6 +3100,46 @@
 <dd>
 <div class="block">Retrieve the time type currently configured.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#getToken-org.apache.hadoop.mapred.JobConf-">getToken(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 1.6.0; Use <a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#getAuthenticationToken-org.apache.hadoop.mapred.JobConf-"><code>AccumuloOutputFormat.getAuthenticationToken(JobConf)</code></a> instead.</span></div>
+</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getToken-org.apache.hadoop.mapreduce.JobContext-">getToken(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 1.6.0; Use <a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getAuthenticationToken-org.apache.hadoop.mapreduce.JobContext-"><code>AbstractInputFormat.getAuthenticationToken(JobContext)</code></a> instead.</span></div>
+</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#getToken-org.apache.hadoop.mapreduce.JobContext-">getToken(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 1.6.0; Use <a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#getAuthenticationToken-org.apache.hadoop.mapreduce.JobContext-"><code>AccumuloOutputFormat.getAuthenticationToken(JobContext)</code></a> instead.</span></div>
+</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#getToken--">getToken()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#getTokenClass-org.apache.hadoop.mapred.JobConf-">getTokenClass(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 1.6.0; Use <a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#getAuthenticationToken-org.apache.hadoop.mapred.JobConf-"><code>AccumuloOutputFormat.getAuthenticationToken(JobConf)</code></a> instead.</span></div>
+</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getTokenClass-org.apache.hadoop.mapreduce.JobContext-">getTokenClass(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 1.6.0; Use <a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#getAuthenticationToken-org.apache.hadoop.mapreduce.JobContext-"><code>AbstractInputFormat.getAuthenticationToken(JobContext)</code></a> instead.</span></div>
+</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#getTokenClass-org.apache.hadoop.mapreduce.JobContext-">getTokenClass(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 1.6.0; Use <a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#getAuthenticationToken-org.apache.hadoop.mapreduce.JobContext-"><code>AccumuloOutputFormat.getAuthenticationToken(JobContext)</code></a> instead.</span></div>
+</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/DelegationTokenConfig.html#getTokenLifetime-java.util.concurrent.TimeUnit-">getTokenLifetime(TimeUnit)</a></span> - Method in class org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/DelegationTokenConfig.html" title="class in org.apache.accumulo.core.client.admin">DelegationTokenConfig</a></dt>
 <dd>
 <div class="block">The current token lifetime.</div>
@@ -2980,21 +3192,21 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloConfig.html#getZooKeeperPort--">getZooKeeperPort()</a></span> - Method in class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloConfig.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloConfig</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ClientInfo.html#getZooKeepers--">getZooKeepers()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client">ClientInfo</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/Instance.html#getZooKeepers--">getZooKeepers()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/Instance.html" title="interface in org.apache.accumulo.core.client">Instance</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Returns a comma-separated list of zookeeper servers the instance is using.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#getZooKeepers--">getZooKeepers()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ZooKeeperInstance.html#getZooKeepers--">getZooKeepers()</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ZooKeeperInstance.html" title="class in org.apache.accumulo.core.client">ZooKeeperInstance</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 &nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getZooKeepers--">getZooKeepers()</a></span> - Method in class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloCluster</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ClientInfo.html#getZooKeepersSessionTimeOut--">getZooKeepersSessionTimeOut()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client">ClientInfo</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/Instance.html#getZooKeepersSessionTimeOut--">getZooKeepersSessionTimeOut()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/Instance.html" title="interface in org.apache.accumulo.core.client">Instance</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
@@ -3055,7 +3267,9 @@
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/IteratorSetting.html#hashCode--">hashCode()</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/IteratorSetting.html" title="class in org.apache.accumulo.core.client">IteratorSetting</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#hashCode--">hashCode()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/sample/SamplerConfiguration.html#hashCode--">hashCode()</a></span> - Method in class org.apache.accumulo.core.client.sample.<a href="org/apache/accumulo/core/client/sample/SamplerConfiguration.html" title="class in org.apache.accumulo.core.client.sample">SamplerConfiguration</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/security/tokens/AuthenticationToken.TokenProperty.html#hashCode--">hashCode()</a></span> - Method in class org.apache.accumulo.core.client.security.tokens.<a href="org/apache/accumulo/core/client/security/tokens/AuthenticationToken.TokenProperty.html" title="class in org.apache.accumulo.core.client.security.tokens">AuthenticationToken.TokenProperty</a></dt>
@@ -3141,12 +3355,6 @@
 <dd>
 <div class="block">Imports a table exported via exportTable and copied via hadoop distcp.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html#info--">info()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientInfoFactory</a></dt>
-<dd>
-<div class="block">Builds ClientInfo after all options have been specified</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.html#info--">info()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client">AccumuloClient</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/summary/CountingSummarizer.html#INGNORE_DELETES_DEFAULT">INGNORE_DELETES_DEFAULT</a></span> - Static variable in class org.apache.accumulo.core.client.summary.<a href="org/apache/accumulo/core/client/summary/CountingSummarizer.html" title="class in org.apache.accumulo.core.client.summary">CountingSummarizer</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/summary/CountingSummarizer.html#INGNORE_DELETES_OPT">INGNORE_DELETES_OPT</a></span> - Static variable in class org.apache.accumulo.core.client.summary.<a href="org/apache/accumulo/core/client/summary/CountingSummarizer.html" title="class in org.apache.accumulo.core.client.summary">CountingSummarizer</a></dt>
@@ -3175,46 +3383,68 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html#initialize-org.apache.hadoop.mapred.InputSplit-org.apache.hadoop.mapred.JobConf-">initialize(InputSplit, JobConf)</a></span> - Method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat.AbstractReco [...]
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Initialize a scanner over the given input split using this task attempt configuration.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html#initialize-org.apache.hadoop.mapreduce.InputSplit-org.apache.hadoop.mapreduce.TaskAttemptContext-">initialize(InputSplit, TaskAttemptContext)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.map [...]
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/admin/InitialTableState.html" title="enum in org.apache.accumulo.core.client.admin"><span class="typeNameLink">InitialTableState</span></a> - Enum in <a href="org/apache/accumulo/core/client/admin/package-summary.html">org.apache.accumulo.core.client.admin</a></dt>
 <dd>
 <div class="block">Creation mode for table creation.</div>
 </dd>
 <dt><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapred"><span class="typeNameLink">InputFormatBase</span></a>&lt;<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="type parameter in InputFormatBase">K</a>,<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="type parameter in InputFormatBase">V</a>&gt; - Class in <a href="org/apache/accumulo/core/client/mapred/packag [...]
 <dd>
-<div class="block">This abstract <code>InputFormat</code> class allows MapReduce jobs to use Accumulo as the source of
- K,V pairs.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapred instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
+</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html#InputFormatBase--">InputFormatBase()</a></span> - Constructor for class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapreduce"><span class="typeNameLink">InputFormatBase</span></a>&lt;<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="type parameter in InputFormatBase">K</a>,<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="type parameter in InputFormatBase">V</a>&gt; - Class in <a href="org/apache/accumulo/core/client/m [...]
 <dd>
-<div class="block">This abstract <code>InputFormat</code> class allows MapReduce jobs to use Accumulo as the source of
- K,V pairs.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapreduce instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
+</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html#InputFormatBase--">InputFormatBase()</a></span> - Constructor for class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapreduce">InputFormatBase</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.RecordReaderBase.html" title="class in org.apache.accumulo.core.client.mapred"><span class="typeNameLink">InputFormatBase.RecordReaderBase</span></a>&lt;<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.RecordReaderBase.html" title="type parameter in InputFormatBase.RecordReaderBase">K</a>,<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.RecordReaderBase.html" title="type parameter in InputFo [...]
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.RecordReaderBase.html" title="class in org.apache.accumulo.core.client.mapreduce"><span class="typeNameLink">InputFormatBase.RecordReaderBase</span></a>&lt;<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.RecordReaderBase.html" title="type parameter in InputFormatBase.RecordReaderBase">K</a>,<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.RecordReaderBase.html" title="type paramete [...]
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce"><span class="typeNameLink">InputTableConfig</span></a> - Class in <a href="org/apache/accumulo/core/client/mapreduce/package-summary.html">org.apache.accumulo.core.client.mapreduce</a></dt>
 <dd>
-<div class="block">This class to holds a batch scan configuration for a table.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapreduce instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
+</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#InputTableConfig--">InputTableConfig()</a></span> - Constructor for class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#InputTableConfig-java.io.DataInput-">InputTableConfig(DataInput)</a></span> - Constructor for class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Creates a batch scan config object out of a previously serialized batch scan config object.</div>
 </dd>
 <dt><a href="org/apache/accumulo/core/client/Instance.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Instance</span></a> - Interface in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0, use <a href="org/apache/accumulo/core/client/Accumulo.html#newClient--"><code>Accumulo.newClient()</code></a> and <a href="org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client"><code>ClientInfo</code></a> instead</span></div>
+<div class="block"><span class="deprecationComment">since 2.0.0, use <a href="org/apache/accumulo/core/client/Accumulo.html#newClient--"><code>Accumulo.newClient()</code></a> and <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util"><code>Properties</code></a>
+             instead</span></div>
 </div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.html#instanceOperations--">instanceOperations()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client">AccumuloClient</a></dt>
@@ -3242,13 +3472,13 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html#isBatchScan-org.apache.hadoop.mapred.JobConf-">isBatchScan(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase</a></dt>
 <dd>
-<div class="block">Determines whether a configuration has the <a href="org/apache/accumulo/core/client/BatchScanner.html" title="interface in org.apache.accumulo.core.client"><code>BatchScanner</code></a>
- feature enabled.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Determines whether a configuration has the <a href="org/apache/accumulo/core/client/BatchScanner.html" title="interface in org.apache.accumulo.core.client"><code>BatchScanner</code></a> feature enabled.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html#isBatchScan-org.apache.hadoop.mapreduce.JobContext-">isBatchScan(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapreduce">InputFormatBase</a></dt>
 <dd>
-<div class="block">Determines whether a configuration has the <a href="org/apache/accumulo/core/client/BatchScanner.html" title="interface in org.apache.accumulo.core.client"><code>BatchScanner</code></a>
- feature enabled.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Determines whether a configuration has the <a href="org/apache/accumulo/core/client/BatchScanner.html" title="interface in org.apache.accumulo.core.client"><code>BatchScanner</code></a> feature enabled.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/MultiTableBatchWriter.html#isClosed--">isClosed()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/MultiTableBatchWriter.html" title="interface in org.apache.accumulo.core.client">MultiTableBatchWriter</a></dt>
 <dd>
@@ -3256,18 +3486,22 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#isConnectorInfoSet-org.apache.hadoop.mapred.JobConf-">isConnectorInfoSet(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Determines if the connector has been configured.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#isConnectorInfoSet-org.apache.hadoop.mapred.JobConf-">isConnectorInfoSet(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Determines if the connector has been configured.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#isConnectorInfoSet-org.apache.hadoop.mapreduce.JobContext-">isConnectorInfoSet(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Determines if the connector has been configured.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#isConnectorInfoSet-org.apache.hadoop.mapreduce.JobContext-">isConnectorInfoSet(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Determines if the connector has been configured.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/ColumnUpdate.html#isDeleted--">isDeleted()</a></span> - Method in class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/ColumnUpdate.html" title="class in org.apache.accumulo.core.data">ColumnUpdate</a></dt>
@@ -3306,28 +3540,37 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html#isIsolated-org.apache.hadoop.mapred.JobConf-">isIsolated(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Determines whether a configuration has isolation enabled.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html#isIsolated-org.apache.hadoop.mapreduce.JobContext-">isIsolated(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapreduce">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Determines whether a configuration has isolation enabled.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#isIsolatedScan--">isIsolatedScan()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloConfig.html#isJDWPEnabled--">isJDWPEnabled()</a></span> - Method in class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloConfig.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloConfig</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#isOffline--">isOffline()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html#isOfflineScan-org.apache.hadoop.mapred.JobConf-">isOfflineScan(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Determines whether a configuration has the offline table scan feature enabled.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html#isOfflineScan-org.apache.hadoop.mapreduce.JobContext-">isOfflineScan(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapreduce">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Determines whether a configuration has the offline table scan feature enabled.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#isOfflineScan--">isOfflineScan()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Determines whether a configuration has the offline table scan feature enabled.</div>
 </dd>
 <dt><a href="org/apache/accumulo/core/client/IsolatedScanner.html" title="class in org.apache.accumulo.core.client"><span class="typeNameLink">IsolatedScanner</span></a> - Class in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
@@ -3417,10 +3660,13 @@
 <dl>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html#jobIterators-org.apache.hadoop.mapred.JobConf-java.lang.String-">jobIterators(JobConf, String)</a></span> - Method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat.AbstractRecordReader</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Extracts Iterators settings from the context to be used by RecordReader.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.RecordReaderBase.html#jobIterators-org.apache.hadoop.mapred.JobConf-java.lang.String-">jobIterators(JobConf, String)</a></span> - Method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.RecordReaderBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase.RecordReaderBase</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 </dl>
 <a name="I:K">
 <!--   -->
@@ -3440,12 +3686,6 @@
 <dd>
 <div class="block">Creates a Kerberos token for the specified principal using the provided keytab.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/security/tokens/KerberosToken.html#KerberosToken-java.lang.String-java.io.File-boolean-">KerberosToken(String, File, boolean)</a></span> - Constructor for class org.apache.accumulo.core.client.security.tokens.<a href="org/apache/accumulo/core/client/security/tokens/KerberosToken.html" title="class in org.apache.accumulo.core.client.security.tokens">KerberosToken</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 1.8.0, @see #KerberosToken(String, File)</span></div>
-</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/security/tokens/KerberosToken.html#KerberosToken--">KerberosToken()</a></span> - Constructor for class org.apache.accumulo.core.client.security.tokens.<a href="org/apache/accumulo/core/client/security/tokens/KerberosToken.html" title="class in org.apache.accumulo.core.client.security.tokens">KerberosToken</a></dt>
 <dd>
 <div class="block">Creates a token using the login user as returned by
@@ -3587,7 +3827,7 @@
 <div class="block">Creates a key with the same row, column family, column qualifier, column visibility, timestamp,
  and delete marker as the given key.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/Key.html#Key-org.apache.accumulo.core.data.thrift.TKey-">Key(TKey)</a></span> - Constructor for class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/Key.html" title="class in org.apache.accumulo.core.data">Key</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/Key.html#Key-org.apache.accumulo.core.dataImpl.thrift.TKey-">Key(TKey)</a></span> - Constructor for class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/Key.html" title="class in org.apache.accumulo.core.data">Key</a></dt>
 <dd>
 <div class="block">Creates a key from Thrift.</div>
 </dd>
@@ -3620,12 +3860,25 @@
 </dd>
 <dt><a href="org/apache/accumulo/core/client/mapreduce/lib/partition/KeyRangePartitioner.html" title="class in org.apache.accumulo.core.client.mapreduce.lib.partition"><span class="typeNameLink">KeyRangePartitioner</span></a> - Class in <a href="org/apache/accumulo/core/client/mapreduce/lib/partition/package-summary.html">org.apache.accumulo.core.client.mapreduce.lib.partition</a></dt>
 <dd>
-<div class="block">Hadoop partitioner that uses ranges based on row keys, and optionally sub-bins based on hashing.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapreduce.partition instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
+</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/lib/partition/KeyRangePartitioner.html#KeyRangePartitioner--">KeyRangePartitioner()</a></span> - Constructor for class org.apache.accumulo.core.client.mapreduce.lib.partition.<a href="org/apache/accumulo/core/client/mapreduce/lib/partition/KeyRangePartitioner.html" title="class in org.apache.accumulo.core.client.mapreduce.lib.partition">KeyRangePartitioner</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/security/tokens/AuthenticationToken.Properties.html#keySet--">keySet()</a></span> - Method in class org.apache.accumulo.core.client.security.tokens.<a href="org/apache/accumulo/core/client/security/tokens/AuthenticationToken.Properties.html" title="class in org.apache.accumulo.core.client.security.tokens">AuthenticationToken.Properties</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.SslOptions.html#keystore-java.lang.CharSequence-">keystore(CharSequence)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a></dt>
+<dd>
+<div class="block">Build with SSL key store</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.SslOptions.html#keystore-java.lang.CharSequence-java.lang.CharSequence-java.lang.CharSequence-">keystore(CharSequence, CharSequence, CharSequence)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a></dt>
+<dd>
+<div class="block">Build with SSL key store</div>
+</dd>
 <dt><a href="org/apache/accumulo/core/data/KeyValue.html" title="class in org.apache.accumulo.core.data"><span class="typeNameLink">KeyValue</span></a> - Class in <a href="org/apache/accumulo/core/data/package-summary.html">org.apache.accumulo.core.data</a></dt>
 <dd>
 <div class="block">A key/value pair.</div>
@@ -3701,13 +3954,6 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/TableOperations.html#listSummarizers-java.lang.String-">listSummarizers(String)</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/TableOperations.html" title="interface in org.apache.accumulo.core.client.admin">TableOperations</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/SecurityOperations.html#listUsers--">listUsers()</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/SecurityOperations.html" title="interface in org.apache.accumulo.core.client.admin">SecurityOperations</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 1.5.0; use <a href="org/apache/accumulo/core/client/admin/SecurityOperations.html#listLocalUsers--"><code>SecurityOperations.listLocalUsers()</code></a> or the user management functions of your
-             configured authenticator instead.</span></div>
-</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/TableOperations.ImportOptions.html#load--">load()</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/TableOperations.ImportOptions.html" title="interface in org.apache.accumulo.core.client.admin">TableOperations.ImportOptions</a></dt>
 <dd>
 <div class="block">Loads the files into the table.</div>
@@ -3751,17 +3997,29 @@
  <a href="org/apache/accumulo/core/client/admin/TableOperations.html#locate-java.lang.String-java.util.Collection-"><code>TableOperations.locate(String, java.util.Collection)</code></a></div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#log">log</a></span> - Static variable in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html#log">log</a></span> - Static variable in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloFileOutputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#log">log</a></span> - Static variable in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#log">log</a></span> - Static variable in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html#log">log</a></span> - Static variable in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloFileOutputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#log">log</a></span> - Static variable in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/lexicoder/LongLexicoder.html" title="class in org.apache.accumulo.core.client.lexicoder"><span class="typeNameLink">LongLexicoder</span></a> - Class in <a href="org/apache/accumulo/core/client/lexicoder/package-summary.html">org.apache.accumulo.core.client.lexicoder</a></dt>
 <dd>
 <div class="block">Signed long lexicoder.</div>
@@ -3831,7 +4089,7 @@
 <dt><a href="org/apache/accumulo/minicluster/MiniAccumuloInstance.html" title="class in org.apache.accumulo.minicluster"><span class="typeNameLink">MiniAccumuloInstance</span></a> - Class in <a href="org/apache/accumulo/minicluster/package-summary.html">org.apache.accumulo.minicluster</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0, Use <a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getClientInfo-java.io.File-"><code>MiniAccumuloCluster.getClientInfo(File)</code></a> instead</span></div>
+<div class="block"><span class="deprecationComment">since 2.0.0, Use <a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#getClientProperties-java.io.File-"><code>MiniAccumuloCluster.getClientProperties(File)</code></a> instead</span></div>
 </div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloInstance.html#MiniAccumuloInstance-java.lang.String-java.io.File-">MiniAccumuloInstance(String, File)</a></span> - Constructor for class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloInstance.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloInstance</a></dt>
@@ -3895,7 +4153,7 @@
 <dd>
 <div class="block">Creates a new mutation.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/Mutation.html#Mutation-org.apache.accumulo.core.data.thrift.TMutation-">Mutation(TMutation)</a></span> - Constructor for class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/Mutation.html" title="class in org.apache.accumulo.core.data">Mutation</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/Mutation.html#Mutation-org.apache.accumulo.core.dataImpl.thrift.TMutation-">Mutation(TMutation)</a></span> - Constructor for class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/Mutation.html" title="class in org.apache.accumulo.core.data">Mutation</a></dt>
 <dd>
 <div class="block">Creates a new mutation from a Thrift mutation.</div>
 </dd>
@@ -3935,10 +4193,10 @@
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>
 <div class="block"><span class="deprecationComment">since 2.0.0, replaced by
-             <a href="org/apache/accumulo/core/client/MutationsRejectedException.html#MutationsRejectedException-org.apache.accumulo.core.client.ClientInfo-java.util.List-java.util.Map-java.util.Collection-int-java.lang.Throwable-"><code>MutationsRejectedException.MutationsRejectedException(ClientInfo, List, Map, Collection, int, Throwable)</code></a></span></div>
+             <a href="org/apache/accumulo/core/client/MutationsRejectedException.html#MutationsRejectedException-org.apache.accumulo.core.client.AccumuloClient-java.util.List-java.util.Map-java.util.Collection-int-java.lang.Throwable-"><code>MutationsRejectedException.MutationsRejectedException(AccumuloClient, List, Map, Collection, int, Throwable)</code></a></span></div>
 </div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/MutationsRejectedException.html#MutationsRejectedException-org.apache.accumulo.core.client.ClientInfo-java.util.List-java.util.Map-java.util.Collection-int-java.lang.Throwable-">MutationsRejectedException(ClientInfo, List&lt;ConstraintViolationSummary&gt;, Map&lt;TabletId, Set&lt;SecurityErrorCode&gt;&gt;, Collection&lt;String&gt;, int, Throwable)</a></span> - Constructor for exception org.apache.accumulo.core.clie [...]
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/MutationsRejectedException.html#MutationsRejectedException-org.apache.accumulo.core.client.AccumuloClient-java.util.List-java.util.Map-java.util.Collection-int-java.lang.Throwable-">MutationsRejectedException(AccumuloClient, List&lt;ConstraintViolationSummary&gt;, Map&lt;TabletId, Set&lt;SecurityErrorCode&gt;&gt;, Collection&lt;String&gt;, int, Throwable)</a></span> - Constructor for exception org.apache.accumulo.c [...]
 <dd>
 <div class="block">Creates Mutations rejected exception</div>
 </dd>
@@ -3958,7 +4216,7 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/NamespaceExistsException.html#NamespaceExistsException-java.lang.String-java.lang.String-java.lang.String-java.lang.Throwable-">NamespaceExistsException(String, String, String, Throwable)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/NamespaceExistsException.html" title="class in org.apache.accumulo.core.client">NamespaceExistsException</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/NamespaceExistsException.html#NamespaceExistsException-org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException-">NamespaceExistsException(ThriftTableOperationException)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/NamespaceExistsException.html" title="class in org.apache.accumulo.core.client">NamespaceExistsException</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/NamespaceExistsException.html#NamespaceExistsException-org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException-">NamespaceExistsException(ThriftTableOperationException)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/NamespaceExistsException.html" title="class in org.apache.accumulo.core.client">NamespaceExistsException</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/NamespaceOperations.html#namespaceIdMap--">namespaceIdMap()</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/NamespaceOperations.html" title="interface in org.apache.accumulo.core.client.admin">NamespaceOperations</a></dt>
 <dd>
@@ -3972,7 +4230,7 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/NamespaceNotEmptyException.html#NamespaceNotEmptyException-java.lang.String-java.lang.String-java.lang.String-java.lang.Throwable-">NamespaceNotEmptyException(String, String, String, Throwable)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/NamespaceNotEmptyException.html" title="class in org.apache.accumulo.core.client">NamespaceNotEmptyException</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/NamespaceNotEmptyException.html#NamespaceNotEmptyException-org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException-">NamespaceNotEmptyException(ThriftTableOperationException)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/NamespaceNotEmptyException.html" title="class in org.apache.accumulo.core.client">NamespaceNotEmptyException</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/NamespaceNotEmptyException.html#NamespaceNotEmptyException-org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException-">NamespaceNotEmptyException(ThriftTableOperationException)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/NamespaceNotEmptyException.html" title="class in org.apache.accumulo.core.client">NamespaceNotEmptyException</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/NamespaceNotFoundException.html" title="class in org.apache.accumulo.core.client"><span class="typeNameLink">NamespaceNotFoundException</span></a> - Exception in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
 <dd>
@@ -3982,7 +4240,7 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/NamespaceNotFoundException.html#NamespaceNotFoundException-java.lang.String-java.lang.String-java.lang.String-java.lang.Throwable-">NamespaceNotFoundException(String, String, String, Throwable)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/NamespaceNotFoundException.html" title="class in org.apache.accumulo.core.client">NamespaceNotFoundException</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/NamespaceNotFoundException.html#NamespaceNotFoundException-org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException-">NamespaceNotFoundException(ThriftTableOperationException)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/NamespaceNotFoundException.html" title="class in org.apache.accumulo.core.client">NamespaceNotFoundException</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/NamespaceNotFoundException.html#NamespaceNotFoundException-org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException-">NamespaceNotFoundException(ThriftTableOperationException)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/NamespaceNotFoundException.html" title="class in org.apache.accumulo.core.client">NamespaceNotFoundException</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.html#namespaceOperations--">namespaceOperations()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client">AccumuloClient</a></dt>
 <dd>
@@ -4013,6 +4271,10 @@
 <dd>
 <div class="block">Fluent entry point for creating an <a href="org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client"><code>AccumuloClient</code></a>.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/Accumulo.html#newClientProperties--">newClientProperties()</a></span> - Static method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/Accumulo.html" title="class in org.apache.accumulo.core.client">Accumulo</a></dt>
+<dd>
+<div class="block">Fluent entry point for creating client <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util"><code>Properties</code></a>.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/Mutation.html#newColumnUpdate-byte:A-byte:A-byte:A-boolean-long-boolean-byte:A-">newColumnUpdate(byte[], byte[], byte[], boolean, long, boolean, byte[])</a></span> - Method in class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/Mutation.html" title="class in org.apache.accumulo.core.data">Mutation</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/rfile/RFile.html#newScanner--">newScanner()</a></span> - Static method in class org.apache.accumulo.core.client.rfile.<a href="org/apache/accumulo/core/client/rfile/RFile.html" title="class in org.apache.accumulo.core.client.rfile">RFile</a></dt>
@@ -4056,9 +4318,13 @@
 <div class="block">Gets the total number of bytes in this mutation.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html#numKeysRead">numKeysRead</a></span> - Variable in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat.AbstractRecordReader</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html#numKeysRead">numKeysRead</a></span> - Variable in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat.AbstractRecordReader</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 </dl>
 <a name="I:O">
 <!--   -->
@@ -4221,6 +4487,10 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/ServerType.html#prettyPrint--">prettyPrint()</a></span> - Method in enum org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/ServerType.html" title="enum in org.apache.accumulo.minicluster">ServerType</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html#primary-java.lang.CharSequence-">primary(CharSequence)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SaslOptions</a></dt>
+<dd>
+<div class="block">Build with Kerberos Server Primary</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/security/NamespacePermission.html#printableValues--">printableValues()</a></span> - Static method in enum org.apache.accumulo.core.security.<a href="org/apache/accumulo/core/security/NamespacePermission.html" title="enum in org.apache.accumulo.core.security">NamespacePermission</a></dt>
 <dd>
 <div class="block">Returns a list of printable permission values.</div>
@@ -4233,6 +4503,8 @@
 <dd>
 <div class="block">Returns a list of printable permission values.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.html#properties--">properties()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client">AccumuloClient</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/security/tokens/AuthenticationToken.Properties.html#Properties--">Properties()</a></span> - Constructor for class org.apache.accumulo.core.client.security.tokens.<a href="org/apache/accumulo/core/client/security/tokens/AuthenticationToken.Properties.html" title="class in org.apache.accumulo.core.client.security.tokens">AuthenticationToken.Properties</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloRunner.PropertiesConverter.html#PropertiesConverter--">PropertiesConverter()</a></span> - Constructor for class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloRunner.PropertiesConverter.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloRunner.PropertiesConverter</a></dt>
@@ -4373,6 +4645,10 @@
 </a>
 <h2 class="title">Q</h2>
 <dl>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html#qop-java.lang.CharSequence-">qop(CharSequence)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SaslOptions</a></dt>
+<dd>
+<div class="block">Build with SASL quality of protection</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/KeyBuilder.ColumnQualifierStep.html#qualifier-byte:A-">qualifier(byte[])</a></span> - Method in interface org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/KeyBuilder.ColumnQualifierStep.html" title="interface in org.apache.accumulo.core.data">KeyBuilder.ColumnQualifierStep</a></dt>
 <dd>
 <div class="block">Set the column qualifier of the <a href="org/apache/accumulo/core/data/Key.html" title="class in org.apache.accumulo.core.data"><code>Key</code></a> that this builder will build to the parameter.</div>
@@ -4463,36 +4739,59 @@
 <dd>
 <div class="block">Creates a range from start to stop.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/Range.html#Range-org.apache.accumulo.core.data.thrift.TRange-">Range(TRange)</a></span> - Constructor for class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/Range.html" title="class in org.apache.accumulo.core.data">Range</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/Range.html#Range-org.apache.accumulo.core.dataImpl.thrift.TRange-">Range(TRange)</a></span> - Constructor for class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/Range.html" title="class in org.apache.accumulo.core.data">Range</a></dt>
 <dd>
 <div class="block">Creates a range from a Thrift range.</div>
 </dd>
 <dt><a href="org/apache/accumulo/core/client/mapred/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapred"><span class="typeNameLink">RangeInputSplit</span></a> - Class in <a href="org/apache/accumulo/core/client/mapred/package-summary.html">org.apache.accumulo.core.client.mapred</a></dt>
 <dd>
-<div class="block">The Class RangeInputSplit.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapred instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
+</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/RangeInputSplit.html#RangeInputSplit--">RangeInputSplit()</a></span> - Constructor for class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapred">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/RangeInputSplit.html#RangeInputSplit-org.apache.accumulo.core.client.mapred.RangeInputSplit-">RangeInputSplit(RangeInputSplit)</a></span> - Constructor for class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapred">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/RangeInputSplit.html#RangeInputSplit-java.lang.String-java.lang.String-org.apache.accumulo.core.data.Range-java.lang.String:A-">RangeInputSplit(String, String, Range, String[])</a></span> - Constructor for class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapred">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce"><span class="typeNameLink">RangeInputSplit</span></a> - Class in <a href="org/apache/accumulo/core/client/mapreduce/package-summary.html">org.apache.accumulo.core.client.mapreduce</a></dt>
 <dd>
-<div class="block">The Class RangeInputSplit.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapreduce instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
+</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#RangeInputSplit--">RangeInputSplit()</a></span> - Constructor for class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#RangeInputSplit-org.apache.accumulo.core.client.mapreduce.RangeInputSplit-">RangeInputSplit(RangeInputSplit)</a></span> - Constructor for class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#RangeInputSplit-java.lang.String-java.lang.String-org.apache.accumulo.core.data.Range-java.lang.String:A-">RangeInputSplit(String, String, Range, String[])</a></span> - Constructor for class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.html" title="class in org.apache.accumulo.core.client.mapreduce.lib.partition"><span class="typeNameLink">RangePartitioner</span></a> - Class in <a href="org/apache/accumulo/core/client/mapreduce/lib/partition/package-summary.html">org.apache.accumulo.core.client.mapreduce.lib.partition</a></dt>
 <dd>
-<div class="block">Hadoop partitioner that uses ranges, and optionally sub-bins based on hashing.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 2.0.0; Use org.apache.accumulo.hadoop.mapreduce.partition instead from the
+             accumulo-hadoop-mapreduce.jar</span></div>
+</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.html#RangePartitioner--">RangePartitioner()</a></span> - Constructor for class org.apache.accumulo.core.client.mapreduce.lib.partition.<a href="org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.html" title="class in org.apache.accumulo.core.client.mapreduce.lib.partition">RangePartitioner</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/rfile/RFile.SummaryOptions.html#read--">read()</a></span> - Method in interface org.apache.accumulo.core.client.rfile.<a href="org/apache/accumulo/core/client/rfile/RFile.SummaryOptions.html" title="interface in org.apache.accumulo.core.client.rfile">RFile.SummaryOptions</a></dt>
 <dd>
 <div class="block">Reads summary data from file.</div>
@@ -4502,9 +4801,13 @@
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/IteratorSetting.html#readFields-java.io.DataInput-">readFields(DataInput)</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/IteratorSetting.html" title="class in org.apache.accumulo.core.client">IteratorSetting</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#readFields-java.io.DataInput-">readFields(DataInput)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#readFields-java.io.DataInput-">readFields(DataInput)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/security/tokens/KerberosToken.html#readFields-java.io.DataInput-">readFields(DataInput)</a></span> - Method in class org.apache.accumulo.core.client.security.tokens.<a href="org/apache/accumulo/core/client/security/tokens/KerberosToken.html" title="class in org.apache.accumulo.core.client.security.tokens">KerberosToken</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/security/tokens/NullToken.html#readFields-java.io.DataInput-">readFields(DataInput)</a></span> - Method in class org.apache.accumulo.core.client.security.tokens.<a href="org/apache/accumulo/core/client/security/tokens/NullToken.html" title="class in org.apache.accumulo.core.client.security.tokens">NullToken</a></dt>
@@ -4522,9 +4825,13 @@
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/Value.html#readFields-java.io.DataInput-">readFields(DataInput)</a></span> - Method in class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/Value.html" title="class in org.apache.accumulo.core.data">Value</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.RecordReaderBase.html#RecordReaderBase--">RecordReaderBase()</a></span> - Constructor for class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.RecordReaderBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase.RecordReaderBase</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.RecordReaderBase.html#RecordReaderBase--">RecordReaderBase()</a></span> - Constructor for class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.RecordReaderBase.html" title="class in org.apache.accumulo.core.client.mapreduce">InputFormatBase.RecordReaderBase</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/ReplicationOperations.html#referencedFiles-java.lang.String-">referencedFiles(String)</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/ReplicationOperations.html" title="interface in org.apache.accumulo.core.client.admin">ReplicationOperations</a></dt>
 <dd>
 <div class="block">Gets all of the referenced files for a table from the metadata table.</div>
@@ -4747,24 +5054,34 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/sample/SamplerConfiguration.html#SamplerConfiguration-java.lang.String-">SamplerConfiguration(String)</a></span> - Constructor for class org.apache.accumulo.core.client.sample.<a href="org/apache/accumulo/core/client/sample/SamplerConfiguration.html" title="class in org.apache.accumulo.core.client.sample">SamplerConfiguration</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ClientInfo.html#saslEnabled--">saslEnabled()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client">ClientInfo</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/Scanner.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Scanner</span></a> - Interface in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
 <dd>
 <div class="block">Scans a table over a given range.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html#scannerBase">scannerBase</a></span> - Variable in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat.AbstractRecordReader</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html#scannerBase">scannerBase</a></span> - Variable in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat.AbstractRecordReader</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/ScannerBase.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">ScannerBase</span></a> - Interface in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
 <dd>
 <div class="block">This class hosts configuration methods that are shared between different types of scanners.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#scannerBatchSize-int-">scannerBatchSize(int)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a></dt>
+<dd>
+<div class="block">Build with default batch size for Scanner</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html#scannerIterator">scannerIterator</a></span> - Variable in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat.AbstractRecordReader</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html#scannerIterator">scannerIterator</a></span> - Variable in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat.AbstractRecordReader</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/admin/ScanState.html" title="enum in org.apache.accumulo.core.client.admin"><span class="typeNameLink">ScanState</span></a> - Enum in <a href="org/apache/accumulo/core/client/admin/package-summary.html">org.apache.accumulo.core.client.admin</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/admin/ScanType.html" title="enum in org.apache.accumulo.core.client.admin"><span class="typeNameLink">ScanType</span></a> - Enum in <a href="org/apache/accumulo/core/client/admin/package-summary.html">org.apache.accumulo.core.client.admin</a></dt>
@@ -4822,24 +5139,33 @@
 <div class="block">A set of authorization labels that will be checked against the column visibility of each key in
  order to filter data.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#setAuths-org.apache.accumulo.core.security.Authorizations-">setAuths(Authorizations)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html#setAutoAdjustRanges-org.apache.hadoop.mapred.JobConf-boolean-">setAutoAdjustRanges(JobConf, boolean)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Controls the automatic adjustment of ranges for this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html#setAutoAdjustRanges-org.apache.hadoop.mapreduce.Job-boolean-">setAutoAdjustRanges(Job, boolean)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapreduce">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Controls the automatic adjustment of ranges for this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#setAutoAdjustRanges-boolean-">setAutoAdjustRanges(boolean)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Controls the automatic adjustment of ranges for this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html#setBatchScan-org.apache.hadoop.mapred.JobConf-boolean-">setBatchScan(JobConf, boolean)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Controls the use of the <a href="org/apache/accumulo/core/client/BatchScanner.html" title="interface in org.apache.accumulo.core.client"><code>BatchScanner</code></a> in this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html#setBatchScan-org.apache.hadoop.mapreduce.Job-boolean-">setBatchScan(Job, boolean)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapreduce">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Controls the use of the <a href="org/apache/accumulo/core/client/BatchScanner.html" title="interface in org.apache.accumulo.core.client"><code>BatchScanner</code></a> in this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ClientSideIteratorScanner.html#setBatchSize-int-">setBatchSize(int)</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ClientSideIteratorScanner.html" title="class in org.apache.accumulo.core.client">ClientSideIteratorScanner</a></dt>
@@ -4856,10 +5182,12 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#setBatchWriterOptions-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.BatchWriterConfig-">setBatchWriterOptions(JobConf, BatchWriterConfig)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the configuration for for the job's <a href="org/apache/accumulo/core/client/BatchWriter.html" title="interface in org.apache.accumulo.core.client"><code>BatchWriter</code></a> instances.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#setBatchWriterOptions-org.apache.hadoop.mapreduce.Job-org.apache.accumulo.core.client.BatchWriterConfig-">setBatchWriterOptions(Job, BatchWriterConfig)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputF [...]
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the configuration for for the job's <a href="org/apache/accumulo/core/client/BatchWriter.html" title="interface in org.apache.accumulo.core.client"><code>BatchWriter</code></a> instances.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ConditionalWriterConfig.html#setClassLoaderContext-java.lang.String-">setClassLoaderContext(String)</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ConditionalWriterConfig.html" title="class in org.apache.accumulo.core.client">ConditionalWriterConfig</a></dt>
@@ -4868,126 +5196,98 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#setClassLoaderContext-org.apache.hadoop.mapred.JobConf-java.lang.String-">setClassLoaderContext(JobConf, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the name of the classloader context on this scanner</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#setClassLoaderContext-org.apache.hadoop.mapreduce.Job-java.lang.String-">setClassLoaderContext(Job, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the name of the classloader context on this scanner</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ScannerBase.html#setClassLoaderContext-java.lang.String-">setClassLoaderContext(String)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ScannerBase.html" title="interface in org.apache.accumulo.core.client">ScannerBase</a></dt>
 <dd>
 <div class="block">Sets the name of the classloader context on this scanner.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#setClientInfo-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.ClientInfo-">setClientInfo(JobConf, ClientInfo)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
-<dd>
-<div class="block">Sets connection information needed to communicate with Accumulo for this job</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#setClientInfo-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.ClientInfo-">setClientInfo(JobConf, ClientInfo)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
-<dd>
-<div class="block">Set the connection information needed to communicate with Accumulo in this job.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#setClientInfo-org.apache.hadoop.mapreduce.Job-org.apache.accumulo.core.client.ClientInfo-">setClientInfo(Job, ClientInfo)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
-<dd>
-<div class="block">Sets connection information needed to communicate with Accumulo for this job</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#setClientInfo-org.apache.hadoop.mapreduce.Job-org.apache.accumulo.core.client.ClientInfo-">setClientInfo(Job, ClientInfo)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
-<dd>
-<div class="block">Set the connection information needed to communicate with Accumulo in this job.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#setClientPropertiesFile-org.apache.hadoop.mapred.JobConf-java.lang.String-">setClientPropertiesFile(JobConf, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
-<dd>
-<div class="block">Set Accumulo client properties file used to connect to Accumulo</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#setClientPropertiesFile-org.apache.hadoop.mapred.JobConf-java.lang.String-">setClientPropertiesFile(JobConf, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
-<dd>
-<div class="block">Set Accumulo client properties file used to connect to Accumulo</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#setClientPropertiesFile-org.apache.hadoop.mapreduce.Job-java.lang.String-">setClientPropertiesFile(Job, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
-<dd>
-<div class="block">Set Accumulo client properties file used to connect to Accumulo</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#setClientPropertiesFile-org.apache.hadoop.mapreduce.Job-java.lang.String-">setClientPropertiesFile(Job, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
-<dd>
-<div class="block">Set Accumulo client properties file used to connect to Accumulo</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/CompactionConfig.html#setCompactionStrategy-org.apache.accumulo.core.client.admin.CompactionStrategyConfig-">setCompactionStrategy(CompactionStrategyConfig)</a></span> - Method in class org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/CompactionConfig.html" title="class in org.apache.accumulo.core.client.admin">CompactionConfig</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html#setCompressionType-org.apache.hadoop.mapred.JobConf-java.lang.String-">setCompressionType(JobConf, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloFileOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the compression type to use for data blocks.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html#setCompressionType-org.apache.hadoop.mapreduce.Job-java.lang.String-">setCompressionType(Job, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloFileOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the compression type to use for data blocks.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/lib/partition/KeyRangePartitioner.html#setConf-org.apache.hadoop.conf.Configuration-">setConf(Configuration)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.lib.partition.<a href="org/apache/accumulo/core/client/mapreduce/lib/partition/KeyRangePartitioner.html" title="class in org.apache.accumulo.core.client.mapreduce.lib.partition">KeyRangePartitioner</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.html#setConf-org.apache.hadoop.conf.Configuration-">setConf(Configuration)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.lib.partition.<a href="org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.html" title="class in org.apache.accumulo.core.client.mapreduce.lib.partition">RangePartitioner</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#setConnectorInfo-org.apache.hadoop.mapred.JobConf-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-">setConnectorInfo(JobConf, String, AuthenticationToken)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.clie [...]
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0, use <a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#setClientInfo-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.ClientInfo-"><code>AbstractInputFormat.setClientInfo(JobConf, ClientInfo)</code></a> instead</span></div>
-</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Sets the connector information needed to communicate with Accumulo in this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#setConnectorInfo-org.apache.hadoop.mapred.JobConf-java.lang.String-java.lang.String-">setConnectorInfo(JobConf, String, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0, use <a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#setClientPropertiesFile-org.apache.hadoop.mapred.JobConf-java.lang.String-"><code>AbstractInputFormat.setClientPropertiesFile(JobConf, String)</code></a> instead</span></div>
-</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Sets the connector information needed to communicate with Accumulo in this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#setConnectorInfo-org.apache.hadoop.mapred.JobConf-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-">setConnectorInfo(JobConf, String, AuthenticationToken)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.cl [...]
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0, use <a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#setClientInfo-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.ClientInfo-"><code>AccumuloOutputFormat.setClientInfo(JobConf, ClientInfo)</code></a> instead.</span></div>
-</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Sets the connector information needed to communicate with Accumulo in this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#setConnectorInfo-org.apache.hadoop.mapred.JobConf-java.lang.String-java.lang.String-">setConnectorInfo(JobConf, String, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0, use <a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#setClientPropertiesFile-org.apache.hadoop.mapred.JobConf-java.lang.String-"><code>AccumuloOutputFormat.setClientPropertiesFile(JobConf, String)</code></a> instead</span></div>
-</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Sets the connector information needed to communicate with Accumulo in this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#setConnectorInfo-org.apache.hadoop.mapreduce.Job-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-">setConnectorInfo(Job, String, AuthenticationToken)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core. [...]
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0; use <a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#setClientInfo-org.apache.hadoop.mapreduce.Job-org.apache.accumulo.core.client.ClientInfo-"><code>AbstractInputFormat.setClientInfo(Job, ClientInfo)</code></a> instead.</span></div>
-</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Sets the connector information needed to communicate with Accumulo in this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#setConnectorInfo-org.apache.hadoop.mapreduce.Job-java.lang.String-java.lang.String-">setConnectorInfo(Job, String, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0, use <a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#setClientPropertiesFile-org.apache.hadoop.mapreduce.Job-java.lang.String-"><code>AbstractInputFormat.setClientPropertiesFile(Job, String)</code></a></span></div>
-</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Sets the connector information needed to communicate with Accumulo in this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#setConnectorInfo-org.apache.hadoop.mapreduce.Job-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-">setConnectorInfo(Job, String, AuthenticationToken)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.cor [...]
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0, replaced by <a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#setClientInfo-org.apache.hadoop.mapreduce.Job-org.apache.accumulo.core.client.ClientInfo-"><code>AccumuloOutputFormat.setClientInfo(Job, ClientInfo)</code></a></span></div>
-</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Sets the connector information needed to communicate with Accumulo in this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#setConnectorInfo-org.apache.hadoop.mapreduce.Job-java.lang.String-java.lang.String-">setConnectorInfo(Job, String, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0, replaced by <a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#setClientPropertiesFile-org.apache.hadoop.mapreduce.Job-java.lang.String-"><code>AccumuloOutputFormat.setClientPropertiesFile(Job, String)</code></a></span></div>
-</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Sets the connector information needed to communicate with Accumulo in this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#setCreateTables-org.apache.hadoop.mapred.JobConf-boolean-">setCreateTables(JobConf, boolean)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the directive to create new tables, as necessary.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#setCreateTables-org.apache.hadoop.mapreduce.Job-boolean-">setCreateTables(Job, boolean)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the directive to create new tables, as necessary.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html#setDataBlockSize-org.apache.hadoop.mapred.JobConf-long-">setDataBlockSize(JobConf, long)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloFileOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the size for data blocks within each file.<br>
  Data blocks are a span of key/value pairs stored in the file that are compressed and indexed as
  a group.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html#setDataBlockSize-org.apache.hadoop.mapreduce.Job-long-">setDataBlockSize(Job, long)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloFileOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the size for data blocks within each file.<br>
  Data blocks are a span of key/value pairs stored in the file that are compressed and indexed as
  a group.</div>
@@ -4998,11 +5298,13 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#setDefaultTableName-org.apache.hadoop.mapred.JobConf-java.lang.String-">setDefaultTableName(JobConf, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the default table name to use if one emits a null in place of a table name for a given
  mutation.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#setDefaultTableName-org.apache.hadoop.mapreduce.Job-java.lang.String-">setDefaultTableName(Job, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the default table name to use if one emits a null in place of a table name for a given
  mutation.</div>
 </dd>
@@ -5020,35 +5322,27 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/CompactionConfig.html#setEndRow-org.apache.hadoop.io.Text-">setEndRow(Text)</a></span> - Method in class org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/CompactionConfig.html" title="class in org.apache.accumulo.core.client.admin">CompactionConfig</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html#setExecutionHints-org.apache.hadoop.mapred.JobConf-java.util.Map-">setExecutionHints(JobConf, Map&lt;String, String&gt;)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase</a></dt>
-<dd>
-<div class="block">Set these execution hints on scanners created for input splits.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html#setExecutionHints-org.apache.hadoop.mapred.JobConf-java.util.Map-">setExecutionHints(JobConf, Map&lt;String, String&gt;)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapreduce">InputFormatBase</a></dt>
-<dd>
-<div class="block">Set these execution hints on scanners created for input splits.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#setExecutionHints-java.util.Map-">setExecutionHints(Map&lt;String, String&gt;)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
-<dd>
-<div class="block">The execution hints to set on created scanners.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#setExecutionHints-java.util.Map-">setExecutionHints(Map&lt;String, String&gt;)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ScannerBase.html#setExecutionHints-java.util.Map-">setExecutionHints(Map&lt;String, String&gt;)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ScannerBase.html" title="interface in org.apache.accumulo.core.client">ScannerBase</a></dt>
 <dd>
 <div class="block">Set hints for the configured <code>ScanPrioritizer</code> and <code>ScanDispatcher</code>.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#setFetchedColumns-java.util.Collection-">setFetchedColumns(Collection&lt;Pair&lt;Text, Text&gt;&gt;)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#setFetchedColumns-java.util.Set-">setFetchedColumns(Set&lt;Pair&lt;Text, Text&gt;&gt;)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html#setFileBlockSize-org.apache.hadoop.mapred.JobConf-long-">setFileBlockSize(JobConf, long)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloFileOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the size for file blocks in the file system; file blocks are managed, and replicated, by
  the underlying file system.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html#setFileBlockSize-org.apache.hadoop.mapreduce.Job-long-">setFileBlockSize(Job, long)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloFileOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the size for file blocks in the file system; file blocks are managed, and replicated, by
  the underlying file system.</div>
 </dd>
@@ -5056,36 +5350,49 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html#setIndexBlockSize-org.apache.hadoop.mapred.JobConf-long-">setIndexBlockSize(JobConf, long)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloFileOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the size for index blocks within each file; smaller blocks means a deeper index hierarchy
  within the file, while larger blocks mean a more shallow index hierarchy within the file.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html#setIndexBlockSize-org.apache.hadoop.mapreduce.Job-long-">setIndexBlockSize(Job, long)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloFileOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the size for index blocks within each file; smaller blocks means a deeper index hierarchy
  within the file, while larger blocks mean a more shallow index hierarchy within the file.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.html#setInputTableConfigs-org.apache.hadoop.mapred.JobConf-java.util.Map-">setInputTableConfigs(JobConf, Map&lt;String, InputTableConfig&gt;)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloMultiTableInputF [...]
 <dd>
-<div class="block">Sets the <a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce"><code>InputTableConfig</code></a> objects on the given Hadoop configuration</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Sets the <a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce"><code>InputTableConfig</code></a> objects on the
+ given Hadoop configuration</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.html#setInputTableConfigs-org.apache.hadoop.mapreduce.Job-java.util.Map-">setInputTableConfigs(Job, Map&lt;String, InputTableConfig&gt;)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloMultiTabl [...]
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the <a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce"><code>InputTableConfig</code></a> objects on the given Hadoop configuration</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html#setInputTableName-org.apache.hadoop.mapred.JobConf-java.lang.String-">setInputTableName(JobConf, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the name of the input table, over which this job will scan.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html#setInputTableName-org.apache.hadoop.mapreduce.Job-java.lang.String-">setInputTableName(Job, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapreduce">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the name of the input table, over which this job will scan.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#setInstanceName-java.lang.String-">setInstanceName(String)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloConfig.html#setInstanceName-java.lang.String-">setInstanceName(String)</a></span> - Method in class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloConfig.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloConfig</a></dt>
 <dd>
 <div class="block">Calling this method is optional.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#setIsolatedScan-java.lang.Boolean-">setIsolatedScan(Boolean)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/IteratorSetting.html#setIteratorClass-java.lang.String-">setIteratorClass(String)</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/IteratorSetting.html" title="class in org.apache.accumulo.core.client">IteratorSetting</a></dt>
 <dd>
 <div class="block">Set the name of the class that implements the iterator.</div>
@@ -5094,10 +5401,13 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#setIterators-java.util.List-">setIterators(List&lt;IteratorSetting&gt;)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Set iterators on to be used in the query.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#setIterators-java.util.List-">setIterators(List&lt;IteratorSetting&gt;)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/Condition.html#setIterators-org.apache.accumulo.core.client.IteratorSetting...-">setIterators(IteratorSetting...)</a></span> - Method in class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/Condition.html" title="class in org.apache.accumulo.core.data">Condition</a></dt>
 <dd>
 <div class="block">Set iterators to use when reading the columns value.</div>
@@ -5111,10 +5421,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html#setLocalIterators-org.apache.hadoop.mapred.JobConf-boolean-">setLocalIterators(JobConf, boolean)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Controls the use of the <a href="org/apache/accumulo/core/client/ClientSideIteratorScanner.html" title="class in org.apache.accumulo.core.client"><code>ClientSideIteratorScanner</code></a> in this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html#setLocalIterators-org.apache.hadoop.mapreduce.Job-boolean-">setLocalIterators(Job, boolean)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapreduce">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Controls the use of the <a href="org/apache/accumulo/core/client/ClientSideIteratorScanner.html" title="class in org.apache.accumulo.core.client"><code>ClientSideIteratorScanner</code></a> in this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/NewTableConfiguration.html#setLocalityGroups-java.util.Map-">setLocalityGroups(Map&lt;String, Set&lt;Text&gt;&gt;)</a></span> - Method in class org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/NewTableConfiguration.html" title="class in org.apache.accumulo.core.client.admin">NewTableConfiguration</a></dt>
@@ -5126,25 +5438,33 @@
 <div class="block">Sets a table's locality groups.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#setLocations-java.lang.String:A-">setLocations(String[])</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#setLogLevel-org.apache.hadoop.mapred.JobConf-org.apache.log4j.Level-">setLogLevel(JobConf, Level)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the log level for this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#setLogLevel-org.apache.hadoop.mapred.JobConf-org.apache.log4j.Level-">setLogLevel(JobConf, Level)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the log level for this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#setLogLevel-org.apache.hadoop.mapreduce.Job-org.apache.log4j.Level-">setLogLevel(Job, Level)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the log level for this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#setLogLevel-org.apache.hadoop.mapreduce.Job-org.apache.log4j.Level-">setLogLevel(Job, Level)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the log level for this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#setLogLevel-org.apache.log4j.Level-">setLogLevel(Level)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/BatchWriterConfig.html#setMaxLatency-long-java.util.concurrent.TimeUnit-">setMaxLatency(long, TimeUnit)</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/BatchWriterConfig.html" title="class in org.apache.accumulo.core.client">BatchWriterConfig</a></dt>
 <dd>
 <div class="block">Sets the maximum amount of time to hold the data in memory before flushing it to servers.<br>
@@ -5176,10 +5496,12 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/lib/partition/KeyRangePartitioner.html#setNumSubBins-org.apache.hadoop.mapreduce.Job-int-">setNumSubBins(Job, int)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.lib.partition.<a href="org/apache/accumulo/core/client/mapreduce/lib/partition/KeyRangePartitioner.html" title="class in org.apache.accumulo.core.client.mapreduce.lib.partition">KeyRangePartitioner</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the number of random sub-bins per range</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.html#setNumSubBins-org.apache.hadoop.mapreduce.Job-int-">setNumSubBins(Job, int)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.lib.partition.<a href="org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.html" title="class in org.apache.accumulo.core.client.mapreduce.lib.partition">RangePartitioner</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the number of random sub-bins per range</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloConfig.html#setNumTservers-int-">setNumTservers(int)</a></span> - Method in class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloConfig.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloConfig</a></dt>
@@ -5187,17 +5509,22 @@
 <div class="block">Calling this method is optional.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#setOffline-java.lang.Boolean-">setOffline(Boolean)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#setOfflineScan-boolean-">setOfflineScan(boolean)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Enable reading offline tables.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html#setOfflineTableScan-org.apache.hadoop.mapred.JobConf-boolean-">setOfflineTableScan(JobConf, boolean)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Enable reading offline tables.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html#setOfflineTableScan-org.apache.hadoop.mapreduce.Job-boolean-">setOfflineTableScan(Job, boolean)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapreduce">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Enable reading offline tables.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/CompactionStrategyConfig.html#setOptions-java.util.Map-">setOptions(Map&lt;String, String&gt;)</a></span> - Method in class org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/CompactionStrategyConfig.html" title="class in org.apache.accumulo.core.client.admin">CompactionStrategyConfig</a></dt>
@@ -5208,6 +5535,10 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/security/tokens/PasswordToken.html#setPassword-java.nio.CharBuffer-">setPassword(CharBuffer)</a></span> - Method in class org.apache.accumulo.core.client.security.tokens.<a href="org/apache/accumulo/core/client/security/tokens/PasswordToken.html" title="class in org.apache.accumulo.core.client.security.tokens">PasswordToken</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#setPrincipal-java.lang.String-">setPrincipal(String)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/IteratorSetting.html#setPriority-int-">setPriority(int)</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/IteratorSetting.html" title="class in org.apache.accumulo.core.client">IteratorSetting</a></dt>
 <dd>
 <div class="block">Set layer at which this iterator applies.</div>
@@ -5247,7 +5578,9 @@
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/IsolatedScanner.html#setRange-org.apache.accumulo.core.data.Range-">setRange(Range)</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/IsolatedScanner.html" title="class in org.apache.accumulo.core.client">IsolatedScanner</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#setRange-org.apache.accumulo.core.data.Range-">setRange(Range)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/Scanner.html#setRange-org.apache.accumulo.core.data.Range-">setRange(Range)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/Scanner.html" title="interface in org.apache.accumulo.core.client">Scanner</a></dt>
 <dd>
 <div class="block">Sets the range of keys to scan over.</div>
@@ -5262,14 +5595,17 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html#setRanges-org.apache.hadoop.mapred.JobConf-java.util.Collection-">setRanges(JobConf, Collection&lt;Range&gt;)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the input ranges to scan for this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html#setRanges-org.apache.hadoop.mapreduce.Job-java.util.Collection-">setRanges(Job, Collection&lt;Range&gt;)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapreduce">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the input ranges to scan for the single input table associated with this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#setRanges-java.util.List-">setRanges(List&lt;Range&gt;)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the input ranges to scan for all tables associated with this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ClientSideIteratorScanner.html#setReadaheadThreshold-long-">setReadaheadThreshold(long)</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ClientSideIteratorScanner.html" title="class in org.apache.accumulo.core.client">ClientSideIteratorScanner</a></dt>
@@ -5283,11 +5619,13 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html#setReplication-org.apache.hadoop.mapred.JobConf-int-">setReplication(JobConf, int)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloFileOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the file system replication factor for the resulting file, overriding the file system
  default.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html#setReplication-org.apache.hadoop.mapreduce.Job-int-">setReplication(Job, int)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloFileOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the file system replication factor for the resulting file, overriding the file system
  default.</div>
 </dd>
@@ -5299,10 +5637,12 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html#setSampler-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.sample.SamplerConfiguration-">setSampler(JobConf, SamplerConfiguration)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloFileOutputForma [...]
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Specify a sampler to be used when writing out data.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html#setSampler-org.apache.hadoop.mapreduce.Job-org.apache.accumulo.core.client.sample.SamplerConfiguration-">setSampler(Job, SamplerConfiguration)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloFileOutp [...]
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Specify a sampler to be used when writing out data.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/TableOperations.html#setSamplerConfiguration-java.lang.String-org.apache.accumulo.core.client.sample.SamplerConfiguration-">setSamplerConfiguration(String, SamplerConfiguration)</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/TableOperations.html" title="interface in org.apache.accumulo.core.client.admin">TableOperations</a></dt>
@@ -5311,18 +5651,23 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html#setSamplerConfiguration-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.sample.SamplerConfiguration-">setSamplerConfiguration(JobConf, SamplerConfiguration)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase [...]
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Causes input format to read sample data.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html#setSamplerConfiguration-org.apache.hadoop.mapreduce.Job-org.apache.accumulo.core.client.sample.SamplerConfiguration-">setSamplerConfiguration(Job, SamplerConfiguration)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapreduce">InputFor [...]
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Causes input format to read sample data.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#setSamplerConfiguration-org.apache.accumulo.core.client.sample.SamplerConfiguration-">setSamplerConfiguration(SamplerConfiguration)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Set the sampler configuration to use when reading from the data.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#setSamplerConfiguration-org.apache.accumulo.core.client.sample.SamplerConfiguration-">setSamplerConfiguration(SamplerConfiguration)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ScannerBase.html#setSamplerConfiguration-org.apache.accumulo.core.client.sample.SamplerConfiguration-">setSamplerConfiguration(SamplerConfiguration)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ScannerBase.html" title="interface in org.apache.accumulo.core.client">ScannerBase</a></dt>
 <dd>
 <div class="block">Setting this will cause the scanner to read sample data, as long as that sample data was
@@ -5330,26 +5675,32 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#setScanAuthorizations-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.security.Authorizations-">setScanAuthorizations(JobConf, Authorizations)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the <a href="org/apache/accumulo/core/security/Authorizations.html" title="class in org.apache.accumulo.core.security"><code>Authorizations</code></a> used to scan.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#setScanAuthorizations-org.apache.hadoop.mapreduce.Job-org.apache.accumulo.core.security.Authorizations-">setScanAuthorizations(Job, Authorizations)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the <a href="org/apache/accumulo/core/security/Authorizations.html" title="class in org.apache.accumulo.core.security"><code>Authorizations</code></a> used to scan.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html#setScanIsolation-org.apache.hadoop.mapred.JobConf-boolean-">setScanIsolation(JobConf, boolean)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Controls the use of the <a href="org/apache/accumulo/core/client/IsolatedScanner.html" title="class in org.apache.accumulo.core.client"><code>IsolatedScanner</code></a> in this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html#setScanIsolation-org.apache.hadoop.mapreduce.Job-boolean-">setScanIsolation(Job, boolean)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapreduce">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Controls the use of the <a href="org/apache/accumulo/core/client/IsolatedScanner.html" title="class in org.apache.accumulo.core.client"><code>IsolatedScanner</code></a> in this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#setSimulationMode-org.apache.hadoop.mapred.JobConf-boolean-">setSimulationMode(JobConf, boolean)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the directive to use simulation mode for this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#setSimulationMode-org.apache.hadoop.mapreduce.Job-boolean-">setSimulationMode(Job, boolean)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the directive to use simulation mode for this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloConfig.html#setSiteConfig-java.util.Map-">setSiteConfig(Map&lt;String, String&gt;)</a></span> - Method in class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloConfig.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloConfig</a></dt>
@@ -5362,30 +5713,34 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/lib/partition/KeyRangePartitioner.html#setSplitFile-org.apache.hadoop.mapreduce.Job-java.lang.String-">setSplitFile(Job, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.lib.partition.<a href="org/apache/accumulo/core/client/mapreduce/lib/partition/KeyRangePartitioner.html" title="class in org.apache.accumulo.core.client.mapreduce.lib.partition">KeyRangePartitioner</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the hdfs file name to use, containing a newline separated list of Base64 encoded split
  points that represent ranges for partitioning</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.html#setSplitFile-org.apache.hadoop.mapreduce.Job-java.lang.String-">setSplitFile(Job, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.lib.partition.<a href="org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.html" title="class in org.apache.accumulo.core.client.mapreduce.lib.partition">RangePartitioner</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Sets the hdfs file name to use, containing a newline separated list of Base64 encoded split
  points that represent ranges for partitioning</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/CompactionConfig.html#setStartRow-org.apache.hadoop.io.Text-">setStartRow(Text)</a></span> - Method in class org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/CompactionConfig.html" title="class in org.apache.accumulo.core.client.admin">CompactionConfig</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html#setSummarizers-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.summary.SummarizerConfiguration...-">setSummarizers(JobConf, SummarizerConfiguration...)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">Ac [...]
-<dd>
-<div class="block">Specifies a list of summarizer configurations to create summary data in the output file.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html#setSummarizers-org.apache.hadoop.mapreduce.Job-org.apache.accumulo.core.client.summary.SummarizerConfiguration...-">setSummarizers(Job, SummarizerConfiguration...)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred [...]
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#setTable-java.lang.String-">setTable(String)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
 <dd>
-<div class="block">Specifies a list of summarizer configurations to create summary data in the output file.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 1.6.1, use setTableName() instead.</span></div>
+</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#setTableId-java.lang.String-">setTableId(String)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloSecurityException.html#setTableInfo-java.lang.String-">setTableInfo(String)</a></span> - Method in exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloSecurityException.html" title="class in org.apache.accumulo.core.client">AccumuloSecurityException</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#setTableName-java.lang.String-">setTableName(String)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/BatchScanner.html#setTimeout-long-java.util.concurrent.TimeUnit-">setTimeout(long, TimeUnit)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/BatchScanner.html" title="interface in org.apache.accumulo.core.client">BatchScanner</a></dt>
 <dd>
 <div class="block">This setting determines how long a scanner will automatically retry when a failure occurs.</div>
@@ -5394,24 +5749,10 @@
 <dd>
 <div class="block">Sets the maximum amount of time an unresponsive server will be re-tried.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ClientSideIteratorScanner.html#setTimeOut-int-">setTimeOut(int)</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ClientSideIteratorScanner.html" title="class in org.apache.accumulo.core.client">ClientSideIteratorScanner</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ConditionalWriterConfig.html#setTimeout-long-java.util.concurrent.TimeUnit-">setTimeout(long, TimeUnit)</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ConditionalWriterConfig.html" title="class in org.apache.accumulo.core.client">ConditionalWriterConfig</a></dt>
 <dd>
 <div class="block">Sets the maximum amount of time an unresponsive server will be re-tried.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/IsolatedScanner.html#setTimeOut-int-">setTimeOut(int)</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/IsolatedScanner.html" title="class in org.apache.accumulo.core.client">IsolatedScanner</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/Scanner.html#setTimeOut-int-">setTimeOut(int)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/Scanner.html" title="interface in org.apache.accumulo.core.client">Scanner</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Since 1.5. See <a href="org/apache/accumulo/core/client/ScannerBase.html#setTimeout-long-java.util.concurrent.TimeUnit-"><code>ScannerBase.setTimeout(long, java.util.concurrent.TimeUnit)</code></a></span></div>
-</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ScannerBase.html#setTimeout-long-java.util.concurrent.TimeUnit-">setTimeout(long, TimeUnit)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ScannerBase.html" title="interface in org.apache.accumulo.core.client">ScannerBase</a></dt>
 <dd>
 <div class="block">This setting determines how long a scanner will automatically retry when a failure occurs.</div>
@@ -5428,23 +5769,68 @@
 <dd>
 <div class="block">Configure logical or millisecond time for tables created with this configuration.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#setToken-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-">setToken(AuthenticationToken)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#setToken-java.lang.String-">setToken(String)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/DelegationTokenConfig.html#setTokenLifetime-long-java.util.concurrent.TimeUnit-">setTokenLifetime(long, TimeUnit)</a></span> - Method in class org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/DelegationTokenConfig.html" title="class in org.apache.accumulo.core.client.admin">DelegationTokenConfig</a></dt>
 <dd>
 <div class="block">Requests a specific lifetime for the token that is different than the default system lifetime.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html#setupIterators-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.Scanner-java.lang.String-org.apache.accumulo.core.client.mapred.RangeInputSplit-">setupIterators(JobConf, Scanner, String, RangeInputSplit)</a></span> - Method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractR [...]
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 1.7.0; Use <a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html#jobIterators-org.apache.hadoop.mapred.JobConf-java.lang.String-"><code>AbstractInputFormat.AbstractRecordReader.jobIterators(org.apache.hadoop.mapred.JobConf, java.lang.String)</code></a> instead.</span></div>
+</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.RecordReaderBase.html#setupIterators-java.util.List-org.apache.accumulo.core.client.Scanner-">setupIterators(List&lt;IteratorSetting&gt;, Scanner)</a></span> - Method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.RecordReaderBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase.RecordReaderBase</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 1.7.0; Use <a href="org/apache/accumulo/core/client/mapred/InputFormatBase.RecordReaderBase.html#jobIterators-org.apache.hadoop.mapred.JobConf-java.lang.String-"><code>InputFormatBase.RecordReaderBase.jobIterators(org.apache.hadoop.mapred.JobConf, java.lang.String)</code></a> instead.</span></div>
+</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.RecordReaderBase.html#setupIterators-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.Scanner-">setupIterators(JobConf, Scanner)</a></span> - Method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.RecordReaderBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase.RecordReaderBase</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html#setupIterators-org.apache.hadoop.mapreduce.TaskAttemptContext-org.apache.accumulo.core.client.Scanner-java.lang.String-org.apache.accumulo.core.client.mapreduce.RangeInputSplit-">setupIterators(TaskAttemptContext, Scanner, String, RangeInputSplit)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/ma [...]
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 1.7.0; Use <a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html#contextIterators-org.apache.hadoop.mapreduce.TaskAttemptContext-java.lang.String-"><code>AbstractInputFormat.AbstractRecordReader.contextIterators(org.apache.hadoop.mapreduce.TaskAttemptContext, java.lang.String)</code></a> instead.</span></div>
+</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.RecordReaderBase.html#setupIterators-org.apache.hadoop.mapreduce.TaskAttemptContext-org.apache.accumulo.core.client.Scanner-">setupIterators(TaskAttemptContext, Scanner)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.RecordReaderBase.html" title="class in org.apache.accumulo.core.client.mapreduce">In [...]
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 1.7.0; Use <a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.RecordReaderBase.html#contextIterators-org.apache.hadoop.mapreduce.TaskAttemptContext-java.lang.String-"><code>InputFormatBase.RecordReaderBase.contextIterators(org.apache.hadoop.mapreduce.TaskAttemptContext, java.lang.String)</code></a> instead.</span></div>
+</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.RecordReaderBase.html#setupIterators-org.apache.hadoop.mapreduce.TaskAttemptContext-org.apache.accumulo.core.client.Scanner-org.apache.accumulo.core.client.mapreduce.RangeInputSplit-">setupIterators(TaskAttemptContext, Scanner, RangeInputSplit)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.RecordRea [...]
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 1.7.0; Use <a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.RecordReaderBase.html#contextIterators-org.apache.hadoop.mapreduce.TaskAttemptContext-java.lang.String-"><code>InputFormatBase.RecordReaderBase.contextIterators(org.apache.hadoop.mapreduce.TaskAttemptContext, java.lang.String)</code></a> instead.</span></div>
+</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#setUseIsolatedScanners-boolean-">setUseIsolatedScanners(boolean)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Controls the use of the <a href="org/apache/accumulo/core/client/IsolatedScanner.html" title="class in org.apache.accumulo.core.client"><code>IsolatedScanner</code></a> in this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#setUseLocalIterators-boolean-">setUseLocalIterators(boolean)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
 <dd>
-<div class="block">Controls the use of the <a href="org/apache/accumulo/core/client/ClientSideIteratorScanner.html" title="class in org.apache.accumulo.core.client"><code>ClientSideIteratorScanner</code></a> in
- this job.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Controls the use of the <a href="org/apache/accumulo/core/client/ClientSideIteratorScanner.html" title="class in org.apache.accumulo.core.client"><code>ClientSideIteratorScanner</code></a> in this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloSecurityException.html#setUser-java.lang.String-">setUser(String)</a></span> - Method in exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloSecurityException.html" title="class in org.apache.accumulo.core.client">AccumuloSecurityException</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#setUsesLocalIterators-java.lang.Boolean-">setUsesLocalIterators(Boolean)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/Condition.html#setValue-java.lang.CharSequence-">setValue(CharSequence)</a></span> - Method in class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/Condition.html" title="class in org.apache.accumulo.core.data">Condition</a></dt>
 <dd>
 <div class="block">This method sets the expected value of a column.</div>
@@ -5469,48 +5855,81 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.html#setWithCredentialProviders-java.lang.String-java.lang.String-">setWithCredentialProviders(String, String)</a></span> - Method in class org.apache.accumulo.core.client.security.tokens.<a href="org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.html" title="class in org.apache.accumulo.core.client.security.tokens">CredentialProviderToken</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#setZooKeeperInstance-org.apache.hadoop.mapred.JobConf-java.lang.String-java.lang.String-">setZooKeeperInstance(JobConf, String, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 1.6.0; Use
+             <a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#setZooKeeperInstance-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.ClientConfiguration-"><code>AbstractInputFormat.setZooKeeperInstance(JobConf, org.apache.accumulo.core.client.ClientConfiguration)</code></a>
+             instead.</span></div>
+</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#setZooKeeperInstance-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.ClientConfiguration-">setZooKeeperInstance(JobConf, ClientConfiguration)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Configures a <a href="org/apache/accumulo/core/client/ZooKeeperInstance.html" title="class in org.apache.accumulo.core.client"><code>ZooKeeperInstance</code></a> for this job.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#setZooKeeperInstance-org.apache.hadoop.mapred.JobConf-java.lang.String-java.lang.String-">setZooKeeperInstance(JobConf, String, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat</a></dt>
+<dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0; Use <a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#setClientInfo-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.ClientInfo-"><code>AbstractInputFormat.setClientInfo(JobConf, ClientInfo)</code></a> instead.</span></div>
+<div class="block"><span class="deprecationComment">since 1.6.0; Use
+             <a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#setZooKeeperInstance-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.ClientConfiguration-"><code>AccumuloOutputFormat.setZooKeeperInstance(JobConf, org.apache.accumulo.core.client.ClientConfiguration)</code></a>
+             instead.</span></div>
 </div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#setZooKeeperInstance-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.ClientConfiguration-">setZooKeeperInstance(JobConf, ClientConfiguration)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat [...]
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Configures a <a href="org/apache/accumulo/core/client/ZooKeeperInstance.html" title="class in org.apache.accumulo.core.client"><code>ZooKeeperInstance</code></a> for this job.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#setZooKeeperInstance-org.apache.hadoop.mapreduce.Job-java.lang.String-java.lang.String-">setZooKeeperInstance(Job, String, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
+<dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0; Use <a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html#setClientInfo-org.apache.hadoop.mapred.JobConf-org.apache.accumulo.core.client.ClientInfo-"><code>AccumuloOutputFormat.setClientInfo(JobConf, ClientInfo)</code></a> instead.</span></div>
+<div class="block"><span class="deprecationComment">since 1.6.0</span></div>
 </div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#setZooKeeperInstance-org.apache.hadoop.mapreduce.Job-org.apache.accumulo.core.client.ClientConfiguration-">setZooKeeperInstance(Job, ClientConfiguration)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFo [...]
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Configures a <a href="org/apache/accumulo/core/client/ZooKeeperInstance.html" title="class in org.apache.accumulo.core.client"><code>ZooKeeperInstance</code></a> for this job.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#setZooKeeperInstance-org.apache.hadoop.mapreduce.Job-java.lang.String-java.lang.String-">setZooKeeperInstance(Job, String, String)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat</a></dt>
+<dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0; Use <a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#setClientInfo-org.apache.hadoop.mapreduce.Job-org.apache.accumulo.core.client.ClientInfo-"><code>AbstractInputFormat.setClientInfo(Job, ClientInfo)</code></a> instead.</span></div>
+<div class="block"><span class="deprecationComment">since 1.6.0; Use
+             <a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#setZooKeeperInstance-org.apache.hadoop.mapreduce.Job-org.apache.accumulo.core.client.ClientConfiguration-"><code>AccumuloOutputFormat.setZooKeeperInstance(Job, org.apache.accumulo.core.client.ClientConfiguration)</code></a>
+             instead.</span></div>
 </div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#setZooKeeperInstance-org.apache.hadoop.mapreduce.Job-org.apache.accumulo.core.client.ClientConfiguration-">setZooKeeperInstance(Job, ClientConfiguration)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutpu [...]
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0; Use <a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html#setClientInfo-org.apache.hadoop.mapreduce.Job-org.apache.accumulo.core.client.ClientInfo-"><code>AccumuloOutputFormat.setClientInfo(Job, ClientInfo)</code></a> instead.</span></div>
-</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Configures a <a href="org/apache/accumulo/core/client/ZooKeeperInstance.html" title="class in org.apache.accumulo.core.client"><code>ZooKeeperInstance</code></a> for this job.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloConfig.html#setZooKeeperPort-int-">setZooKeeperPort(int)</a></span> - Method in class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloConfig.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloConfig</a></dt>
 <dd>
 <div class="block">Calling this method is optional.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#setZooKeepers-java.lang.String-">setZooKeepers(String)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloConfig.html#setZooKeeperStartupTime-long-">setZooKeeperStartupTime(long)</a></span> - Method in class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloConfig.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloConfig</a></dt>
 <dd>
 <div class="block">Configure the time to wait for ZooKeeper to startup.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#shouldAutoAdjustRanges--">shouldAutoAdjustRanges()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Determines whether a configuration has auto-adjust ranges enabled.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#shouldUseIsolatedScanners--">shouldUseIsolatedScanners()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Determines whether a configuration has isolation enabled.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#shouldUseLocalIterators--">shouldUseLocalIterators()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Determines whether a configuration uses local iterators.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/security/tokens/AuthenticationToken.Properties.html#size--">size()</a></span> - Method in class org.apache.accumulo.core.client.security.tokens.<a href="org/apache/accumulo/core/client/security/tokens/AuthenticationToken.Properties.html" title="class in org.apache.accumulo.core.client.security.tokens">AuthenticationToken.Properties</a></dt>
@@ -5524,9 +5943,13 @@
 <div class="block">Gets the size of this collection of authorizations.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html#split">split</a></span> - Variable in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat.AbstractRecordReader</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html#split">split</a></span> - Variable in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat.AbstractRecordReader</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/TableOperations.html#splitRangeByTablets-java.lang.String-org.apache.accumulo.core.data.Range-int-">splitRangeByTablets(String, Range, int)</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/TableOperations.html" title="interface in org.apache.accumulo.core.client.admin">TableOperations</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html#start--">start()</a></span> - Method in class org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MiniAccumuloCluster.html" title="class in org.apache.accumulo.minicluster">MiniAccumuloCluster</a></dt>
@@ -5656,6 +6079,8 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/TableDeletedException.html#TableDeletedException-java.lang.String-">TableDeletedException(String)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/TableDeletedException.html" title="class in org.apache.accumulo.core.client">TableDeletedException</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/TableDeletedException.html#TableDeletedException-java.lang.String-java.lang.Exception-">TableDeletedException(String, Exception)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/TableDeletedException.html" title="class in org.apache.accumulo.core.client">TableDeletedException</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/accumulo/core/client/TableExistsException.html" title="class in org.apache.accumulo.core.client"><span class="typeNameLink">TableExistsException</span></a> - Exception in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
 <dd>
 <div class="block">Thrown when the table specified already exists, and it was expected that it didn't</div>
@@ -5664,7 +6089,7 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/TableExistsException.html#TableExistsException-java.lang.String-java.lang.String-java.lang.String-java.lang.Throwable-">TableExistsException(String, String, String, Throwable)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/TableExistsException.html" title="class in org.apache.accumulo.core.client">TableExistsException</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/TableExistsException.html#TableExistsException-org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException-">TableExistsException(ThriftTableOperationException)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/TableExistsException.html" title="class in org.apache.accumulo.core.client">TableExistsException</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/TableExistsException.html#TableExistsException-org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException-">TableExistsException(ThriftTableOperationException)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/TableExistsException.html" title="class in org.apache.accumulo.core.client">TableExistsException</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/TableOperations.html#tableIdMap--">tableIdMap()</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/TableOperations.html" title="interface in org.apache.accumulo.core.client.admin">TableOperations</a></dt>
 <dd>
@@ -5678,7 +6103,7 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/TableNotFoundException.html#TableNotFoundException-java.lang.String-java.lang.String-java.lang.String-java.lang.Throwable-">TableNotFoundException(String, String, String, Throwable)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/TableNotFoundException.html" title="class in org.apache.accumulo.core.client">TableNotFoundException</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/TableNotFoundException.html#TableNotFoundException-org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException-">TableNotFoundException(ThriftTableOperationException)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/TableNotFoundException.html" title="class in org.apache.accumulo.core.client">TableNotFoundException</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/TableNotFoundException.html#TableNotFoundException-org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException-">TableNotFoundException(ThriftTableOperationException)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/TableNotFoundException.html" title="class in org.apache.accumulo.core.client">TableNotFoundException</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/TableNotFoundException.html#TableNotFoundException-java.lang.String-org.apache.accumulo.core.client.NamespaceNotFoundException-">TableNotFoundException(String, NamespaceNotFoundException)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/TableNotFoundException.html" title="class in org.apache.accumulo.core.client">TableNotFoundException</a></dt>
 <dd>&nbsp;</dd>
@@ -5692,6 +6117,8 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/TableOfflineException.html#TableOfflineException-java.lang.String-">TableOfflineException(String)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/TableOfflineException.html" title="class in org.apache.accumulo.core.client">TableOfflineException</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/TableOfflineException.html#TableOfflineException-java.lang.Exception-">TableOfflineException(Exception)</a></span> - Constructor for exception org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/TableOfflineException.html" title="class in org.apache.accumulo.core.client">TableOfflineException</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.html#tableOperations--">tableOperations()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client">AccumuloClient</a></dt>
 <dd>
 <div class="block">Retrieves a TableOperations object to perform table functions, such as create and delete.</div>
@@ -5723,7 +6150,7 @@
 <dd>
 <div class="block">A TabletId provides the information needed to uniquely identify a tablet.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/TableOperations.ImportOptions.html#tableTime--">tableTime()</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/TableOperations.ImportOptions.html" title="interface in org.apache.accumulo.core.client.admin">TableOperations.ImportOptions</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/TableOperations.ImportOptions.html#tableTime-boolean-">tableTime(boolean)</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/TableOperations.ImportOptions.html" title="interface in org.apache.accumulo.core.client.admin">TableOperations.ImportOptions</a></dt>
 <dd>
 <div class="block">Use table's next timestamp to override all timestamps in imported files.</div>
 </dd>
@@ -5767,6 +6194,8 @@
 <dd>
 <div class="block">The type of ordering to use for the table's entries (default is MILLIS)</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html#to-java.lang.CharSequence-java.lang.CharSequence-">to(CharSequence, CharSequence)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.InstanceArgs</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/TableOperations.ImportDestinationArguments.html#to-java.lang.String-">to(String)</a></span> - Method in interface org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/TableOperations.ImportDestinationArguments.html" title="interface in org.apache.accumulo.core.client.admin">TableOperations.ImportDestinationArguments</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/rfile/RFile.OutputArguments.html#to-java.lang.String-">to(String)</a></span> - Method in interface org.apache.accumulo.core.client.rfile.<a href="org/apache/accumulo/core/client/rfile/RFile.OutputArguments.html" title="interface in org.apache.accumulo.core.client.rfile">RFile.OutputArguments</a></dt>
@@ -5779,12 +6208,6 @@
 <dd>
 <div class="block">Returns a byte array containing the bytes in this sequence.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/Value.html#toArray-java.util.List-">toArray(List&lt;byte[]&gt;)</a></span> - Static method in class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/Value.html" title="class in org.apache.accumulo.core.data">Value</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 1.7.0; this utility method is not appropriate for the <a href="org/apache/accumulo/core/data/Value.html" title="class in org.apache.accumulo.core.data"><code>Value</code></a> object</span></div>
-</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/minicluster/MemoryUnit.html#toBytes-long-">toBytes(long)</a></span> - Method in enum org.apache.accumulo.minicluster.<a href="org/apache/accumulo/minicluster/MemoryUnit.html" title="enum in org.apache.accumulo.minicluster">MemoryUnit</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/security/tokens/AuthenticationToken.TokenProperty.html#TokenProperty-java.lang.String-java.lang.String-boolean-">TokenProperty(String, String, boolean)</a></span> - Constructor for class org.apache.accumulo.core.client.security.tokens.<a href="org/apache/accumulo/core/client/security/tokens/AuthenticationToken.TokenProperty.html" title="class in org.apache.accumulo.core.client.security.tokens">AuthenticationToken.T [...]
@@ -5815,7 +6238,9 @@
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/IteratorSetting.html#toString--">toString()</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/IteratorSetting.html" title="class in org.apache.accumulo.core.client">IteratorSetting</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#toString--">toString()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/sample/SamplerConfiguration.html#toString--">toString()</a></span> - Method in class org.apache.accumulo.core.client.sample.<a href="org/apache/accumulo/core/client/sample/SamplerConfiguration.html" title="class in org.apache.accumulo.core.client.sample">SamplerConfiguration</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/security/tokens/AuthenticationToken.TokenProperty.html#toString--">toString()</a></span> - Method in class org.apache.accumulo.core.client.security.tokens.<a href="org/apache/accumulo/core/client/security/tokens/AuthenticationToken.TokenProperty.html" title="class in org.apache.accumulo.core.client.security.tokens">AuthenticationToken.TokenProperty</a></dt>
@@ -5896,6 +6321,14 @@
 <dd>
 <div class="block">Converts this range to Thrift.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.SslOptions.html#truststore-java.lang.CharSequence-">truststore(CharSequence)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a></dt>
+<dd>
+<div class="block">Build with SSL trust store</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.SslOptions.html#truststore-java.lang.CharSequence-java.lang.CharSequence-java.lang.CharSequence-">truststore(CharSequence, CharSequence, CharSequence)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a></dt>
+<dd>
+<div class="block">Build with SSL trust store</div>
+</dd>
 </dl>
 <a name="I:U">
 <!--   -->
@@ -5932,39 +6365,27 @@
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 &nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#useSasl--">useSasl()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a></dt>
+<dd>
+<div class="block">Build with SASL options</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html#usesLocalIterators-org.apache.hadoop.mapred.JobConf-">usesLocalIterators(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapred">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Determines whether a configuration uses local iterators.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html#usesLocalIterators-org.apache.hadoop.mapreduce.JobContext-">usesLocalIterators(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputFormatBase.html" title="class in org.apache.accumulo.core.client.mapreduce">InputFormatBase</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Determines whether a configuration uses local iterators.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#usesLocalIterators--">usesLocalIterators()</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html#usingClientInfo-org.apache.accumulo.core.client.ClientInfo-">usingClientInfo(ClientInfo)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientInfoOptions</a></dt>
-<dd>
-<div class="block">Build using Accumulo client information</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html#usingKerberos-java.lang.String-java.lang.String-">usingKerberos(String, String)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AuthenticationArgs</a></dt>
-<dd>
-<div class="block">Build using Kerberos credentials</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html#usingPassword-java.lang.String-java.lang.CharSequence-">usingPassword(String, CharSequence)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AuthenticationArgs</a></dt>
-<dd>
-<div class="block">Build using password-based credentials</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html#usingProperties-java.lang.String-">usingProperties(String)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.PropertyOptions</a></dt>
 <dd>
-<div class="block">Build using properties file.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html#usingProperties-java.util.Properties-">usingProperties(Properties)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.PropertyOptions</a></dt>
-<dd>
-<div class="block">Build using Java properties object.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html#usingToken-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-">usingToken(String, AuthenticationToken)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AuthenticationArgs</a></dt>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#useSsl--">useSsl()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a></dt>
 <dd>
-<div class="block">Build using specified credentials</div>
+<div class="block">Build with SSL/TLS options</div>
 </dd>
 <dt><a href="org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.html" title="class in org.apache.accumulo.core.client.lexicoder"><span class="typeNameLink">UUIDLexicoder</span></a> - Class in <a href="org/apache/accumulo/core/client/lexicoder/package-summary.html">org.apache.accumulo.core.client.lexicoder</a></dt>
 <dd>
@@ -5980,11 +6401,13 @@
 <dl>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html#validateOptions-org.apache.hadoop.mapred.JobConf-">validateOptions(JobConf)</a></span> - Static method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapred">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Check whether a configuration is fully configured to be used with an Accumulo
  <code>InputFormat</code>.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html#validateOptions-org.apache.hadoop.mapreduce.JobContext-">validateOptions(JobContext)</a></span> - Static method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html" title="class in org.apache.accumulo.core.client.mapreduce">AbstractInputFormat</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Check whether a configuration is fully configured to be used with an Accumulo
  <code>InputFormat</code>.</div>
 </dd>
@@ -6012,13 +6435,6 @@
 <dd>
 <div class="block">Creates a Value using the bytes in a buffer as the initial value.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/Value.html#Value-java.nio.ByteBuffer-boolean-">Value(ByteBuffer, boolean)</a></span> - Constructor for class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/Value.html" title="class in org.apache.accumulo.core.data">Value</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">A copy of the bytes in the buffer is always made. Use <a href="org/apache/accumulo/core/data/Value.html#Value-java.nio.ByteBuffer-"><code>Value.Value(ByteBuffer)</code></a>
-             instead.</span></div>
-</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/data/Value.html#Value-byte:A-boolean-">Value(byte[], boolean)</a></span> - Constructor for class org.apache.accumulo.core.data.<a href="org/apache/accumulo/core/data/Value.html" title="class in org.apache.accumulo.core.data">Value</a></dt>
 <dd>
 <div class="block">Creates a Value using a byte array as the initial value.</div>
@@ -6308,15 +6724,6 @@ the order they are declared.</div>
 <div class="block">The authorizations passed here will be used to filter Keys, from the <a href="org/apache/accumulo/core/client/Scanner.html" title="interface in org.apache.accumulo.core.client"><code>Scanner</code></a>, based
  on the content of the column visibility field.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#withBatchScannerQueryThreads-int-">withBatchScannerQueryThreads(int)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a></dt>
-<dd>
-<div class="block">Build with default number of query threads for BatchScanner</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#withBatchWriterConfig-org.apache.accumulo.core.client.BatchWriterConfig-">withBatchWriterConfig(BatchWriterConfig)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a></dt>
-<dd>
-<div class="block">Build with BatchWriterConfig defaults for BatchWriter, MultiTableBatchWriter &amp;
- BatchDeleter</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/rfile/RFile.ScannerOptions.html#withBounds-org.apache.accumulo.core.data.Range-">withBounds(Range)</a></span> - Method in interface org.apache.accumulo.core.client.rfile.<a href="org/apache/accumulo/core/client/rfile/RFile.ScannerOptions.html" title="interface in org.apache.accumulo.core.client.rfile">RFile.ScannerOptions</a></dt>
 <dd>
 <div class="block">This option allows limiting the <a href="org/apache/accumulo/core/client/Scanner.html" title="interface in org.apache.accumulo.core.client"><code>Scanner</code></a> from reading data outside of a given range.</div>
@@ -6359,14 +6766,6 @@ the order they are declared.</div>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Same as <a href="org/apache/accumulo/core/client/ClientConfiguration.html#with-org.apache.accumulo.core.client.ClientConfiguration.ClientProperty-java.lang.String-"><code>ClientConfiguration.with(ClientProperty, String)</code></a> for ClientProperty.INSTANCE_ID</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.SslOptions.html#withKeystore-java.lang.String-">withKeystore(String)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a></dt>
-<dd>
-<div class="block">Build with SSL key store</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.SslOptions.html#withKeystore-java.lang.String-java.lang.String-java.lang.String-">withKeystore(String, String, String)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a></dt>
-<dd>
-<div class="block">Build with SSL key store</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ClientConfiguration.html#withKeystore-java.lang.String-">withKeystore(String)</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ClientConfiguration.html" title="class in org.apache.accumulo.core.client">ClientConfiguration</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
@@ -6391,22 +6790,10 @@ the order they are declared.</div>
 <dd>
 <div class="block">By default the <a href="org/apache/accumulo/core/client/Scanner.html" title="interface in org.apache.accumulo.core.client"><code>Scanner</code></a> created will setup the default Accumulo system iterators.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html#withPrimary-java.lang.String-">withPrimary(String)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SaslOptions</a></dt>
-<dd>
-<div class="block">Build with Kerberos Server Primary</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html#withQop-java.lang.String-">withQop(String)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SaslOptions</a></dt>
-<dd>
-<div class="block">Build with SASL quality of protection</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/rfile/RFile.WriterOptions.html#withSampler-org.apache.accumulo.core.client.sample.SamplerConfiguration-">withSampler(SamplerConfiguration)</a></span> - Method in interface org.apache.accumulo.core.client.rfile.<a href="org/apache/accumulo/core/client/rfile/RFile.WriterOptions.html" title="interface in org.apache.accumulo.core.client.rfile">RFile.WriterOptions</a></dt>
 <dd>
 <div class="block">An option to store sample data in the generated RFile.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#withSasl--">withSasl()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a></dt>
-<dd>
-<div class="block">Build with SASL options</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ClientConfiguration.html#withSasl-boolean-">withSasl(boolean)</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ClientConfiguration.html" title="class in org.apache.accumulo.core.client">ClientConfiguration</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
@@ -6418,18 +6805,10 @@ the order they are declared.</div>
 <div class="block">Same as <a href="org/apache/accumulo/core/client/ClientConfiguration.html#with-org.apache.accumulo.core.client.ClientConfiguration.ClientProperty-java.lang.String-"><code>ClientConfiguration.with(ClientProperty, String)</code></a> for ClientProperty.INSTANCE_RPC_SASL_ENABLED and
  ClientProperty.GENERAL_KERBEROS_PRINCIPAL.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#withScannerBatchSize-int-">withScannerBatchSize(int)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a></dt>
-<dd>
-<div class="block">Build with default batch size for Scanner</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/admin/NewTableConfiguration.html#withSplits-java.util.SortedSet-">withSplits(SortedSet&lt;Text&gt;)</a></span> - Method in class org.apache.accumulo.core.client.admin.<a href="org/apache/accumulo/core/client/admin/NewTableConfiguration.html" title="class in org.apache.accumulo.core.client.admin">NewTableConfiguration</a></dt>
 <dd>
 <div class="block">Create a new table with pre-configured splits from the provided input collection.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#withSsl--">withSsl()</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a></dt>
-<dd>
-<div class="block">Build with SSL/TLS options</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ClientConfiguration.html#withSsl-boolean-">withSsl(boolean)</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ClientConfiguration.html" title="class in org.apache.accumulo.core.client">ClientConfiguration</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
@@ -6464,14 +6843,6 @@ the order they are declared.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/rfile/RFile.WriterOptions.html#withTableProperties-java.util.Map-">withTableProperties(Map&lt;String, String&gt;)</a></span> - Method in interface org.apache.accumulo.core.client.rfile.<a href="org/apache/accumulo/core/client/rfile/RFile.WriterOptions.html" title="interface in org.apache.accumulo.core.client.rfile">RFile.WriterOptions</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.SslOptions.html#withTruststore-java.lang.String-">withTruststore(String)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a></dt>
-<dd>
-<div class="block">Build with SSL trust store</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.SslOptions.html#withTruststore-java.lang.String-java.lang.String-java.lang.String-">withTruststore(String, String, String)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a></dt>
-<dd>
-<div class="block">Build with SSL trust store</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ClientConfiguration.html#withTruststore-java.lang.String-">withTruststore(String)</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ClientConfiguration.html" title="class in org.apache.accumulo.core.client">ClientConfiguration</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
@@ -6490,10 +6861,6 @@ the order they are declared.</div>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Same as <a href="org/apache/accumulo/core/client/ClientConfiguration.html#with-org.apache.accumulo.core.client.ClientConfiguration.ClientProperty-java.lang.String-"><code>ClientConfiguration.with(ClientProperty, String)</code></a> for ClientProperty.INSTANCE_ZK_HOST</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#withZkTimeout-int-">withZkTimeout(int)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a></dt>
-<dd>
-<div class="block">Build using Zookeeper timeout</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ClientConfiguration.html#withZkTimeout-int-">withZkTimeout(int)</a></span> - Method in class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ClientConfiguration.html" title="class in org.apache.accumulo.core.client">ClientConfiguration</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
@@ -6513,16 +6880,22 @@ the order they are declared.</div>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.AccumuloRecordWriter.html#write-org.apache.hadoop.io.Text-org.apache.accumulo.core.data.Mutation-">write(Text, Mutation)</a></span> - Method in class org.apache.accumulo.core.client.mapred.<a href="org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.AccumuloRecordWriter.html" title="class in org.apache.accumulo.core.client.mapred">AccumuloOutputFormat.AccumuloRecordWriter</a></dt>
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Push a mutation into a table.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.AccumuloRecordWriter.html#write-org.apache.hadoop.io.Text-org.apache.accumulo.core.data.Mutation-">write(Text, Mutation)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.AccumuloRecordWriter.html" title="class in org.apache.accumulo.core.client.mapreduce">AccumuloOutputFormat.AccumuloRecordWr [...]
 <dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Push a mutation into a table.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html#write-java.io.DataOutput-">write(DataOutput)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/InputTableConfig.html" title="class in org.apache.accumulo.core.client.mapreduce">InputTableConfig</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html#write-java.io.DataOutput-">write(DataOutput)</a></span> - Method in class org.apache.accumulo.core.client.mapreduce.<a href="org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html" title="class in org.apache.accumulo.core.client.mapreduce">RangeInputSplit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/security/tokens/KerberosToken.html#write-java.io.DataOutput-">write(DataOutput)</a></span> - Method in class org.apache.accumulo.core.client.security.tokens.<a href="org/apache/accumulo/core/client/security/tokens/KerberosToken.html" title="class in org.apache.accumulo.core.client.security.tokens">KerberosToken</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/security/tokens/NullToken.html#write-java.io.DataOutput-">write(DataOutput)</a></span> - Method in class org.apache.accumulo.core.client.security.tokens.<a href="org/apache/accumulo/core/client/security/tokens/NullToken.html" title="class in org.apache.accumulo.core.client.security.tokens">NullToken</a></dt>
@@ -6545,6 +6918,10 @@ the order they are declared.</div>
 </a>
 <h2 class="title">Z</h2>
 <dl>
+<dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#zkTimeout-int-">zkTimeout(int)</a></span> - Method in interface org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a></dt>
+<dd>
+<div class="block">Build using Zookeeper timeout</div>
+</dd>
 <dt><a href="org/apache/accumulo/core/client/ZooKeeperInstance.html" title="class in org.apache.accumulo.core.client"><span class="typeNameLink">ZooKeeperInstance</span></a> - Class in <a href="org/apache/accumulo/core/client/package-summary.html">org.apache.accumulo.core.client</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>
@@ -6553,16 +6930,12 @@ the order they are declared.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ZooKeeperInstance.html#ZooKeeperInstance-java.lang.String-java.lang.String-">ZooKeeperInstance(String, String)</a></span> - Constructor for class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ZooKeeperInstance.html" title="class in org.apache.accumulo.core.client">ZooKeeperInstance</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0; use <a href="org/apache/accumulo/core/client/Accumulo.html#newClient--"><code>Accumulo.newClient()</code></a> instead</span></div>
-</div>
-</dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/accumulo/core/client/ZooKeeperInstance.html#ZooKeeperInstance-org.apache.accumulo.core.client.ClientConfiguration-">ZooKeeperInstance(ClientConfiguration)</a></span> - Constructor for class org.apache.accumulo.core.client.<a href="org/apache/accumulo/core/client/ZooKeeperInstance.html" title="class in org.apache.accumulo.core.client">ZooKeeperInstance</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">since 2.0.0; use <a href="org/apache/accumulo/core/client/Accumulo.html#newClient--"><code>Accumulo.newClient()</code></a> instead</span></div>
-</div>
-</dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</dd>
 </dl>
 <a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:H">H</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:J">J</a>&nbsp;<a href="#I:K">K</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:O">O</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:Q">Q</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbs [...]
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
@@ -6612,6 +6985,6 @@ the order they are declared.</div>
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2019 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/docs/2.x/apidocs/index.html b/docs/2.x/apidocs/index.html
index eaa5a4b..289dd95 100644
--- a/docs/2.x/apidocs/index.html
+++ b/docs/2.x/apidocs/index.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:36 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:13 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Apache Accumulo Project 2.0.0-alpha-1 API</title>
+<title>Apache Accumulo Project 2.0.0-alpha-2 API</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
     if (tmpTargetPage != "" && tmpTargetPage != "undefined")
diff --git a/docs/2.x/apidocs/org/apache/accumulo/core/client/Accumulo.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/Accumulo.html
index e9417f0..65c36f2 100644
--- a/docs/2.x/apidocs/org/apache/accumulo/core/client/Accumulo.html
+++ b/docs/2.x/apidocs/org/apache/accumulo/core/client/Accumulo.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:34 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:12 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Accumulo (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>Accumulo (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,13 +13,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Accumulo (Apache Accumulo Project 2.0.0-alpha-1 API)";
+            parent.document.title="Accumulo (Apache Accumulo Project 2.0.0-alpha-2 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":9};
+var methods = {"i0":9,"i1":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -153,11 +153,17 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>static <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientInfoOptions</a></code></td>
+<td class="colFirst"><code>static <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.PropertyOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client">AccumuloClient</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/Accumulo.html#newClient--">newClient</a></span>()</code>
 <div class="block">Fluent entry point for creating an <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client"><code>AccumuloClient</code></a>.</div>
 </td>
 </tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.PropertyOptions</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util">Properties</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/Accumulo.html#newClientProperties--">newClientProperties</a></span>()</code>
+<div class="block">Fluent entry point for creating client <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util"><code>Properties</code></a>.</div>
+</td>
+</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -183,19 +189,20 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <a name="newClient--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>newClient</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientInfoOptions</a>&nbsp;newClient()</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.PropertyOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client">AccumuloClient</a>&gt;&nbsp;newClient()</pre>
 <div class="block">Fluent entry point for creating an <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client"><code>AccumuloClient</code></a>. For example:
 
  <pre>
  <code>
-    AccumuloClient client = Accumulo.newClient()
-      .forInstance(instanceName, zookeepers)
-      .usingPassword(user, password)
-      .withZkTimeout(1234)
-      .build();
+ try (AccumuloClient client = Accumulo.newClient()
+        .to(instanceName, zookeepers)
+        .as(user, password).build())
+ {
+   // use the client
+ }
  </code>
  </pre></div>
 <dl>
@@ -204,6 +211,28 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 </dl>
 </li>
 </ul>
+<a name="newClientProperties--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>newClientProperties</h4>
+<pre>public static&nbsp;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.PropertyOptions</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util">Properties</a>&gt;&nbsp;newClientProperties()</pre>
+<div class="block">Fluent entry point for creating client <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util"><code>Properties</code></a>. For example:
+
+ <pre>
+ <code>
+ Properties clientProperties = Accumulo.newClientProperties()
+              .to(instanceName, zookeepers)
+              .as(user, password).build())
+ </code>
+ </pre></div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a builder object for client Properties</dd>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 </li>
@@ -273,6 +302,6 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2019 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html
deleted file mode 100644
index 6f14a77..0000000
--- a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:34 EDT 2018 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AccumuloClient.AccumuloClientFactory (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
-<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AccumuloClient.AccumuloClientFactory (Apache Accumulo Project 2.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/AccumuloClient.AccumuloClientFactory.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" target="_top">Frames</a></li>
-<li><a href="AccumuloClient.AccumuloClientFactory.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.accumulo.core.client</div>
-<h2 title="Interface AccumuloClient.AccumuloClientFactory" class="title">Interface AccumuloClient.AccumuloClientFactory</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Superinterfaces:</dt>
-<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientInfoFactory</a></dd>
-</dl>
-<dl>
-<dt>All Known Subinterfaces:</dt>
-<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.FromOptions</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="interface in org.apache.accumulo [...]
-</dl>
-<dl>
-<dt>Enclosing interface:</dt>
-<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client">AccumuloClient</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public static interface <span class="typeNameLabel">AccumuloClient.AccumuloClientFactory</span>
-extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientInfoFactory</a></pre>
-<div class="block">Builds AccumuloClient</div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client">AccumuloClient</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html#build--">build</a></span>()</code>
-<div class="block">Builds AccumuloClient after all options have been specified</div>
-</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.accumulo.core.client.AccumuloClient.ClientInfoFactory">
-<!--   -->
-</a>
-<h3>Methods inherited from interface&nbsp;org.apache.accumulo.core.client.<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientInfoFactory</a></h3>
-<code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html#info--">info</a></code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="build--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>build</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client">AccumuloClient</a>&nbsp;build()
-              throws <a href="../../../../../org/apache/accumulo/core/client/AccumuloException.html" title="class in org.apache.accumulo.core.client">AccumuloException</a>,
-                     <a href="../../../../../org/apache/accumulo/core/client/AccumuloSecurityException.html" title="class in org.apache.accumulo.core.client">AccumuloSecurityException</a></pre>
-<div class="block">Builds AccumuloClient after all options have been specified</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>AccumuloClient</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloException.html" title="class in org.apache.accumulo.core.client">AccumuloException</a></code></dd>
-<dd><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloSecurityException.html" title="class in org.apache.accumulo.core.client">AccumuloSecurityException</a></code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/AccumuloClient.AccumuloClientFactory.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" target="_top">Frames</a></li>
-<li><a href="AccumuloClient.AccumuloClientFactory.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html
index 1c64a48..79cba69 100644
--- a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html
+++ b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:35 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:12 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AccumuloClient.AuthenticationArgs (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>AccumuloClient.AuthenticationArgs (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AccumuloClient.AuthenticationArgs (Apache Accumulo Project 2.0.0-alpha-1 API)";
+            parent.document.title="AccumuloClient.AuthenticationArgs (Apache Accumulo Project 2.0.0-alpha-2 API)";
         }
     }
     catch(err) {
@@ -50,8 +50,8 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" target="_top">Frames</a></li>
@@ -94,7 +94,7 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.accumulo.core.client</div>
-<h2 title="Interface AccumuloClient.AuthenticationArgs" class="title">Interface AccumuloClient.AuthenticationArgs</h2>
+<h2 title="Interface AccumuloClient.AuthenticationArgs" class="title">Interface AccumuloClient.AuthenticationArgs&lt;T&gt;</h2>
 </div>
 <div class="contentContainer">
 <div class="description">
@@ -102,7 +102,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Known Subinterfaces:</dt>
-<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.FromOptions</a></dd>
+<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.FromOptions</a>&lt;T&gt;</dd>
 </dl>
 <dl>
 <dt>Enclosing interface:</dt>
@@ -110,8 +110,12 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public static interface <span class="typeNameLabel">AccumuloClient.AuthenticationArgs</span></pre>
-<div class="block">Build methods for authentication</div>
+<pre>public static interface <span class="typeNameLabel">AccumuloClient.AuthenticationArgs&lt;T&gt;</span></pre>
+<div class="block">Builder methods for authentication</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.0.0</dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -131,24 +135,24 @@ var activeTableTab = "activeTableTab";
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html#usingKerberos-java.lang.String-java.lang.String-">usingKerberos</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;principal,
-             <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;keyTabFile)</code>
-<div class="block">Build using Kerberos credentials</div>
+<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="type parameter in AccumuloClient.AuthenticationArgs">T</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html#as-java.lang.CharSequence-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-">as</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;principal,
+  <a href="../../../../../org/apache/accumulo/core/client/security/tokens/AuthenticationToken.html" title="interface in org.apache.accumulo.core.client.security.tokens">AuthenticationToken</a>&nbsp;token)</code>
+<div class="block">Build using specified credentials</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html#usingPassword-java.lang.String-java.lang.CharSequence-">usingPassword</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;username,
-             <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;password)</code>
+<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="type parameter in AccumuloClient.AuthenticationArgs">T</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html#as-java.lang.CharSequence-java.lang.CharSequence-">as</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;username,
+  <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;password)</code>
 <div class="block">Build using password-based credentials</div>
 </td>
 </tr>
 <tr id="i2" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html#usingToken-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-">usingToken</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;principal,
-          <a href="../../../../../org/apache/accumulo/core/client/security/tokens/AuthenticationToken.html" title="interface in org.apache.accumulo.core.client.security.tokens">AuthenticationToken</a>&nbsp;token)</code>
-<div class="block">Build using specified credentials</div>
+<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="type parameter in AccumuloClient.AuthenticationArgs">T</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html#as-java.lang.CharSequence-java.nio.file.Path-">as</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;principal,
+  <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/file/Path.html?is-external=true" title="class or interface in java.nio.file">Path</a>&nbsp;keyTabFile)</code>
+<div class="block">Build using Kerberos credentials</div>
 </td>
 </tr>
 </table>
@@ -166,14 +170,14 @@ var activeTableTab = "activeTableTab";
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="usingPassword-java.lang.String-java.lang.CharSequence-">
+<a name="as-java.lang.CharSequence-java.lang.CharSequence-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>usingPassword</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&nbsp;usingPassword(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;username,
-                                               <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;password)</pre>
+<h4>as</h4>
+<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="type parameter in AccumuloClient.AuthenticationArgs">T</a>&gt;&nbsp;as(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in [...]
+                                       <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;password)</pre>
 <div class="block">Build using password-based credentials</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -184,14 +188,14 @@ var activeTableTab = "activeTableTab";
 </dl>
 </li>
 </ul>
-<a name="usingKerberos-java.lang.String-java.lang.String-">
+<a name="as-java.lang.CharSequence-java.nio.file.Path-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>usingKerberos</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&nbsp;usingKerberos(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;principal,
-                                               <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;keyTabFile)</pre>
+<h4>as</h4>
+<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="type parameter in AccumuloClient.AuthenticationArgs">T</a>&gt;&nbsp;as(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in [...]
+                                       <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/file/Path.html?is-external=true" title="class or interface in java.nio.file">Path</a>&nbsp;keyTabFile)</pre>
 <div class="block">Build using Kerberos credentials</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -202,14 +206,14 @@ var activeTableTab = "activeTableTab";
 </dl>
 </li>
 </ul>
-<a name="usingToken-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-">
+<a name="as-java.lang.CharSequence-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>usingToken</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&nbsp;usingToken(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;principal,
-                                            <a href="../../../../../org/apache/accumulo/core/client/security/tokens/AuthenticationToken.html" title="interface in org.apache.accumulo.core.client.security.tokens">AuthenticationToken</a>&nbsp;token)</pre>
+<h4>as</h4>
+<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="type parameter in AccumuloClient.AuthenticationArgs">T</a>&gt;&nbsp;as(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in [...]
+                                       <a href="../../../../../org/apache/accumulo/core/client/security/tokens/AuthenticationToken.html" title="interface in org.apache.accumulo.core.client.security.tokens">AuthenticationToken</a>&nbsp;token)</pre>
 <div class="block">Build using specified credentials</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -248,8 +252,8 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" target="_top">Frames</a></li>
@@ -289,6 +293,6 @@ var activeTableTab = "activeTableTab";
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2019 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html
similarity index 73%
rename from docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html
index 458868c..be95ebc 100644
--- a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html
+++ b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:35 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:12 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AccumuloClient.ClientInfoFactory (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>AccumuloClient.ClientFactory (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AccumuloClient.ClientInfoFactory (Apache Accumulo Project 2.0.0-alpha-1 API)";
+            parent.document.title="AccumuloClient.ClientFactory (Apache Accumulo Project 2.0.0-alpha-2 API)";
         }
     }
     catch(err) {
@@ -41,7 +41,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../../overview-summary.html">Overview</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/AccumuloClient.ClientInfoFactory.html">Use</a></li>
+<li><a href="class-use/AccumuloClient.ClientFactory.html">Use</a></li>
 <li><a href="package-tree.html">Tree</a></li>
 <li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
 <li><a href="../../../../../index-all.html">Index</a></li>
@@ -51,11 +51,11 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html" target="_top">Frames</a></li>
-<li><a href="AccumuloClient.ClientInfoFactory.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" target="_top">Frames</a></li>
+<li><a href="AccumuloClient.ClientFactory.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -94,7 +94,7 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.accumulo.core.client</div>
-<h2 title="Interface AccumuloClient.ClientInfoFactory" class="title">Interface AccumuloClient.ClientInfoFactory</h2>
+<h2 title="Interface AccumuloClient.ClientFactory" class="title">Interface AccumuloClient.ClientFactory&lt;T&gt;</h2>
 </div>
 <div class="contentContainer">
 <div class="description">
@@ -102,7 +102,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Known Subinterfaces:</dt>
-<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AccumuloClientFactory</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in [...]
+<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&lt;T&gt;, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.FromOptions</a>&lt;T&gt;, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="interface in o [...]
 </dl>
 <dl>
 <dt>Enclosing interface:</dt>
@@ -110,8 +110,12 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public static interface <span class="typeNameLabel">AccumuloClient.ClientInfoFactory</span></pre>
-<div class="block">Builds ClientInfo after all options have been specified</div>
+<pre>public static interface <span class="typeNameLabel">AccumuloClient.ClientFactory&lt;T&gt;</span></pre>
+<div class="block">Builds AccumuloClient or client Properties after all options have been specified</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.0.0</dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -131,9 +135,9 @@ var activeTableTab = "activeTableTab";
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client">ClientInfo</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html#info--">info</a></span>()</code>
-<div class="block">Builds ClientInfo after all options have been specified</div>
+<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="type parameter in AccumuloClient.ClientFactory">T</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html#build--">build</a></span>()</code>
+<div class="block">Builds AccumuloClient or client Properties</div>
 </td>
 </tr>
 </table>
@@ -151,17 +155,17 @@ var activeTableTab = "activeTableTab";
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="info--">
+<a name="build--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>info</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client">ClientInfo</a>&nbsp;info()</pre>
-<div class="block">Builds ClientInfo after all options have been specified</div>
+<h4>build</h4>
+<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="type parameter in AccumuloClient.ClientFactory">T</a>&nbsp;build()</pre>
+<div class="block">Builds AccumuloClient or client Properties</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>ClientInfo</dd>
+<dd>AccumuloClient or Properties</dd>
 </dl>
 </li>
 </ul>
@@ -184,7 +188,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../../overview-summary.html">Overview</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/AccumuloClient.ClientInfoFactory.html">Use</a></li>
+<li><a href="class-use/AccumuloClient.ClientFactory.html">Use</a></li>
 <li><a href="package-tree.html">Tree</a></li>
 <li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
 <li><a href="../../../../../index-all.html">Index</a></li>
@@ -194,11 +198,11 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html" target="_top">Frames</a></li>
-<li><a href="AccumuloClient.ClientInfoFactory.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" target="_top">Frames</a></li>
+<li><a href="AccumuloClient.ClientFactory.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -234,6 +238,6 @@ var activeTableTab = "activeTableTab";
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2019 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html
deleted file mode 100644
index 115189a..0000000
--- a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html
+++ /dev/null
@@ -1,255 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:35 EDT 2018 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AccumuloClient.ClientInfoOptions (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
-<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AccumuloClient.ClientInfoOptions (Apache Accumulo Project 2.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/AccumuloClient.ClientInfoOptions.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html" target="_top">Frames</a></li>
-<li><a href="AccumuloClient.ClientInfoOptions.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.accumulo.core.client</div>
-<h2 title="Interface AccumuloClient.ClientInfoOptions" class="title">Interface AccumuloClient.ClientInfoOptions</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Superinterfaces:</dt>
-<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.InstanceArgs</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.PropertyOptions</a></dd>
-</dl>
-<dl>
-<dt>Enclosing interface:</dt>
-<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client">AccumuloClient</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public static interface <span class="typeNameLabel">AccumuloClient.ClientInfoOptions</span>
-extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.PropertyOptions</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.FromOptions</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html#usingClientInfo-org.apache.accumulo.core.client.ClientInfo-">usingClientInfo</a></span>(<a href="../../../../../org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client">ClientInfo</a>&nbsp;clientInfo)</code>
-<div class="block">Build using Accumulo client information</div>
-</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.accumulo.core.client.AccumuloClient.PropertyOptions">
-<!--   -->
-</a>
-<h3>Methods inherited from interface&nbsp;org.apache.accumulo.core.client.<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.PropertyOptions</a></h3>
-<code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html#usingProperties-java.util.Properties-">usingProperties</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html#usingProperties-java.lang.String-">usingProperties</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.accumulo.core.client.AccumuloClient.InstanceArgs">
-<!--   -->
-</a>
-<h3>Methods inherited from interface&nbsp;org.apache.accumulo.core.client.<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.InstanceArgs</a></h3>
-<code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html#forInstance-java.lang.String-java.lang.String-">forInstance</a></code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="usingClientInfo-org.apache.accumulo.core.client.ClientInfo-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>usingClientInfo</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.FromOptions</a>&nbsp;usingClientInfo(<a href="../../../../../org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client">ClientInfo</a>&nbsp;clientInfo)</pre>
-<div class="block">Build using Accumulo client information</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>clientInfo</code> - ClientInfo object</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this builder</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/AccumuloClient.ClientInfoOptions.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html" target="_top">Frames</a></li>
-<li><a href="AccumuloClient.ClientInfoOptions.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html
index d708381..b7db25a 100644
--- a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html
+++ b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:35 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:12 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AccumuloClient.ConnectionOptions (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>AccumuloClient.ConnectionOptions (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AccumuloClient.ConnectionOptions (Apache Accumulo Project 2.0.0-alpha-1 API)";
+            parent.document.title="AccumuloClient.ConnectionOptions (Apache Accumulo Project 2.0.0-alpha-2 API)";
         }
     }
     catch(err) {
@@ -50,7 +50,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -94,7 +94,7 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.accumulo.core.client</div>
-<h2 title="Interface AccumuloClient.ConnectionOptions" class="title">Interface AccumuloClient.ConnectionOptions</h2>
+<h2 title="Interface AccumuloClient.ConnectionOptions" class="title">Interface AccumuloClient.ConnectionOptions&lt;T&gt;</h2>
 </div>
 <div class="contentContainer">
 <div class="description">
@@ -102,11 +102,11 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Superinterfaces:</dt>
-<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AccumuloClientFactory</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientInfoFactory</a></dd>
+<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientFactory</a>&lt;T&gt;</dd>
 </dl>
 <dl>
 <dt>All Known Subinterfaces:</dt>
-<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.FromOptions</a></dd>
+<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.FromOptions</a>&lt;T&gt;</dd>
 </dl>
 <dl>
 <dt>Enclosing interface:</dt>
@@ -114,9 +114,13 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public static interface <span class="typeNameLabel">AccumuloClient.ConnectionOptions</span>
-extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AccumuloClientFactory</a></pre>
+<pre>public static interface <span class="typeNameLabel">AccumuloClient.ConnectionOptions&lt;T&gt;</span>
+extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientFactory</a>&lt;T&gt;</pre>
 <div class="block">Build methods for connection options</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.0.0</dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -136,56 +140,49 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.A
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#withBatchScannerQueryThreads-int-">withBatchScannerQueryThreads</a></span>(int&nbsp;numQueryThreads)</code>
+<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="type parameter in AccumuloClient.ConnectionOptions">T</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#batchScannerQueryThreads-int-">batchScannerQueryThreads</a></span>(int&nbsp;numQueryThreads)</code>
 <div class="block">Build with default number of query threads for BatchScanner</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#withBatchWriterConfig-org.apache.accumulo.core.client.BatchWriterConfig-">withBatchWriterConfig</a></span>(<a href="../../../../../org/apache/accumulo/core/client/BatchWriterConfig.html" title="class in org.apache.accumulo.core.client">BatchWriterConfig</a>&nbsp;batchWriterConfig)</code>
+<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="type parameter in AccumuloClient.ConnectionOptions">T</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#batchWriterConfig-org.apache.accumulo.core.client.BatchWriterConfig-">batchWriterConfig</a></span>(<a href="../../../../../org/apache/accumulo/core/client/BatchWriterConfig.html" title="class in org.apache.accumulo.core.client">BatchWriterConfig</a>&nbsp;batchWriterConfig)</code>
 <div class="block">Build with BatchWriterConfig defaults for BatchWriter, MultiTableBatchWriter &amp;
  BatchDeleter</div>
 </td>
 </tr>
 <tr id="i2" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SaslOptions</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#withSasl--">withSasl</a></span>()</code>
-<div class="block">Build with SASL options</div>
+<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="type parameter in AccumuloClient.ConnectionOptions">T</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#scannerBatchSize-int-">scannerBatchSize</a></span>(int&nbsp;batchSize)</code>
+<div class="block">Build with default batch size for Scanner</div>
 </td>
 </tr>
 <tr id="i3" class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#withScannerBatchSize-int-">withScannerBatchSize</a></span>(int&nbsp;batchSize)</code>
-<div class="block">Build with default batch size for Scanner</div>
+<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SaslOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="type parameter in AccumuloClient.ConnectionOptions">T</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#useSasl--">useSasl</a></span>()</code>
+<div class="block">Build with SASL options</div>
 </td>
 </tr>
 <tr id="i4" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#withSsl--">withSsl</a></span>()</code>
+<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="type parameter in AccumuloClient.ConnectionOptions">T</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#useSsl--">useSsl</a></span>()</code>
 <div class="block">Build with SSL/TLS options</div>
 </td>
 </tr>
 <tr id="i5" class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#withZkTimeout-int-">withZkTimeout</a></span>(int&nbsp;timeout)</code>
+<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="type parameter in AccumuloClient.ConnectionOptions">T</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#zkTimeout-int-">zkTimeout</a></span>(int&nbsp;timeout)</code>
 <div class="block">Build using Zookeeper timeout</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.accumulo.core.client.AccumuloClient.AccumuloClientFactory">
-<!--   -->
-</a>
-<h3>Methods inherited from interface&nbsp;org.apache.accumulo.core.client.<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AccumuloClientFactory</a></h3>
-<code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html#build--">build</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.accumulo.core.client.AccumuloClient.ClientInfoFactory">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.accumulo.core.client.AccumuloClient.ClientFactory">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.accumulo.core.client.<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientInfoFactory</a></h3>
-<code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html#info--">info</a></code></li>
+<h3>Methods inherited from interface&nbsp;org.apache.accumulo.core.client.<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientFactory</a></h3>
+<code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html#build--">build</a></code></li>
 </ul>
 </li>
 </ul>
@@ -201,13 +198,13 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.A
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="withZkTimeout-int-">
+<a name="zkTimeout-int-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>withZkTimeout</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&nbsp;withZkTimeout(int&nbsp;timeout)</pre>
+<h4>zkTimeout</h4>
+<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="type parameter in AccumuloClient.ConnectionOptions">T</a>&gt;&nbsp;zkTimeout(int&nbsp;timeout)</pre>
 <div class="block">Build using Zookeeper timeout</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -217,13 +214,13 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.A
 </dl>
 </li>
 </ul>
-<a name="withSsl--">
+<a name="useSsl--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>withSsl</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a>&nbsp;withSsl()</pre>
+<h4>useSsl</h4>
+<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="type parameter in AccumuloClient.ConnectionOptions">T</a>&gt;&nbsp;useSsl()</pre>
 <div class="block">Build with SSL/TLS options</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -231,13 +228,13 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.A
 </dl>
 </li>
 </ul>
-<a name="withSasl--">
+<a name="useSasl--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>withSasl</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SaslOptions</a>&nbsp;withSasl()</pre>
+<h4>useSasl</h4>
+<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SaslOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="type parameter in AccumuloClient.ConnectionOptions">T</a>&gt;&nbsp;useSasl()</pre>
 <div class="block">Build with SASL options</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -245,13 +242,13 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.A
 </dl>
 </li>
 </ul>
-<a name="withBatchWriterConfig-org.apache.accumulo.core.client.BatchWriterConfig-">
+<a name="batchWriterConfig-org.apache.accumulo.core.client.BatchWriterConfig-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>withBatchWriterConfig</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&nbsp;withBatchWriterConfig(<a href="../../../../../org/apache/accumulo/core/client/BatchWriterConfig.html" title="class in org.apache.accumulo.core.client">BatchWriterConfig</a>&nbsp;batchWriterConfig)</pre>
+<h4>batchWriterConfig</h4>
+<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="type parameter in AccumuloClient.ConnectionOptions">T</a>&gt;&nbsp;batchWriterConfig(<a href="../../../../../org/apache/accumulo/core/client/BatchWriterConfig.html" title="class in org.apache.accum [...]
 <div class="block">Build with BatchWriterConfig defaults for BatchWriter, MultiTableBatchWriter &amp;
  BatchDeleter</div>
 <dl>
@@ -262,23 +259,23 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.A
 </dl>
 </li>
 </ul>
-<a name="withBatchScannerQueryThreads-int-">
+<a name="batchScannerQueryThreads-int-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>withBatchScannerQueryThreads</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&nbsp;withBatchScannerQueryThreads(int&nbsp;numQueryThreads)</pre>
+<h4>batchScannerQueryThreads</h4>
+<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="type parameter in AccumuloClient.ConnectionOptions">T</a>&gt;&nbsp;batchScannerQueryThreads(int&nbsp;numQueryThreads)</pre>
 <div class="block">Build with default number of query threads for BatchScanner</div>
 </li>
 </ul>
-<a name="withScannerBatchSize-int-">
+<a name="scannerBatchSize-int-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>withScannerBatchSize</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&nbsp;withScannerBatchSize(int&nbsp;batchSize)</pre>
+<h4>scannerBatchSize</h4>
+<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="type parameter in AccumuloClient.ConnectionOptions">T</a>&gt;&nbsp;scannerBatchSize(int&nbsp;batchSize)</pre>
 <div class="block">Build with default batch size for Scanner</div>
 </li>
 </ul>
@@ -310,7 +307,7 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.A
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -351,6 +348,6 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.A
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2019 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.FromOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.FromOptions.html
index 85f4288..d06f05c 100644
--- a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.FromOptions.html
+++ b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.FromOptions.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:35 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:12 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AccumuloClient.FromOptions (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>AccumuloClient.FromOptions (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AccumuloClient.FromOptions (Apache Accumulo Project 2.0.0-alpha-1 API)";
+            parent.document.title="AccumuloClient.FromOptions (Apache Accumulo Project 2.0.0-alpha-2 API)";
         }
     }
     catch(err) {
@@ -88,7 +88,7 @@
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.accumulo.core.client</div>
-<h2 title="Interface AccumuloClient.FromOptions" class="title">Interface AccumuloClient.FromOptions</h2>
+<h2 title="Interface AccumuloClient.FromOptions" class="title">Interface AccumuloClient.FromOptions&lt;T&gt;</h2>
 </div>
 <div class="contentContainer">
 <div class="description">
@@ -96,7 +96,7 @@
 <li class="blockList">
 <dl>
 <dt>All Superinterfaces:</dt>
-<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AccumuloClientFactory</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AuthenticationArgs</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html" title="inte [...]
+<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AuthenticationArgs</a>&lt;T&gt;, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientFactory</a>&lt;T&gt;, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="in [...]
 </dl>
 <dl>
 <dt>Enclosing interface:</dt>
@@ -104,8 +104,12 @@
 </dl>
 <hr>
 <br>
-<pre>public static interface <span class="typeNameLabel">AccumuloClient.FromOptions</span>
-extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.PropertyOptions</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in  [...]
+<pre>public static interface <span class="typeNameLabel">AccumuloClient.FromOptions&lt;T&gt;</span>
+extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&lt;T&gt;, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AuthenticationArgs</a>&lt;T&gt;</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.0.0</dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -123,42 +127,21 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.C
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.apache.accumulo.core.client.<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a></h3>
-<code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#withBatchScannerQueryThreads-int-">withBatchScannerQueryThreads</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#withBatchWriterConfig-org.apache.accumulo.core.client.BatchWriterConfig-">withBatchWriterConfig</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#withSasl--">withSasl</a>, <a href= [...]
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.accumulo.core.client.AccumuloClient.AccumuloClientFactory">
-<!--   -->
-</a>
-<h3>Methods inherited from interface&nbsp;org.apache.accumulo.core.client.<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AccumuloClientFactory</a></h3>
-<code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html#build--">build</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.accumulo.core.client.AccumuloClient.ClientInfoFactory">
-<!--   -->
-</a>
-<h3>Methods inherited from interface&nbsp;org.apache.accumulo.core.client.<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientInfoFactory</a></h3>
-<code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html#info--">info</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.accumulo.core.client.AccumuloClient.PropertyOptions">
-<!--   -->
-</a>
-<h3>Methods inherited from interface&nbsp;org.apache.accumulo.core.client.<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.PropertyOptions</a></h3>
-<code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html#usingProperties-java.util.Properties-">usingProperties</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html#usingProperties-java.lang.String-">usingProperties</a></code></li>
+<code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#batchScannerQueryThreads-int-">batchScannerQueryThreads</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#batchWriterConfig-org.apache.accumulo.core.client.BatchWriterConfig-">batchWriterConfig</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html#scannerBatchSize-int-">scannerBatchSize</a>, <a hr [...]
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.accumulo.core.client.AccumuloClient.InstanceArgs">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.accumulo.core.client.AccumuloClient.ClientFactory">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.accumulo.core.client.<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.InstanceArgs</a></h3>
-<code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html#forInstance-java.lang.String-java.lang.String-">forInstance</a></code></li>
+<h3>Methods inherited from interface&nbsp;org.apache.accumulo.core.client.<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientFactory</a></h3>
+<code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html#build--">build</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.accumulo.core.client.AccumuloClient.AuthenticationArgs">
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.apache.accumulo.core.client.<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AuthenticationArgs</a></h3>
-<code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html#usingKerberos-java.lang.String-java.lang.String-">usingKerberos</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html#usingPassword-java.lang.String-java.lang.CharSequence-">usingPassword</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html#usingToken-java.lang.String-org.apache.accumulo.core.clie [...]
+<code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html#as-java.lang.CharSequence-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-">as</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html#as-java.lang.CharSequence-java.lang.CharSequence-">as</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html#as-java.lang.CharSequence-java.nio.fil [...]
 </ul>
 </li>
 </ul>
@@ -229,6 +212,6 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.C
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2019 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html
index 3bbb1b8..9945b56 100644
--- a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html
+++ b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:35 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:12 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AccumuloClient.InstanceArgs (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>AccumuloClient.InstanceArgs (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AccumuloClient.InstanceArgs (Apache Accumulo Project 2.0.0-alpha-1 API)";
+            parent.document.title="AccumuloClient.InstanceArgs (Apache Accumulo Project 2.0.0-alpha-2 API)";
         }
     }
     catch(err) {
@@ -94,7 +94,7 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.accumulo.core.client</div>
-<h2 title="Interface AccumuloClient.InstanceArgs" class="title">Interface AccumuloClient.InstanceArgs</h2>
+<h2 title="Interface AccumuloClient.InstanceArgs" class="title">Interface AccumuloClient.InstanceArgs&lt;T&gt;</h2>
 </div>
 <div class="contentContainer">
 <div class="description">
@@ -102,7 +102,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Known Subinterfaces:</dt>
-<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientInfoOptions</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.FromOptions</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="interface in org.apache.accu [...]
+<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.PropertyOptions</a>&lt;T&gt;</dd>
 </dl>
 <dl>
 <dt>Enclosing interface:</dt>
@@ -110,8 +110,12 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public static interface <span class="typeNameLabel">AccumuloClient.InstanceArgs</span></pre>
+<pre>public static interface <span class="typeNameLabel">AccumuloClient.InstanceArgs&lt;T&gt;</span></pre>
 <div class="block">Builder method for setting Accumulo instance and zookeepers</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.0.0</dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -131,9 +135,9 @@ var activeTableTab = "activeTableTab";
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AuthenticationArgs</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html#forInstance-java.lang.String-java.lang.String-">forInstance</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;instanceName,
-           <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;zookeepers)</code>&nbsp;</td>
+<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AuthenticationArgs</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html" title="type parameter in AccumuloClient.InstanceArgs">T</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html#to-java.lang.CharSequence-java.lang.CharSequence-">to</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;instanceName,
+  <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;zookeepers)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -150,14 +154,14 @@ var activeTableTab = "activeTableTab";
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="forInstance-java.lang.String-java.lang.String-">
+<a name="to-java.lang.CharSequence-java.lang.CharSequence-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>forInstance</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AuthenticationArgs</a>&nbsp;forInstance(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;instanceName,
-                                              <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;zookeepers)</pre>
+<h4>to</h4>
+<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AuthenticationArgs</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html" title="type parameter in AccumuloClient.InstanceArgs">T</a>&gt;&nbsp;to(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang [...]
+                                        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;zookeepers)</pre>
 </li>
 </ul>
 </li>
@@ -229,6 +233,6 @@ var activeTableTab = "activeTableTab";
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2019 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html
index ddda4f7..eb45f54 100644
--- a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html
+++ b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:35 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:12 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AccumuloClient.PropertyOptions (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>AccumuloClient.PropertyOptions (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,13 +13,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AccumuloClient.PropertyOptions (Apache Accumulo Project 2.0.0-alpha-1 API)";
+            parent.document.title="AccumuloClient.PropertyOptions (Apache Accumulo Project 2.0.0-alpha-2 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":6,"i1":6};
+var methods = {"i0":6,"i1":6,"i2":6};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -94,7 +94,7 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.accumulo.core.client</div>
-<h2 title="Interface AccumuloClient.PropertyOptions" class="title">Interface AccumuloClient.PropertyOptions</h2>
+<h2 title="Interface AccumuloClient.PropertyOptions" class="title">Interface AccumuloClient.PropertyOptions&lt;T&gt;</h2>
 </div>
 <div class="contentContainer">
 <div class="description">
@@ -102,11 +102,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Superinterfaces:</dt>
-<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.InstanceArgs</a></dd>
-</dl>
-<dl>
-<dt>All Known Subinterfaces:</dt>
-<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientInfoOptions</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.FromOptions</a></dd>
+<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.InstanceArgs</a>&lt;T&gt;</dd>
 </dl>
 <dl>
 <dt>Enclosing interface:</dt>
@@ -114,9 +110,13 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public static interface <span class="typeNameLabel">AccumuloClient.PropertyOptions</span>
-extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.InstanceArgs</a></pre>
+<pre>public static interface <span class="typeNameLabel">AccumuloClient.PropertyOptions&lt;T&gt;</span>
+extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.InstanceArgs</a>&lt;T&gt;</pre>
 <div class="block">Builder methods for creating AccumuloClient using properties</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.0.0</dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -136,14 +136,20 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.I
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AccumuloClientFactory</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html#usingProperties-java.util.Properties-">usingProperties</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util">Properties</a>&nbsp;properties)</code>
-<div class="block">Build using Java properties object.</div>
+<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.FromOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="type parameter in AccumuloClient.PropertyOptions">T</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html#from-java.nio.file.Path-">from</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/file/Path.html?is-external=true" title="class or interface in java.nio.file">Path</a>&nbsp;propertiesFile)</code>
+<div class="block">Build using properties file.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AccumuloClientFactory</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html#usingProperties-java.lang.String-">usingProperties</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;propertiesFile)</code>
+<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.FromOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="type parameter in AccumuloClient.PropertyOptions">T</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html#from-java.util.Properties-">from</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util">Properties</a>&nbsp;properties)</code>
+<div class="block">Build using Java properties object.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.FromOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="type parameter in AccumuloClient.PropertyOptions">T</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html#from-java.lang.String-">from</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;propertiesFilePath)</code>
 <div class="block">Build using properties file.</div>
 </td>
 </tr>
@@ -153,7 +159,7 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.I
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.apache.accumulo.core.client.<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.InstanceArgs</a></h3>
-<code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html#forInstance-java.lang.String-java.lang.String-">forInstance</a></code></li>
+<code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html#to-java.lang.CharSequence-java.lang.CharSequence-">to</a></code></li>
 </ul>
 </li>
 </ul>
@@ -169,13 +175,30 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.I
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="usingProperties-java.lang.String-">
+<a name="from-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>from</h4>
+<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.FromOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="type parameter in AccumuloClient.PropertyOptions">T</a>&gt;&nbsp;from(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> [...]
+<div class="block">Build using properties file. An example properties file can be found at
+ conf/accumulo-client.properties in the Accumulo tarball distribution.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>propertiesFilePath</code> - Path to properties file</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>this builder</dd>
+</dl>
+</li>
+</ul>
+<a name="from-java.nio.file.Path-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>usingProperties</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AccumuloClientFactory</a>&nbsp;usingProperties(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;propertiesFile)</pre>
+<h4>from</h4>
+<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.FromOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="type parameter in AccumuloClient.PropertyOptions">T</a>&gt;&nbsp;from(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/file/Path.html?is-external=true" title="class or interface in java.nio.file">Path [...]
 <div class="block">Build using properties file. An example properties file can be found at
  conf/accumulo-client.properties in the Accumulo tarball distribution.</div>
 <dl>
@@ -186,16 +209,15 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.I
 </dl>
 </li>
 </ul>
-<a name="usingProperties-java.util.Properties-">
+<a name="from-java.util.Properties-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>usingProperties</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AccumuloClientFactory</a>&nbsp;usingProperties(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util">Properties</a>&nbsp;properties)</pre>
+<h4>from</h4>
+<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.FromOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="type parameter in AccumuloClient.PropertyOptions">T</a>&gt;&nbsp;from(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util">Proper [...]
 <div class="block">Build using Java properties object. A list of available properties can be found in the
- documentation on the project website (http://accumulo.apache.org) under 'Development' -&gt;
- 'Client Properties'</div>
+ documentation at https://accumulo.apache.org/docs/2.x/configuration/client-properties</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>properties</code> - Properties object</dd>
@@ -273,6 +295,6 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.I
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2019 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html
index ceae395..73faf80 100644
--- a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html
+++ b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:35 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:12 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AccumuloClient.SaslOptions (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>AccumuloClient.SaslOptions (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AccumuloClient.SaslOptions (Apache Accumulo Project 2.0.0-alpha-1 API)";
+            parent.document.title="AccumuloClient.SaslOptions (Apache Accumulo Project 2.0.0-alpha-2 API)";
         }
     }
     catch(err) {
@@ -94,7 +94,7 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.accumulo.core.client</div>
-<h2 title="Interface AccumuloClient.SaslOptions" class="title">Interface AccumuloClient.SaslOptions</h2>
+<h2 title="Interface AccumuloClient.SaslOptions" class="title">Interface AccumuloClient.SaslOptions&lt;T&gt;</h2>
 </div>
 <div class="contentContainer">
 <div class="description">
@@ -102,7 +102,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Superinterfaces:</dt>
-<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AccumuloClientFactory</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientInfoFactory</a></dd>
+<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientFactory</a>&lt;T&gt;</dd>
 </dl>
 <dl>
 <dt>Enclosing interface:</dt>
@@ -110,9 +110,13 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public static interface <span class="typeNameLabel">AccumuloClient.SaslOptions</span>
-extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AccumuloClientFactory</a></pre>
+<pre>public static interface <span class="typeNameLabel">AccumuloClient.SaslOptions&lt;T&gt;</span>
+extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientFactory</a>&lt;T&gt;</pre>
 <div class="block">Build methods for SASL</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.0.0</dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -132,31 +136,24 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.A
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SaslOptions</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html#withPrimary-java.lang.String-">withPrimary</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;kerberosServerPrimary)</code>
+<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SaslOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="type parameter in AccumuloClient.SaslOptions">T</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html#primary-java.lang.CharSequence-">primary</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;kerberosServerPrimary)</code>
 <div class="block">Build with Kerberos Server Primary</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SaslOptions</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html#withQop-java.lang.String-">withQop</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;qualityOfProtection)</code>
+<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SaslOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="type parameter in AccumuloClient.SaslOptions">T</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html#qop-java.lang.CharSequence-">qop</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;qualityOfProtection)</code>
 <div class="block">Build with SASL quality of protection</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.accumulo.core.client.AccumuloClient.AccumuloClientFactory">
-<!--   -->
-</a>
-<h3>Methods inherited from interface&nbsp;org.apache.accumulo.core.client.<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AccumuloClientFactory</a></h3>
-<code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html#build--">build</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.accumulo.core.client.AccumuloClient.ClientInfoFactory">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.accumulo.core.client.AccumuloClient.ClientFactory">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.accumulo.core.client.<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientInfoFactory</a></h3>
-<code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html#info--">info</a></code></li>
+<h3>Methods inherited from interface&nbsp;org.apache.accumulo.core.client.<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientFactory</a></h3>
+<code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html#build--">build</a></code></li>
 </ul>
 </li>
 </ul>
@@ -172,13 +169,13 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.A
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="withPrimary-java.lang.String-">
+<a name="primary-java.lang.CharSequence-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>withPrimary</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SaslOptions</a>&nbsp;withPrimary(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;kerberosServerPrimary)</pre>
+<h4>primary</h4>
+<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SaslOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="type parameter in AccumuloClient.SaslOptions">T</a>&gt;&nbsp;primary(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSeque [...]
 <div class="block">Build with Kerberos Server Primary</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -188,13 +185,13 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.A
 </dl>
 </li>
 </ul>
-<a name="withQop-java.lang.String-">
+<a name="qop-java.lang.CharSequence-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>withQop</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SaslOptions</a>&nbsp;withQop(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;qualityOfProtection)</pre>
+<h4>qop</h4>
+<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SaslOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="type parameter in AccumuloClient.SaslOptions">T</a>&gt;&nbsp;qop(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence< [...]
 <div class="block">Build with SASL quality of protection</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -273,6 +270,6 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.A
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2019 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.SslOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.SslOptions.html
index e72acec..56b5a83 100644
--- a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.SslOptions.html
+++ b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.SslOptions.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:35 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:12 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AccumuloClient.SslOptions (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>AccumuloClient.SslOptions (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AccumuloClient.SslOptions (Apache Accumulo Project 2.0.0-alpha-1 API)";
+            parent.document.title="AccumuloClient.SslOptions (Apache Accumulo Project 2.0.0-alpha-2 API)";
         }
     }
     catch(err) {
@@ -94,7 +94,7 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.accumulo.core.client</div>
-<h2 title="Interface AccumuloClient.SslOptions" class="title">Interface AccumuloClient.SslOptions</h2>
+<h2 title="Interface AccumuloClient.SslOptions" class="title">Interface AccumuloClient.SslOptions&lt;T&gt;</h2>
 </div>
 <div class="contentContainer">
 <div class="description">
@@ -102,7 +102,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Superinterfaces:</dt>
-<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AccumuloClientFactory</a>, <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientInfoFactory</a></dd>
+<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientFactory</a>&lt;T&gt;</dd>
 </dl>
 <dl>
 <dt>Enclosing interface:</dt>
@@ -110,9 +110,13 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public static interface <span class="typeNameLabel">AccumuloClient.SslOptions</span>
-extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AccumuloClientFactory</a></pre>
+<pre>public static interface <span class="typeNameLabel">AccumuloClient.SslOptions&lt;T&gt;</span>
+extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientFactory</a>&lt;T&gt;</pre>
 <div class="block">Build methods for SSL/TLS</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.0.0</dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -132,53 +136,46 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.A
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html#useJsse--">useJsse</a></span>()</code>
-<div class="block">Use JSSE system properties to configure SSL</div>
+<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="type parameter in AccumuloClient.SslOptions">T</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html#keystore-java.lang.CharSequence-">keystore</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;path)</code>
+<div class="block">Build with SSL key store</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html#withKeystore-java.lang.String-">withKeystore</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path)</code>
+<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="type parameter in AccumuloClient.SslOptions">T</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html#keystore-java.lang.CharSequence-java.lang.CharSequence-java.lang.CharSequence-">keystore</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;path,
+        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;password,
+        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;type)</code>
 <div class="block">Build with SSL key store</div>
 </td>
 </tr>
 <tr id="i2" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html#withKeystore-java.lang.String-java.lang.String-java.lang.String-">withKeystore</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path,
-            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;password,
-            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;type)</code>
-<div class="block">Build with SSL key store</div>
+<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="type parameter in AccumuloClient.SslOptions">T</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html#truststore-java.lang.CharSequence-">truststore</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;path)</code>
+<div class="block">Build with SSL trust store</div>
 </td>
 </tr>
 <tr id="i3" class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html#withTruststore-java.lang.String-">withTruststore</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path)</code>
+<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="type parameter in AccumuloClient.SslOptions">T</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html#truststore-java.lang.CharSequence-java.lang.CharSequence-java.lang.CharSequence-">truststore</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;path,
+          <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;password,
+          <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;type)</code>
 <div class="block">Build with SSL trust store</div>
 </td>
 </tr>
 <tr id="i4" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html#withTruststore-java.lang.String-java.lang.String-java.lang.String-">withTruststore</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path,
-              <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;password,
-              <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;type)</code>
-<div class="block">Build with SSL trust store</div>
+<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="type parameter in AccumuloClient.SslOptions">T</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html#useJsse--">useJsse</a></span>()</code>
+<div class="block">Use JSSE system properties to configure SSL</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.accumulo.core.client.AccumuloClient.AccumuloClientFactory">
-<!--   -->
-</a>
-<h3>Methods inherited from interface&nbsp;org.apache.accumulo.core.client.<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AccumuloClientFactory</a></h3>
-<code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html#build--">build</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.accumulo.core.client.AccumuloClient.ClientInfoFactory">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.accumulo.core.client.AccumuloClient.ClientFactory">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.accumulo.core.client.<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientInfoFactory</a></h3>
-<code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html#info--">info</a></code></li>
+<h3>Methods inherited from interface&nbsp;org.apache.accumulo.core.client.<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientFactory</a></h3>
+<code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html#build--">build</a></code></li>
 </ul>
 </li>
 </ul>
@@ -194,13 +191,13 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.A
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="withTruststore-java.lang.String-">
+<a name="truststore-java.lang.CharSequence-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>withTruststore</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a>&nbsp;withTruststore(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path)</pre>
+<h4>truststore</h4>
+<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="type parameter in AccumuloClient.SslOptions">T</a>&gt;&nbsp;truststore(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequen [...]
 <div class="block">Build with SSL trust store</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -210,15 +207,15 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.A
 </dl>
 </li>
 </ul>
-<a name="withTruststore-java.lang.String-java.lang.String-java.lang.String-">
+<a name="truststore-java.lang.CharSequence-java.lang.CharSequence-java.lang.CharSequence-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>withTruststore</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a>&nbsp;withTruststore(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path,
-                                         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;password,
-                                         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;type)</pre>
+<h4>truststore</h4>
+<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="type parameter in AccumuloClient.SslOptions">T</a>&gt;&nbsp;truststore(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequen [...]
+                                        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;password,
+                                        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;type)</pre>
 <div class="block">Build with SSL trust store</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -230,13 +227,13 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.A
 </dl>
 </li>
 </ul>
-<a name="withKeystore-java.lang.String-">
+<a name="keystore-java.lang.CharSequence-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>withKeystore</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a>&nbsp;withKeystore(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path)</pre>
+<h4>keystore</h4>
+<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="type parameter in AccumuloClient.SslOptions">T</a>&gt;&nbsp;keystore(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence [...]
 <div class="block">Build with SSL key store</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -246,15 +243,15 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.A
 </dl>
 </li>
 </ul>
-<a name="withKeystore-java.lang.String-java.lang.String-java.lang.String-">
+<a name="keystore-java.lang.CharSequence-java.lang.CharSequence-java.lang.CharSequence-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>withKeystore</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a>&nbsp;withKeystore(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path,
-                                       <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;password,
-                                       <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;type)</pre>
+<h4>keystore</h4>
+<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="type parameter in AccumuloClient.SslOptions">T</a>&gt;&nbsp;keystore(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence [...]
+                                      <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;password,
+                                      <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;type)</pre>
 <div class="block">Build with SSL key store</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -272,7 +269,7 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.A
 <ul class="blockListLast">
 <li class="blockList">
 <h4>useJsse</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a>&nbsp;useJsse()</pre>
+<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="type parameter in AccumuloClient.SslOptions">T</a>&gt;&nbsp;useJsse()</pre>
 <div class="block">Use JSSE system properties to configure SSL</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -349,6 +346,6 @@ extends <a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.A
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2019 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.html
index d7831b1..022ac97 100644
--- a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.html
+++ b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:34 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:12 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AccumuloClient (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>AccumuloClient (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,13 +13,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AccumuloClient (Apache Accumulo Project 2.0.0-alpha-1 API)";
+            parent.document.title="AccumuloClient (Apache Accumulo Project 2.0.0-alpha-2 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6,"i15":6,"i16":6,"i17":6,"i18":6};
+var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6,"i15":6,"i16":6,"i17":6,"i18":6,"i19":6,"i20":6};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -51,7 +51,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/accumulo/core/client/Accumulo.html" title="class in org.apache.accumulo.core.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/accumulo/core/client/AccumuloClient.html" target="_top">Frames</a></li>
@@ -100,18 +100,39 @@ var activeTableTab = "activeTableTab";
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Superinterfaces:</dt>
+<dd><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/AutoCloseable.html?is-external=true" title="class or interface in java.lang">AutoCloseable</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public interface <span class="typeNameLabel">AccumuloClient</span></pre>
+<pre>public interface <span class="typeNameLabel">AccumuloClient</span>
+extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/AutoCloseable.html?is-external=true" title="class or interface in java.lang">AutoCloseable</a></pre>
 <div class="block">Client connection to an Accumulo instance. Allows the user to request a scanner, deleter or
  writer for the instance as well as various objects that permit administrative operations.
  Enforces security on the client side with by requiring user credentials.
 
+ <p>
  Supports fluent API for creation. Various options can be provided to <a href="../../../../../org/apache/accumulo/core/client/Accumulo.html#newClient--"><code>Accumulo.newClient()</code></a>
  and when finished a call to build() will return the AccumuloClient object. For example:
 
- <code>Accumulo.newClient().forInstance(instanceName, zookeepers)
-         .usingPassword(user, password).withZkTimeout(1234).build();</code></div>
+ <pre>
+ <code>
+ try (AccumuloClient client = Accumulo.newClient()
+        .to(instanceName, zookeepers)
+        .as(user, password).build())
+ {
+   // use the client
+ }
+ </code>
+ </pre>
+
+ <p>
+ If migrating code from Connector to AccumuloClient an important difference to consider is that
+ AccumuloClient is closable and Connector is not. Connector uses static resources and therefore
+ creating them is cheap. AccumuloClient attempts to clean up resources on close, so constantly
+ creating them could perform worse than Connector. Therefore, it would be better to create an
+ AccumuloClient and pass it around.</div>
 <dl>
 <dt><span class="simpleTagLabel">Since:</span></dt>
 <dd>2.0.0</dd>
@@ -136,57 +157,47 @@ var activeTableTab = "activeTableTab";
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AccumuloClientFactory</a></span></code>
-<div class="block">Builds AccumuloClient</div>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AuthenticationArgs</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="type parameter in AccumuloClient.AuthenticationArgs">T</a>&gt;</span></code>
+<div class="block">Builder methods for authentication</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.AuthenticationArgs</a></span></code>
-<div class="block">Build methods for authentication</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientInfoFactory</a></span></code>
-<div class="block">Builds ClientInfo after all options have been specified</div>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientFactory</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientFactory.html" title="type parameter in AccumuloClient.ClientFactory">T</a>&gt;</span></code>
+<div class="block">Builds AccumuloClient or client Properties after all options have been specified</div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ClientInfoOptions</a></span></code>&nbsp;</td>
-</tr>
 <tr class="altColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.ConnectionOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html" title="type parameter in AccumuloClient.ConnectionOptions">T</a>&gt;</span></code>
 <div class="block">Build methods for connection options</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.FromOptions</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.FromOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.FromOptions.html" title="type parameter in AccumuloClient.FromOptions">T</a>&gt;</span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.InstanceArgs</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.InstanceArgs</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html" title="type parameter in AccumuloClient.InstanceArgs">T</a>&gt;</span></code>
 <div class="block">Builder method for setting Accumulo instance and zookeepers</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.PropertyOptions</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.PropertyOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html" title="type parameter in AccumuloClient.PropertyOptions">T</a>&gt;</span></code>
 <div class="block">Builder methods for creating AccumuloClient using properties</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SaslOptions</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SaslOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html" title="type parameter in AccumuloClient.SaslOptions">T</a>&gt;</span></code>
 <div class="block">Build methods for SASL</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="interface in org.apache.accumulo.core.client">AccumuloClient.SslOptions</a>&lt;<a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.SslOptions.html" title="type parameter in AccumuloClient.SslOptions">T</a>&gt;</span></code>
 <div class="block">Build methods for SSL/TLS</div>
 </td>
 </tr>
@@ -206,10 +217,9 @@ var activeTableTab = "activeTableTab";
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client">AccumuloClient</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html#changeUser-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-">changeUser</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;principal,
-          <a href="../../../../../org/apache/accumulo/core/client/security/tokens/AuthenticationToken.html" title="interface in org.apache.accumulo.core.client.security.tokens">AuthenticationToken</a>&nbsp;token)</code>
-<div class="block">Change user</div>
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html#close--">close</a></span>()</code>
+<div class="block">Cleans up any resources created by an AccumuloClient like threads and sockets.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
@@ -231,12 +241,19 @@ var activeTableTab = "activeTableTab";
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/BatchScanner.html" title="interface in org.apache.accumulo.core.client">BatchScanner</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html#createBatchScanner-java.lang.String-">createBatchScanner</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;tableName)</code>
+<div class="block">Factory method to create a BatchScanner with all of user's authorizations and the number of
+ query threads configured when AccumuloClient was created.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/BatchScanner.html" title="interface in org.apache.accumulo.core.client">BatchScanner</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html#createBatchScanner-java.lang.String-org.apache.accumulo.core.security.Authorizations-">createBatchScanner</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;tableName,
                   <a href="../../../../../org/apache/accumulo/core/security/Authorizations.html" title="class in org.apache.accumulo.core.security">Authorizations</a>&nbsp;authorizations)</code>
 <div class="block">Factory method to create a BatchScanner connected to Accumulo.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/BatchScanner.html" title="interface in org.apache.accumulo.core.client">BatchScanner</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html#createBatchScanner-java.lang.String-org.apache.accumulo.core.security.Authorizations-int-">createBatchScanner</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;tableName,
                   <a href="../../../../../org/apache/accumulo/core/security/Authorizations.html" title="class in org.apache.accumulo.core.security">Authorizations</a>&nbsp;authorizations,
@@ -244,88 +261,94 @@ var activeTableTab = "activeTableTab";
 <div class="block">Factory method to create a BatchScanner connected to Accumulo.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/BatchWriter.html" title="interface in org.apache.accumulo.core.client">BatchWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html#createBatchWriter-java.lang.String-">createBatchWriter</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;tableName)</code>
 <div class="block">Factory method to create a BatchWriter.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/BatchWriter.html" title="interface in org.apache.accumulo.core.client">BatchWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html#createBatchWriter-java.lang.String-org.apache.accumulo.core.client.BatchWriterConfig-">createBatchWriter</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;tableName,
                  <a href="../../../../../org/apache/accumulo/core/client/BatchWriterConfig.html" title="class in org.apache.accumulo.core.client">BatchWriterConfig</a>&nbsp;config)</code>
 <div class="block">Factory method to create a BatchWriter connected to Accumulo.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/ConditionalWriter.html" title="interface in org.apache.accumulo.core.client">ConditionalWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html#createConditionalWriter-java.lang.String-org.apache.accumulo.core.client.ConditionalWriterConfig-">createConditionalWriter</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;tableName,
                        <a href="../../../../../org/apache/accumulo/core/client/ConditionalWriterConfig.html" title="class in org.apache.accumulo.core.client">ConditionalWriterConfig</a>&nbsp;config)</code>
 <div class="block">Factory method to create a ConditionalWriter connected to Accumulo.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/MultiTableBatchWriter.html" title="interface in org.apache.accumulo.core.client">MultiTableBatchWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html#createMultiTableBatchWriter--">createMultiTableBatchWriter</a></span>()</code>
 <div class="block">Factory method to create a Multi-Table BatchWriter.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/MultiTableBatchWriter.html" title="interface in org.apache.accumulo.core.client">MultiTableBatchWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html#createMultiTableBatchWriter-org.apache.accumulo.core.client.BatchWriterConfig-">createMultiTableBatchWriter</a></span>(<a href="../../../../../org/apache/accumulo/core/client/BatchWriterConfig.html" title="class in org.apache.accumulo.core.client">BatchWriterConfig</a>&nbsp;config)</code>
 <div class="block">Factory method to create a Multi-Table BatchWriter connected to Accumulo.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/Scanner.html" title="interface in org.apache.accumulo.core.client">Scanner</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html#createScanner-java.lang.String-">createScanner</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;tableName)</code>
+<div class="block">Factory method to create a Scanner with all of the user's authorizations.</div>
+</td>
+</tr>
+<tr id="i12" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/Scanner.html" title="interface in org.apache.accumulo.core.client">Scanner</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html#createScanner-java.lang.String-org.apache.accumulo.core.security.Authorizations-">createScanner</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;tableName,
              <a href="../../../../../org/apache/accumulo/core/security/Authorizations.html" title="class in org.apache.accumulo.core.security">Authorizations</a>&nbsp;authorizations)</code>
 <div class="block">Factory method to create a Scanner connected to Accumulo.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i13" class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html#getInstanceID--">getInstanceID</a></span>()</code>
 <div class="block">Returns a unique string that identifies this instance of accumulo.</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client">ClientInfo</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html#info--">info</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i13" class="rowColor">
+<tr id="i14" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/admin/InstanceOperations.html" title="interface in org.apache.accumulo.core.client.admin">InstanceOperations</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html#instanceOperations--">instanceOperations</a></span>()</code>
 <div class="block">Retrieves an InstanceOperations object to modify instance configuration.</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/admin/NamespaceOperations.html" title="interface in org.apache.accumulo.core.client.admin">NamespaceOperations</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html#namespaceOperations--">namespaceOperations</a></span>()</code>
 <div class="block">Retrieves a NamespaceOperations object to perform namespace functions, such as create and
  delete.</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr id="i16" class="altColor">
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util">Properties</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html#properties--">properties</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/admin/ReplicationOperations.html" title="interface in org.apache.accumulo.core.client.admin">ReplicationOperations</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html#replicationOperations--">replicationOperations</a></span>()</code>
 <div class="block">Retrieves a ReplicationOperations object to manage replication configuration.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i18" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/admin/SecurityOperations.html" title="interface in org.apache.accumulo.core.client.admin">SecurityOperations</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html#securityOperations--">securityOperations</a></span>()</code>
 <div class="block">Retrieves a SecurityOperations object to perform user security operations, such as creating
  users.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/accumulo/core/client/admin/TableOperations.html" title="interface in org.apache.accumulo.core.client.admin">TableOperations</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html#tableOperations--">tableOperations</a></span>()</code>
 <div class="block">Retrieves a TableOperations object to perform table functions, such as create and delete.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html#whoami--">whoami</a></span>()</code>
 <div class="block">Get the current user for this AccumuloClient</div>
@@ -398,6 +421,31 @@ var activeTableTab = "activeTableTab";
 </dl>
 </li>
 </ul>
+<a name="createBatchScanner-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createBatchScanner</h4>
+<pre><a href="../../../../../org/apache/accumulo/core/client/BatchScanner.html" title="interface in org.apache.accumulo.core.client">BatchScanner</a>&nbsp;createBatchScanner(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;tableName)
+                         throws <a href="../../../../../org/apache/accumulo/core/client/TableNotFoundException.html" title="class in org.apache.accumulo.core.client">TableNotFoundException</a>,
+                                <a href="../../../../../org/apache/accumulo/core/client/AccumuloSecurityException.html" title="class in org.apache.accumulo.core.client">AccumuloSecurityException</a>,
+                                <a href="../../../../../org/apache/accumulo/core/client/AccumuloException.html" title="class in org.apache.accumulo.core.client">AccumuloException</a></pre>
+<div class="block">Factory method to create a BatchScanner with all of user's authorizations and the number of
+ query threads configured when AccumuloClient was created. If no query threads were configured,
+ defaults will be used.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>tableName</code> - the name of the table to query</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>BatchScanner object for configuring and querying</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../../../../org/apache/accumulo/core/client/TableNotFoundException.html" title="class in org.apache.accumulo.core.client">TableNotFoundException</a></code> - when the specified table doesn't exist</dd>
+<dd><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloSecurityException.html" title="class in org.apache.accumulo.core.client">AccumuloSecurityException</a></code></dd>
+<dd><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloException.html" title="class in org.apache.accumulo.core.client">AccumuloException</a></code></dd>
+</dl>
+</li>
+</ul>
 <a name="createBatchDeleter-java.lang.String-org.apache.accumulo.core.security.Authorizations-int-org.apache.accumulo.core.client.BatchWriterConfig-">
 <!--   -->
 </a>
@@ -562,6 +610,31 @@ var activeTableTab = "activeTableTab";
 </dl>
 </li>
 </ul>
+<a name="createScanner-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createScanner</h4>
+<pre><a href="../../../../../org/apache/accumulo/core/client/Scanner.html" title="interface in org.apache.accumulo.core.client">Scanner</a>&nbsp;createScanner(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;tableName)
+               throws <a href="../../../../../org/apache/accumulo/core/client/TableNotFoundException.html" title="class in org.apache.accumulo.core.client">TableNotFoundException</a>,
+                      <a href="../../../../../org/apache/accumulo/core/client/AccumuloSecurityException.html" title="class in org.apache.accumulo.core.client">AccumuloSecurityException</a>,
+                      <a href="../../../../../org/apache/accumulo/core/client/AccumuloException.html" title="class in org.apache.accumulo.core.client">AccumuloException</a></pre>
+<div class="block">Factory method to create a Scanner with all of the user's authorizations.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>tableName</code> - the name of the table to query data from</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Scanner object for configuring and querying data with</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../../../../org/apache/accumulo/core/client/TableNotFoundException.html" title="class in org.apache.accumulo.core.client">TableNotFoundException</a></code> - when the specified table doesn't exist</dd>
+<dd><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloSecurityException.html" title="class in org.apache.accumulo.core.client">AccumuloSecurityException</a></code></dd>
+<dd><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloException.html" title="class in org.apache.accumulo.core.client">AccumuloException</a></code></dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../org/apache/accumulo/core/client/IsolatedScanner.html" title="class in org.apache.accumulo.core.client"><code>IsolatedScanner</code></a></dd>
+</dl>
+</li>
+</ul>
 <a name="createConditionalWriter-java.lang.String-org.apache.accumulo.core.client.ConditionalWriterConfig-">
 <!--   -->
 </a>
@@ -683,39 +756,32 @@ var activeTableTab = "activeTableTab";
 </dl>
 </li>
 </ul>
-<a name="info--">
+<a name="properties--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>info</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client">ClientInfo</a>&nbsp;info()</pre>
+<h4>properties</h4>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util">Properties</a>&nbsp;properties()</pre>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd><a href="../../../../../org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client"><code>ClientInfo</code></a> which contains information about client connection to Accumulo</dd>
+<dd>All <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util"><code>Properties</code></a> used to create client except 'auth.token'</dd>
 </dl>
 </li>
 </ul>
-<a name="changeUser-java.lang.String-org.apache.accumulo.core.client.security.tokens.AuthenticationToken-">
+<a name="close--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>changeUser</h4>
-<pre><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client">AccumuloClient</a>&nbsp;changeUser(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;principal,
-                          <a href="../../../../../org/apache/accumulo/core/client/security/tokens/AuthenticationToken.html" title="interface in org.apache.accumulo.core.client.security.tokens">AuthenticationToken</a>&nbsp;token)
-                   throws <a href="../../../../../org/apache/accumulo/core/client/AccumuloSecurityException.html" title="class in org.apache.accumulo.core.client">AccumuloSecurityException</a>,
-                          <a href="../../../../../org/apache/accumulo/core/client/AccumuloException.html" title="class in org.apache.accumulo.core.client">AccumuloException</a></pre>
-<div class="block">Change user</div>
+<h4>close</h4>
+<pre>void&nbsp;close()</pre>
+<div class="block">Cleans up any resources created by an AccumuloClient like threads and sockets. Anything created
+ from this client will likely not work after calling this method. For example a Scanner created
+ using this client will likely fail after close is called.</div>
 <dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>principal</code> - Principal/username</dd>
-<dd><code>token</code> - Authentication token</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.html" title="interface in org.apache.accumulo.core.client"><code>AccumuloClient</code></a> for new user</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloSecurityException.html" title="class in org.apache.accumulo.core.client">AccumuloSecurityException</a></code></dd>
-<dd><code><a href="../../../../../org/apache/accumulo/core/client/AccumuloException.html" title="class in org.apache.accumulo.core.client">AccumuloException</a></code></dd>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/AutoCloseable.html?is-external=true#close--" title="class or interface in java.lang">close</a></code>&nbsp;in interface&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/AutoCloseable.html?is-external=true" title="class or interface in java.lang">AutoCloseable</a></code></dd>
 </dl>
 </li>
 </ul>
@@ -748,7 +814,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/accumulo/core/client/Accumulo.html" title="class in org.apache.accumulo.core.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/accumulo/core/client/AccumuloClient.html" target="_top">Frames</a></li>
@@ -788,6 +854,6 @@ var activeTableTab = "activeTableTab";
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2019 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloException.html
index 3be568f..c205004 100644
--- a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloException.html
+++ b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:35 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:12 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AccumuloException (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>AccumuloException (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AccumuloException (Apache Accumulo Project 2.0.0-alpha-1 API)";
+            parent.document.title="AccumuloException (Apache Accumulo Project 2.0.0-alpha-2 API)";
         }
     }
     catch(err) {
@@ -303,6 +303,6 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.h
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2019 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloSecurityException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloSecurityException.html
index 12562f0..c376c41 100644
--- a/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloSecurityException.html
+++ b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloSecurityException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:35 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:12 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AccumuloSecurityException (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>AccumuloSecurityException (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AccumuloSecurityException (Apache Accumulo Project 2.0.0-alpha-1 API)";
+            parent.document.title="AccumuloSecurityException (Apache Accumulo Project 2.0.0-alpha-2 API)";
         }
     }
     catch(err) {
@@ -150,27 +150,27 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.h
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloSecurityException.html#AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode-">AccumuloSecurityException</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;user,
-                         org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode&nbsp;errorcode)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloSecurityException.html#AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode-">AccumuloSecurityException</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;user,
+                         org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode&nbsp;errorcode)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloSecurityException.html#AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode-java.lang.String-">AccumuloSecurityException</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;user,
-                         org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode&nbsp;errorcode,
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloSecurityException.html#AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode-java.lang.String-">AccumuloSecurityException</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;user,
+                         org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode&nbsp;errorcode,
                          <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;tableInfo)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloSecurityException.html#AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode-java.lang.String-java.lang.Throwable-">AccumuloSecurityException</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;user,
-                         org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode&nbsp;errorcode,
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloSecurityException.html#AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode-java.lang.String-java.lang.Throwable-">AccumuloSecurityException</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;user,
+                         org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode&nbsp;errorcode,
                          <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;tableInfo,
                          <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloSecurityException.html#AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode-java.lang.Throwable-">AccumuloSecurityException</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;user,
-                         org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode&nbsp;errorcode,
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloSecurityException.html#AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode-java.lang.Throwable-">AccumuloSecurityException</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;user,
+                         org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode&nbsp;errorcode,
                          <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloSecurityException.html#AccumuloSecurityException-org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException-">AccumuloSecurityException</a></span>(org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException&nbsp;thrift)</code>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloSecurityException.html#AccumuloSecurityException-org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException-">AccumuloSecurityException</a></span>(org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException&nbsp;thrift)</code>
 <div class="block">Construct a user-facing exception from a serialized version.</div>
 </td>
 </tr>
@@ -190,7 +190,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.h
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException</code></td>
+<td class="colFirst"><code>org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/accumulo/core/client/AccumuloSecurityException.html#asThriftException--">asThriftException</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
@@ -246,13 +246,13 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.h
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="AccumuloSecurityException-org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException-">
+<a name="AccumuloSecurityException-org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>AccumuloSecurityException</h4>
-<pre>public&nbsp;AccumuloSecurityException(org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException&nbsp;thrift)</pre>
+<pre>public&nbsp;AccumuloSecurityException(org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException&nbsp;thrift)</pre>
 <div class="block">Construct a user-facing exception from a serialized version.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -260,14 +260,14 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.h
 </dl>
 </li>
 </ul>
-<a name="AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode-java.lang.Throwable-">
+<a name="AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode-java.lang.Throwable-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>AccumuloSecurityException</h4>
 <pre>public&nbsp;AccumuloSecurityException(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;user,
-                                 org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode&nbsp;errorcode,
+                                 org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode&nbsp;errorcode,
                                  <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</pre>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -277,14 +277,14 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.h
 </dl>
 </li>
 </ul>
-<a name="AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode-java.lang.String-java.lang.Throwable-">
+<a name="AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode-java.lang.String-java.lang.Throwable-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>AccumuloSecurityException</h4>
 <pre>public&nbsp;AccumuloSecurityException(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;user,
-                                 org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode&nbsp;errorcode,
+                                 org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode&nbsp;errorcode,
                                  <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;tableInfo,
                                  <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</pre>
 <dl>
@@ -296,14 +296,14 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.h
 </dl>
 </li>
 </ul>
-<a name="AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode-">
+<a name="AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>AccumuloSecurityException</h4>
 <pre>public&nbsp;AccumuloSecurityException(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;user,
-                                 org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode&nbsp;errorcode)</pre>
+                                 org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode&nbsp;errorcode)</pre>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>user</code> - the relevant user for the security violation</dd>
@@ -311,14 +311,14 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.h
 </dl>
 </li>
 </ul>
-<a name="AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode-java.lang.String-">
+<a name="AccumuloSecurityException-java.lang.String-org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode-java.lang.String-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>AccumuloSecurityException</h4>
 <pre>public&nbsp;AccumuloSecurityException(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;user,
-                                 org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode&nbsp;errorcode,
+                                 org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode&nbsp;errorcode,
                                  <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;tableInfo)</pre>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -342,7 +342,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.h
 <ul class="blockList">
 <li class="blockList">
 <h4>asThriftException</h4>
-<pre>public&nbsp;org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException&nbsp;asThriftException()</pre>
+<pre>public&nbsp;org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException&nbsp;asThriftException()</pre>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>this exception as a thrift exception</dd>
@@ -490,6 +490,6 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.h
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2019 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/docs/2.x/apidocs/org/apache/accumulo/core/client/BatchDeleter.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/BatchDeleter.html
index 3a773ae..e010f49 100644
--- a/docs/2.x/apidocs/org/apache/accumulo/core/client/BatchDeleter.html
+++ b/docs/2.x/apidocs/org/apache/accumulo/core/client/BatchDeleter.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:35 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:12 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>BatchDeleter (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>BatchDeleter (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="BatchDeleter (Apache Accumulo Project 2.0.0-alpha-1 API)";
+            parent.document.title="BatchDeleter (Apache Accumulo Project 2.0.0-alpha-2 API)";
         }
     }
     catch(err) {
@@ -292,6 +292,6 @@ extends <a href="../../../../../org/apache/accumulo/core/client/ScannerBase.html
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2019 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/docs/2.x/apidocs/org/apache/accumulo/core/client/BatchScanner.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/BatchScanner.html
index 4989afb..bf4cad3 100644
--- a/docs/2.x/apidocs/org/apache/accumulo/core/client/BatchScanner.html
+++ b/docs/2.x/apidocs/org/apache/accumulo/core/client/BatchScanner.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:35 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:12 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>BatchScanner (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>BatchScanner (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="BatchScanner (Apache Accumulo Project 2.0.0-alpha-1 API)";
+            parent.document.title="BatchScanner (Apache Accumulo Project 2.0.0-alpha-2 API)";
         }
     }
     catch(err) {
@@ -328,6 +328,6 @@ extends <a href="../../../../../org/apache/accumulo/core/client/ScannerBase.html
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2019 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/docs/2.x/apidocs/org/apache/accumulo/core/client/BatchWriter.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/BatchWriter.html
index 264c946..ca629a6 100644
--- a/docs/2.x/apidocs/org/apache/accumulo/core/client/BatchWriter.html
+++ b/docs/2.x/apidocs/org/apache/accumulo/core/client/BatchWriter.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:35 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:12 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>BatchWriter (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>BatchWriter (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="BatchWriter (Apache Accumulo Project 2.0.0-alpha-1 API)";
+            parent.document.title="BatchWriter (Apache Accumulo Project 2.0.0-alpha-2 API)";
         }
     }
     catch(err) {
@@ -312,6 +312,6 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/AutoCloseab
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2019 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/docs/2.x/apidocs/org/apache/accumulo/core/client/BatchWriterConfig.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/BatchWriterConfig.html
index a26756e..bc14707 100644
--- a/docs/2.x/apidocs/org/apache/accumulo/core/client/BatchWriterConfig.html
+++ b/docs/2.x/apidocs/org/apache/accumulo/core/client/BatchWriterConfig.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:35 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:12 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>BatchWriterConfig (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>BatchWriterConfig (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="BatchWriterConfig (Apache Accumulo Project 2.0.0-alpha-1 API)";
+            parent.document.title="BatchWriterConfig (Apache Accumulo Project 2.0.0-alpha-2 API)";
         }
     }
     catch(err) {
@@ -609,6 +609,6 @@ implements org.apache.hadoop.io.Writable</pre>
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2019 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/docs/2.x/apidocs/org/apache/accumulo/core/client/ClientConfiguration.ClientProperty.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/ClientConfiguration.ClientProperty.html
index 46df0f6..d61dab0 100644
--- a/docs/2.x/apidocs/org/apache/accumulo/core/client/ClientConfiguration.ClientProperty.html
+++ b/docs/2.x/apidocs/org/apache/accumulo/core/client/ClientConfiguration.ClientProperty.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:35 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:12 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ClientConfiguration.ClientProperty (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>ClientConfiguration.ClientProperty (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ClientConfiguration.ClientProperty (Apache Accumulo Project 2.0.0-alpha-1 API)";
+            parent.document.title="ClientConfiguration.ClientProperty (Apache Accumulo Project 2.0.0-alpha-2 API)";
         }
     }
     catch(err) {
@@ -51,7 +51,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/accumulo/core/client/ClientConfiguration.html" title="class in org.apache.accumulo.core.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/accumulo/core/client/ClientSideIteratorScanner.html" title="class in org.apache.accumulo.core.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/accumulo/core/client/ClientConfiguration.ClientProperty.html" target="_top">Frames</a></li>
@@ -582,7 +582,7 @@ not permitted.)</div>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/accumulo/core/client/ClientConfiguration.html" title="class in org.apache.accumulo.core.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/accumulo/core/client/ClientInfo.html" title="interface in org.apache.accumulo.core.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/accumulo/core/client/ClientSideIteratorScanner.html" title="class in org.apache.accumulo.core.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/accumulo/core/client/ClientConfiguration.ClientProperty.html" target="_top">Frames</a></li>
@@ -622,6 +622,6 @@ not permitted.)</div>
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2019 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/docs/2.x/apidocs/org/apache/accumulo/core/client/ClientConfiguration.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/ClientConfiguration.html
index ebcd5ce..9b20f40 100644
--- a/docs/2.x/apidocs/org/apache/accumulo/core/client/ClientConfiguration.html
+++ b/docs/2.x/apidocs/org/apache/accumulo/core/client/ClientConfiguration.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:35 EDT 2018 -->
+<!-- Generated by javadoc (1.8.0_191) on Thu Jan 31 13:05:12 EST 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ClientConfiguration (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
+<title>ClientConfiguration (Apache Accumulo Project 2.0.0-alpha-2 API)</title>
+<meta name="date" content="2019-01-31">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ClientConfiguration (Apache Accumulo Project 2.0.0-alpha-1 API)";
+            parent.document.title="ClientConfiguration (Apache Accumulo Project 2.0.0-alpha-2 API)";
         }
     }
     catch(err) {
@@ -935,6 +935,6 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2018 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2011&#x2013;2019 <a href="https://www.apache.org">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>
diff --git a/docs/2.x/apidocs/org/apache/accumulo/core/client/ClientInfo.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/ClientInfo.html
deleted file mode 100644
index 7a29f0e..0000000
--- a/docs/2.x/apidocs/org/apache/accumulo/core/client/ClientInfo.html
+++ /dev/null
@@ -1,370 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_181) on Sun Oct 14 21:24:35 EDT 2018 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ClientInfo (Apache Accumulo Project 2.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-10-14">
-<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ClientInfo (Apache Accumulo Project 2.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":17,"i1":17,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/ClientInfo.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/apache/accumulo/core/client/ClientConfiguration.ClientProperty.html" title="enum in org.apache.accumulo.core.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/accumulo/core/client/ClientSideIteratorScanner.html" title="class in org.apache.accumulo.core.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/accumulo/core/client/ClientInfo.html" target="_top">Frames</a></li>
-<li><a href="ClientInfo.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.accumulo.core.client</div>
-<h2 title="Interface ClientInfo" class="title">Interface ClientInfo</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public interface <span class="typeNameLabel">ClientInfo</span></pre>
-<div class="block">Accumulo client information. Can be built using <a href="../../../../../org/apache/accumulo/core/client/Accumulo.html#newClient--"><code>Accumulo.newClient()</code></a></div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0.0</dd>
-</dl>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
... 34612 lines suppressed ...


Mime
View raw message