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:e955987
Date Tue, 16 Oct 2018 19:20:37 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 302024a  Jekyll build from master:e955987
302024a is described below

commit 302024aa8e4f103f86fb569233819e1ec10bb67b
Author: Christopher Tubbs <ctubbsii@apache.org>
AuthorDate: Tue Oct 16 15:17:15 2018 -0400

    Jekyll build from master:e955987
    
    Consolidate docs for 2.x and later (#119)
    
    * Rename 2.0 paths to 2.x
    * Move 2.x apidocs into 2.x collection
    * Update some contributing instructions pertaining to website
    maintenance
---
 README.md                                          |   4 +-
 contributor/making-release.html                    |  24 ++--
 docs/{2.0 => 2.x}/administration/caching.html      |  92 ++++++-------
 .../administration/configuration-management.html   |  96 ++++++-------
 docs/{2.0 => 2.x}/administration/crypto.html       |  94 ++++++-------
 docs/{2.0 => 2.x}/administration/fate.html         |  74 +++++-----
 .../administration/in-depth-install.html           | 140 +++++++++----------
 docs/{2.0 => 2.x}/administration/kerberos.html     |  80 +++++------
 .../administration/monitoring-metrics.html         |  90 ++++++------
 docs/{2.0 => 2.x}/administration/multivolume.html  |  78 +++++------
 docs/{2.0 => 2.x}/administration/properties.html   | 104 +++++++-------
 docs/{2.0 => 2.x}/administration/replication.html  | 126 ++++++++---------
 .../administration/scan-executors.html             |  92 ++++++-------
 docs/{2.0 => 2.x}/administration/ssl.html          |  98 ++++++-------
 docs/{2.0 => 2.x}/administration/tracing.html      |  94 ++++++-------
 docs/{2.0 => 2.x}/administration/upgrading.html    |  74 +++++-----
 {2.x => docs/2.x}/apidocs/allclasses-frame.html    |   0
 {2.x => docs/2.x}/apidocs/allclasses-noframe.html  |   0
 {2.x => docs/2.x}/apidocs/constant-values.html     |   0
 {2.x => docs/2.x}/apidocs/deprecated-list.html     |   0
 {2.x => docs/2.x}/apidocs/help-doc.html            |   0
 {2.x => docs/2.x}/apidocs/index-all.html           |   0
 {2.x => docs/2.x}/apidocs/index.html               |   0
 .../org/apache/accumulo/core/client/Accumulo.html  |   0
 .../AccumuloClient.AccumuloClientFactory.html      |   0
 .../client/AccumuloClient.AuthenticationArgs.html  |   0
 .../client/AccumuloClient.ClientInfoFactory.html   |   0
 .../client/AccumuloClient.ClientInfoOptions.html   |   0
 .../client/AccumuloClient.ConnectionOptions.html   |   0
 .../core/client/AccumuloClient.FromOptions.html    |   0
 .../core/client/AccumuloClient.InstanceArgs.html   |   0
 .../client/AccumuloClient.PropertyOptions.html     |   0
 .../core/client/AccumuloClient.SaslOptions.html    |   0
 .../core/client/AccumuloClient.SslOptions.html     |   0
 .../accumulo/core/client/AccumuloClient.html       |   0
 .../accumulo/core/client/AccumuloException.html    |   0
 .../core/client/AccumuloSecurityException.html     |   0
 .../apache/accumulo/core/client/BatchDeleter.html  |   0
 .../apache/accumulo/core/client/BatchScanner.html  |   0
 .../apache/accumulo/core/client/BatchWriter.html   |   0
 .../accumulo/core/client/BatchWriterConfig.html    |   0
 .../client/ClientConfiguration.ClientProperty.html |   0
 .../accumulo/core/client/ClientConfiguration.html  |   0
 .../apache/accumulo/core/client/ClientInfo.html    |   0
 .../core/client/ClientSideIteratorScanner.html     |   0
 .../core/client/ConditionalWriter.Result.html      |   0
 .../core/client/ConditionalWriter.Status.html      |   0
 .../accumulo/core/client/ConditionalWriter.html    |   0
 .../core/client/ConditionalWriterConfig.html       |   0
 .../org/apache/accumulo/core/client/Connector.html |   0
 .../apache/accumulo/core/client/Durability.html    |   0
 .../org/apache/accumulo/core/client/Instance.html  |   0
 .../client/IsolatedScanner.MemoryRowBuffer.html    |   0
 .../IsolatedScanner.MemoryRowBufferFactory.html    |   0
 .../core/client/IsolatedScanner.RowBuffer.html     |   0
 .../client/IsolatedScanner.RowBufferFactory.html   |   0
 .../accumulo/core/client/IsolatedScanner.html      |   0
 .../core/client/IteratorSetting.Column.html        |   0
 .../accumulo/core/client/IteratorSetting.html      |   0
 .../core/client/MultiTableBatchWriter.html         |   0
 .../core/client/MutationsRejectedException.html    |   0
 .../core/client/NamespaceExistsException.html      |   0
 .../core/client/NamespaceNotEmptyException.html    |   0
 .../core/client/NamespaceNotFoundException.html    |   0
 .../apache/accumulo/core/client/RowIterator.html   |   0
 .../core/client/SampleNotPresentException.html     |   0
 .../org/apache/accumulo/core/client/Scanner.html   |   0
 .../apache/accumulo/core/client/ScannerBase.html   |   0
 .../core/client/TableDeletedException.html         |   0
 .../accumulo/core/client/TableExistsException.html |   0
 .../core/client/TableNotFoundException.html        |   0
 .../core/client/TableOfflineException.html         |   0
 .../accumulo/core/client/TimedOutException.html    |   0
 .../accumulo/core/client/ZooKeeperInstance.html    |   0
 .../admin/ActiveCompaction.CompactionReason.html   |   0
 .../admin/ActiveCompaction.CompactionType.html     |   0
 .../core/client/admin/ActiveCompaction.html        |   0
 .../accumulo/core/client/admin/ActiveScan.html     |   0
 .../core/client/admin/CompactionConfig.html        |   0
 .../client/admin/CompactionStrategyConfig.html     |   0
 .../core/client/admin/DelegationTokenConfig.html   |   0
 .../accumulo/core/client/admin/DiskUsage.html      |   0
 .../apache/accumulo/core/client/admin/FindMax.html |   0
 .../core/client/admin/InitialTableState.html       |   0
 .../core/client/admin/InstanceOperations.html      |   0
 .../accumulo/core/client/admin/Locations.html      |   0
 .../core/client/admin/NamespaceOperations.html     |   0
 .../core/client/admin/NewTableConfiguration.html   |   0
 .../core/client/admin/ReplicationOperations.html   |   0
 .../accumulo/core/client/admin/ScanState.html      |   0
 .../accumulo/core/client/admin/ScanType.html       |   0
 .../core/client/admin/SecurityOperations.html      |   0
 .../core/client/admin/SummaryRetriever.html        |   0
 ...TableOperations.ImportDestinationArguments.html |   0
 .../TableOperations.ImportMappingOptions.html      |   0
 .../admin/TableOperations.ImportOptions.html       |   0
 .../core/client/admin/TableOperations.html         |   0
 .../accumulo/core/client/admin/TimeType.html       |   0
 .../ActiveCompaction.CompactionReason.html         |   0
 .../class-use/ActiveCompaction.CompactionType.html |   0
 .../client/admin/class-use/ActiveCompaction.html   |   0
 .../core/client/admin/class-use/ActiveScan.html    |   0
 .../client/admin/class-use/CompactionConfig.html   |   0
 .../admin/class-use/CompactionStrategyConfig.html  |   0
 .../admin/class-use/DelegationTokenConfig.html     |   0
 .../core/client/admin/class-use/DiskUsage.html     |   0
 .../core/client/admin/class-use/FindMax.html       |   0
 .../client/admin/class-use/InitialTableState.html  |   0
 .../client/admin/class-use/InstanceOperations.html |   0
 .../core/client/admin/class-use/Locations.html     |   0
 .../admin/class-use/NamespaceOperations.html       |   0
 .../admin/class-use/NewTableConfiguration.html     |   0
 .../admin/class-use/ReplicationOperations.html     |   0
 .../core/client/admin/class-use/ScanState.html     |   0
 .../core/client/admin/class-use/ScanType.html      |   0
 .../client/admin/class-use/SecurityOperations.html |   0
 .../client/admin/class-use/SummaryRetriever.html   |   0
 ...TableOperations.ImportDestinationArguments.html |   0
 .../TableOperations.ImportMappingOptions.html      |   0
 .../class-use/TableOperations.ImportOptions.html   |   0
 .../client/admin/class-use/TableOperations.html    |   0
 .../core/client/admin/class-use/TimeType.html      |   0
 .../accumulo/core/client/admin/package-frame.html  |   0
 .../core/client/admin/package-summary.html         |   0
 .../accumulo/core/client/admin/package-tree.html   |   0
 .../accumulo/core/client/admin/package-use.html    |   0
 .../accumulo/core/client/class-use/Accumulo.html   |   0
 .../AccumuloClient.AccumuloClientFactory.html      |   0
 .../AccumuloClient.AuthenticationArgs.html         |   0
 .../AccumuloClient.ClientInfoFactory.html          |   0
 .../AccumuloClient.ClientInfoOptions.html          |   0
 .../AccumuloClient.ConnectionOptions.html          |   0
 .../class-use/AccumuloClient.FromOptions.html      |   0
 .../class-use/AccumuloClient.InstanceArgs.html     |   0
 .../class-use/AccumuloClient.PropertyOptions.html  |   0
 .../class-use/AccumuloClient.SaslOptions.html      |   0
 .../class-use/AccumuloClient.SslOptions.html       |   0
 .../core/client/class-use/AccumuloClient.html      |   0
 .../core/client/class-use/AccumuloException.html   |   0
 .../class-use/AccumuloSecurityException.html       |   0
 .../core/client/class-use/BatchDeleter.html        |   0
 .../core/client/class-use/BatchScanner.html        |   0
 .../core/client/class-use/BatchWriter.html         |   0
 .../core/client/class-use/BatchWriterConfig.html   |   0
 .../ClientConfiguration.ClientProperty.html        |   0
 .../core/client/class-use/ClientConfiguration.html |   0
 .../accumulo/core/client/class-use/ClientInfo.html |   0
 .../class-use/ClientSideIteratorScanner.html       |   0
 .../client/class-use/ConditionalWriter.Result.html |   0
 .../client/class-use/ConditionalWriter.Status.html |   0
 .../core/client/class-use/ConditionalWriter.html   |   0
 .../client/class-use/ConditionalWriterConfig.html  |   0
 .../accumulo/core/client/class-use/Connector.html  |   0
 .../accumulo/core/client/class-use/Durability.html |   0
 .../accumulo/core/client/class-use/Instance.html   |   0
 .../class-use/IsolatedScanner.MemoryRowBuffer.html |   0
 .../IsolatedScanner.MemoryRowBufferFactory.html    |   0
 .../class-use/IsolatedScanner.RowBuffer.html       |   0
 .../IsolatedScanner.RowBufferFactory.html          |   0
 .../core/client/class-use/IsolatedScanner.html     |   0
 .../client/class-use/IteratorSetting.Column.html   |   0
 .../core/client/class-use/IteratorSetting.html     |   0
 .../client/class-use/MultiTableBatchWriter.html    |   0
 .../class-use/MutationsRejectedException.html      |   0
 .../client/class-use/NamespaceExistsException.html |   0
 .../class-use/NamespaceNotEmptyException.html      |   0
 .../class-use/NamespaceNotFoundException.html      |   0
 .../core/client/class-use/RowIterator.html         |   0
 .../class-use/SampleNotPresentException.html       |   0
 .../accumulo/core/client/class-use/Scanner.html    |   0
 .../core/client/class-use/ScannerBase.html         |   0
 .../client/class-use/TableDeletedException.html    |   0
 .../client/class-use/TableExistsException.html     |   0
 .../client/class-use/TableNotFoundException.html   |   0
 .../client/class-use/TableOfflineException.html    |   0
 .../core/client/class-use/TimedOutException.html   |   0
 .../core/client/class-use/ZooKeeperInstance.html   |   0
 .../core/client/lexicoder/AbstractEncoder.html     |   0
 .../core/client/lexicoder/BigIntegerLexicoder.html |   0
 .../core/client/lexicoder/BytesLexicoder.html      |   0
 .../core/client/lexicoder/DateLexicoder.html       |   0
 .../core/client/lexicoder/DoubleLexicoder.html     |   0
 .../accumulo/core/client/lexicoder/Encoder.html    |   0
 .../core/client/lexicoder/FloatLexicoder.html      |   0
 .../core/client/lexicoder/IntegerLexicoder.html    |   0
 .../accumulo/core/client/lexicoder/Lexicoder.html  |   0
 .../core/client/lexicoder/ListLexicoder.html       |   0
 .../core/client/lexicoder/LongLexicoder.html       |   0
 .../core/client/lexicoder/PairLexicoder.html       |   0
 .../core/client/lexicoder/ReverseLexicoder.html    |   0
 .../core/client/lexicoder/StringLexicoder.html     |   0
 .../core/client/lexicoder/TextLexicoder.html       |   0
 .../core/client/lexicoder/UIntegerLexicoder.html   |   0
 .../core/client/lexicoder/ULongLexicoder.html      |   0
 .../core/client/lexicoder/UUIDLexicoder.html       |   0
 .../lexicoder/class-use/AbstractEncoder.html       |   0
 .../lexicoder/class-use/BigIntegerLexicoder.html   |   0
 .../client/lexicoder/class-use/BytesLexicoder.html |   0
 .../client/lexicoder/class-use/DateLexicoder.html  |   0
 .../lexicoder/class-use/DoubleLexicoder.html       |   0
 .../core/client/lexicoder/class-use/Encoder.html   |   0
 .../client/lexicoder/class-use/FloatLexicoder.html |   0
 .../lexicoder/class-use/IntegerLexicoder.html      |   0
 .../core/client/lexicoder/class-use/Lexicoder.html |   0
 .../client/lexicoder/class-use/ListLexicoder.html  |   0
 .../client/lexicoder/class-use/LongLexicoder.html  |   0
 .../client/lexicoder/class-use/PairLexicoder.html  |   0
 .../lexicoder/class-use/ReverseLexicoder.html      |   0
 .../lexicoder/class-use/StringLexicoder.html       |   0
 .../client/lexicoder/class-use/TextLexicoder.html  |   0
 .../lexicoder/class-use/UIntegerLexicoder.html     |   0
 .../client/lexicoder/class-use/ULongLexicoder.html |   0
 .../client/lexicoder/class-use/UUIDLexicoder.html  |   0
 .../core/client/lexicoder/package-frame.html       |   0
 .../core/client/lexicoder/package-summary.html     |   0
 .../core/client/lexicoder/package-tree.html        |   0
 .../core/client/lexicoder/package-use.html         |   0
 .../AbstractInputFormat.AbstractRecordReader.html  |   0
 .../core/client/mapred/AbstractInputFormat.html    |   0
 .../client/mapred/AccumuloFileOutputFormat.html    |   0
 .../core/client/mapred/AccumuloInputFormat.html    |   0
 .../mapred/AccumuloMultiTableInputFormat.html      |   0
 .../AccumuloOutputFormat.AccumuloRecordWriter.html |   0
 .../core/client/mapred/AccumuloOutputFormat.html   |   0
 .../core/client/mapred/AccumuloRowInputFormat.html |   0
 .../mapred/InputFormatBase.RecordReaderBase.html   |   0
 .../core/client/mapred/InputFormatBase.html        |   0
 .../core/client/mapred/RangeInputSplit.html        |   0
 .../AbstractInputFormat.AbstractRecordReader.html  |   0
 .../mapred/class-use/AbstractInputFormat.html      |   0
 .../mapred/class-use/AccumuloFileOutputFormat.html |   0
 .../mapred/class-use/AccumuloInputFormat.html      |   0
 .../class-use/AccumuloMultiTableInputFormat.html   |   0
 .../AccumuloOutputFormat.AccumuloRecordWriter.html |   0
 .../mapred/class-use/AccumuloOutputFormat.html     |   0
 .../mapred/class-use/AccumuloRowInputFormat.html   |   0
 .../InputFormatBase.RecordReaderBase.html          |   0
 .../client/mapred/class-use/InputFormatBase.html   |   0
 .../client/mapred/class-use/RangeInputSplit.html   |   0
 .../accumulo/core/client/mapred/package-frame.html |   0
 .../core/client/mapred/package-summary.html        |   0
 .../accumulo/core/client/mapred/package-tree.html  |   0
 .../accumulo/core/client/mapred/package-use.html   |   0
 .../AbstractInputFormat.AbstractRecordReader.html  |   0
 .../core/client/mapreduce/AbstractInputFormat.html |   0
 .../client/mapreduce/AccumuloFileOutputFormat.html |   0
 .../core/client/mapreduce/AccumuloInputFormat.html |   0
 .../mapreduce/AccumuloMultiTableInputFormat.html   |   0
 .../AccumuloOutputFormat.AccumuloRecordWriter.html |   0
 .../client/mapreduce/AccumuloOutputFormat.html     |   0
 .../client/mapreduce/AccumuloRowInputFormat.html   |   0
 .../InputFormatBase.RecordReaderBase.html          |   0
 .../core/client/mapreduce/InputFormatBase.html     |   0
 .../core/client/mapreduce/InputTableConfig.html    |   0
 .../core/client/mapreduce/RangeInputSplit.html     |   0
 .../AbstractInputFormat.AbstractRecordReader.html  |   0
 .../mapreduce/class-use/AbstractInputFormat.html   |   0
 .../class-use/AccumuloFileOutputFormat.html        |   0
 .../mapreduce/class-use/AccumuloInputFormat.html   |   0
 .../class-use/AccumuloMultiTableInputFormat.html   |   0
 .../AccumuloOutputFormat.AccumuloRecordWriter.html |   0
 .../mapreduce/class-use/AccumuloOutputFormat.html  |   0
 .../class-use/AccumuloRowInputFormat.html          |   0
 .../InputFormatBase.RecordReaderBase.html          |   0
 .../mapreduce/class-use/InputFormatBase.html       |   0
 .../mapreduce/class-use/InputTableConfig.html      |   0
 .../mapreduce/class-use/RangeInputSplit.html       |   0
 .../lib/partition/KeyRangePartitioner.html         |   0
 .../mapreduce/lib/partition/RangePartitioner.html  |   0
 .../partition/class-use/KeyRangePartitioner.html   |   0
 .../lib/partition/class-use/RangePartitioner.html  |   0
 .../mapreduce/lib/partition/package-frame.html     |   0
 .../mapreduce/lib/partition/package-summary.html   |   0
 .../mapreduce/lib/partition/package-tree.html      |   0
 .../mapreduce/lib/partition/package-use.html       |   0
 .../core/client/mapreduce/package-frame.html       |   0
 .../core/client/mapreduce/package-summary.html     |   0
 .../core/client/mapreduce/package-tree.html        |   0
 .../core/client/mapreduce/package-use.html         |   0
 .../apache/accumulo/core/client/package-frame.html |   0
 .../accumulo/core/client/package-summary.html      |   0
 .../apache/accumulo/core/client/package-tree.html  |   0
 .../apache/accumulo/core/client/package-use.html   |   0
 .../client/replication/PeerExistsException.html    |   0
 .../client/replication/PeerNotFoundException.html  |   0
 .../replication/class-use/PeerExistsException.html |   0
 .../class-use/PeerNotFoundException.html           |   0
 .../core/client/replication/package-frame.html     |   0
 .../core/client/replication/package-summary.html   |   0
 .../core/client/replication/package-tree.html      |   0
 .../core/client/replication/package-use.html       |   0
 .../core/client/rfile/RFile.InputArguments.html    |   0
 .../core/client/rfile/RFile.OutputArguments.html   |   0
 .../core/client/rfile/RFile.ScannerFSOptions.html  |   0
 .../core/client/rfile/RFile.ScannerOptions.html    |   0
 .../core/client/rfile/RFile.SummaryFSOptions.html  |   0
 .../client/rfile/RFile.SummaryInputArguments.html  |   0
 .../core/client/rfile/RFile.SummaryOptions.html    |   0
 .../core/client/rfile/RFile.WriterFSOptions.html   |   0
 .../core/client/rfile/RFile.WriterOptions.html     |   0
 .../apache/accumulo/core/client/rfile/RFile.html   |   0
 .../accumulo/core/client/rfile/RFileSource.html    |   0
 .../accumulo/core/client/rfile/RFileWriter.html    |   0
 .../rfile/class-use/RFile.InputArguments.html      |   0
 .../rfile/class-use/RFile.OutputArguments.html     |   0
 .../rfile/class-use/RFile.ScannerFSOptions.html    |   0
 .../rfile/class-use/RFile.ScannerOptions.html      |   0
 .../rfile/class-use/RFile.SummaryFSOptions.html    |   0
 .../class-use/RFile.SummaryInputArguments.html     |   0
 .../rfile/class-use/RFile.SummaryOptions.html      |   0
 .../rfile/class-use/RFile.WriterFSOptions.html     |   0
 .../rfile/class-use/RFile.WriterOptions.html       |   0
 .../core/client/rfile/class-use/RFile.html         |   0
 .../core/client/rfile/class-use/RFileSource.html   |   0
 .../core/client/rfile/class-use/RFileWriter.html   |   0
 .../accumulo/core/client/rfile/package-frame.html  |   0
 .../core/client/rfile/package-summary.html         |   0
 .../accumulo/core/client/rfile/package-tree.html   |   0
 .../accumulo/core/client/rfile/package-use.html    |   0
 .../core/client/sample/AbstractHashSampler.html    |   0
 .../core/client/sample/RowColumnSampler.html       |   0
 .../accumulo/core/client/sample/RowSampler.html    |   0
 .../accumulo/core/client/sample/Sampler.html       |   0
 .../core/client/sample/SamplerConfiguration.html   |   0
 .../sample/class-use/AbstractHashSampler.html      |   0
 .../client/sample/class-use/RowColumnSampler.html  |   0
 .../core/client/sample/class-use/RowSampler.html   |   0
 .../core/client/sample/class-use/Sampler.html      |   0
 .../sample/class-use/SamplerConfiguration.html     |   0
 .../accumulo/core/client/sample/package-frame.html |   0
 .../core/client/sample/package-summary.html        |   0
 .../accumulo/core/client/sample/package-tree.html  |   0
 .../accumulo/core/client/sample/package-use.html   |   0
 .../core/client/security/SecurityErrorCode.html    |   0
 .../security/class-use/SecurityErrorCode.html      |   0
 .../core/client/security/package-frame.html        |   0
 .../core/client/security/package-summary.html      |   0
 .../core/client/security/package-tree.html         |   0
 .../accumulo/core/client/security/package-use.html |   0
 ...icationToken.AuthenticationTokenSerializer.html |   0
 .../tokens/AuthenticationToken.Properties.html     |   0
 .../tokens/AuthenticationToken.TokenProperty.html  |   0
 .../security/tokens/AuthenticationToken.html       |   0
 .../security/tokens/CredentialProviderToken.html   |   0
 .../client/security/tokens/DelegationToken.html    |   0
 .../core/client/security/tokens/KerberosToken.html |   0
 .../core/client/security/tokens/NullToken.html     |   0
 .../core/client/security/tokens/PasswordToken.html |   0
 ...icationToken.AuthenticationTokenSerializer.html |   0
 .../class-use/AuthenticationToken.Properties.html  |   0
 .../AuthenticationToken.TokenProperty.html         |   0
 .../tokens/class-use/AuthenticationToken.html      |   0
 .../tokens/class-use/CredentialProviderToken.html  |   0
 .../security/tokens/class-use/DelegationToken.html |   0
 .../security/tokens/class-use/KerberosToken.html   |   0
 .../security/tokens/class-use/NullToken.html       |   0
 .../security/tokens/class-use/PasswordToken.html   |   0
 .../core/client/security/tokens/package-frame.html |   0
 .../client/security/tokens/package-summary.html    |   0
 .../core/client/security/tokens/package-tree.html  |   0
 .../core/client/security/tokens/package-use.html   |   0
 .../core/client/summary/CounterSummary.html        |   0
 .../summary/CountingSummarizer.Converter.html      |   0
 .../core/client/summary/CountingSummarizer.html    |   0
 .../core/client/summary/Summarizer.Collector.html  |   0
 .../core/client/summary/Summarizer.Combiner.html   |   0
 .../summary/Summarizer.StatisticConsumer.html      |   0
 .../accumulo/core/client/summary/Summarizer.html   |   0
 .../summary/SummarizerConfiguration.Builder.html   |   0
 .../client/summary/SummarizerConfiguration.html    |   0
 .../client/summary/Summary.FileStatistics.html     |   0
 .../accumulo/core/client/summary/Summary.html      |   0
 .../client/summary/class-use/CounterSummary.html   |   0
 .../class-use/CountingSummarizer.Converter.html    |   0
 .../summary/class-use/CountingSummarizer.html      |   0
 .../summary/class-use/Summarizer.Collector.html    |   0
 .../summary/class-use/Summarizer.Combiner.html     |   0
 .../class-use/Summarizer.StatisticConsumer.html    |   0
 .../core/client/summary/class-use/Summarizer.html  |   0
 .../class-use/SummarizerConfiguration.Builder.html |   0
 .../summary/class-use/SummarizerConfiguration.html |   0
 .../summary/class-use/Summary.FileStatistics.html  |   0
 .../core/client/summary/class-use/Summary.html     |   0
 .../core/client/summary/package-frame.html         |   0
 .../core/client/summary/package-summary.html       |   0
 .../accumulo/core/client/summary/package-tree.html |   0
 .../accumulo/core/client/summary/package-use.html  |   0
 .../summary/summarizers/DeletesSummarizer.html     |   0
 .../summary/summarizers/EntryLengthSummarizer.html |   0
 .../summary/summarizers/FamilySummarizer.html      |   0
 .../summary/summarizers/VisibilitySummarizer.html  |   0
 .../summarizers/class-use/DeletesSummarizer.html   |   0
 .../class-use/EntryLengthSummarizer.html           |   0
 .../summarizers/class-use/FamilySummarizer.html    |   0
 .../class-use/VisibilitySummarizer.html            |   0
 .../client/summary/summarizers/package-frame.html  |   0
 .../summary/summarizers/package-summary.html       |   0
 .../client/summary/summarizers/package-tree.html   |   0
 .../client/summary/summarizers/package-use.html    |   0
 .../accumulo/core/data/ArrayByteSequence.html      |   0
 .../apache/accumulo/core/data/ByteSequence.html    |   0
 .../org/apache/accumulo/core/data/Column.html      |   0
 .../apache/accumulo/core/data/ColumnUpdate.html    |   0
 .../org/apache/accumulo/core/data/Condition.html   |   0
 .../accumulo/core/data/ConditionalMutation.html    |   0
 .../core/data/ConstraintViolationSummary.html      |   0
 .../apidocs/org/apache/accumulo/core/data/Key.html |   0
 .../accumulo/core/data/KeyBuilder.Build.html       |   0
 .../core/data/KeyBuilder.ColumnFamilyStep.html     |   0
 .../core/data/KeyBuilder.ColumnQualifierStep.html  |   0
 .../core/data/KeyBuilder.ColumnVisibilityStep.html |   0
 .../accumulo/core/data/KeyBuilder.RowStep.html     |   0
 .../org/apache/accumulo/core/data/KeyBuilder.html  |   0
 .../org/apache/accumulo/core/data/KeyValue.html    |   0
 .../accumulo/core/data/LoadPlan.Builder.html       |   0
 .../accumulo/core/data/LoadPlan.Destination.html   |   0
 .../accumulo/core/data/LoadPlan.RangeType.html     |   0
 .../org/apache/accumulo/core/data/LoadPlan.html    |   0
 .../accumulo/core/data/Mutation.FamilyOptions.html |   0
 .../core/data/Mutation.MutationOptions.html        |   0
 .../core/data/Mutation.QualifierOptions.html       |   0
 .../core/data/Mutation.SERIALIZED_FORMAT.html      |   0
 .../core/data/Mutation.TimestampOptions.html       |   0
 .../core/data/Mutation.VisibilityOptions.html      |   0
 .../org/apache/accumulo/core/data/Mutation.html    |   0
 .../org/apache/accumulo/core/data/PartialKey.html  |   0
 .../org/apache/accumulo/core/data/Range.html       |   0
 .../org/apache/accumulo/core/data/TabletId.html    |   0
 .../accumulo/core/data/Value.Comparator.html       |   0
 .../org/apache/accumulo/core/data/Value.html       |   0
 .../core/data/class-use/ArrayByteSequence.html     |   0
 .../accumulo/core/data/class-use/ByteSequence.html |   0
 .../accumulo/core/data/class-use/Column.html       |   0
 .../accumulo/core/data/class-use/ColumnUpdate.html |   0
 .../accumulo/core/data/class-use/Condition.html    |   0
 .../core/data/class-use/ConditionalMutation.html   |   0
 .../data/class-use/ConstraintViolationSummary.html |   0
 .../apache/accumulo/core/data/class-use/Key.html   |   0
 .../core/data/class-use/KeyBuilder.Build.html      |   0
 .../class-use/KeyBuilder.ColumnFamilyStep.html     |   0
 .../class-use/KeyBuilder.ColumnQualifierStep.html  |   0
 .../class-use/KeyBuilder.ColumnVisibilityStep.html |   0
 .../core/data/class-use/KeyBuilder.RowStep.html    |   0
 .../accumulo/core/data/class-use/KeyBuilder.html   |   0
 .../accumulo/core/data/class-use/KeyValue.html     |   0
 .../core/data/class-use/LoadPlan.Builder.html      |   0
 .../core/data/class-use/LoadPlan.Destination.html  |   0
 .../core/data/class-use/LoadPlan.RangeType.html    |   0
 .../accumulo/core/data/class-use/LoadPlan.html     |   0
 .../data/class-use/Mutation.FamilyOptions.html     |   0
 .../data/class-use/Mutation.MutationOptions.html   |   0
 .../data/class-use/Mutation.QualifierOptions.html  |   0
 .../data/class-use/Mutation.SERIALIZED_FORMAT.html |   0
 .../data/class-use/Mutation.TimestampOptions.html  |   0
 .../data/class-use/Mutation.VisibilityOptions.html |   0
 .../accumulo/core/data/class-use/Mutation.html     |   0
 .../accumulo/core/data/class-use/PartialKey.html   |   0
 .../apache/accumulo/core/data/class-use/Range.html |   0
 .../accumulo/core/data/class-use/TabletId.html     |   0
 .../core/data/class-use/Value.Comparator.html      |   0
 .../apache/accumulo/core/data/class-use/Value.html |   0
 .../data/doc-files/mutation-serialization.html     |   0
 .../apache/accumulo/core/data/package-frame.html   |   0
 .../apache/accumulo/core/data/package-summary.html |   0
 .../apache/accumulo/core/data/package-tree.html    |   0
 .../org/apache/accumulo/core/data/package-use.html |   0
 .../core/security/AuthorizationContainer.html      |   0
 .../accumulo/core/security/Authorizations.html     |   0
 .../core/security/ColumnVisibility.Node.html       |   0
 .../security/ColumnVisibility.NodeComparator.html  |   0
 .../core/security/ColumnVisibility.NodeType.html   |   0
 .../accumulo/core/security/ColumnVisibility.html   |   0
 .../core/security/NamespacePermission.html         |   0
 .../accumulo/core/security/SystemPermission.html   |   0
 .../accumulo/core/security/TablePermission.html    |   0
 .../core/security/VisibilityEvaluator.html         |   0
 .../core/security/VisibilityParseException.html    |   0
 .../security/class-use/AuthorizationContainer.html |   0
 .../core/security/class-use/Authorizations.html    |   0
 .../security/class-use/ColumnVisibility.Node.html  |   0
 .../class-use/ColumnVisibility.NodeComparator.html |   0
 .../class-use/ColumnVisibility.NodeType.html       |   0
 .../core/security/class-use/ColumnVisibility.html  |   0
 .../security/class-use/NamespacePermission.html    |   0
 .../core/security/class-use/SystemPermission.html  |   0
 .../core/security/class-use/TablePermission.html   |   0
 .../security/class-use/VisibilityEvaluator.html    |   0
 .../class-use/VisibilityParseException.html        |   0
 .../accumulo/core/security/package-frame.html      |   0
 .../accumulo/core/security/package-summary.html    |   0
 .../accumulo/core/security/package-tree.html       |   0
 .../apache/accumulo/core/security/package-use.html |   0
 .../apache/accumulo/minicluster/MemoryUnit.html    |   0
 .../accumulo/minicluster/MiniAccumuloCluster.html  |   0
 .../accumulo/minicluster/MiniAccumuloConfig.html   |   0
 .../accumulo/minicluster/MiniAccumuloInstance.html |   0
 .../minicluster/MiniAccumuloRunner.Opts.html       |   0
 .../MiniAccumuloRunner.PropertiesConverter.html    |   0
 .../accumulo/minicluster/MiniAccumuloRunner.html   |   0
 .../apache/accumulo/minicluster/ServerType.html    |   0
 .../accumulo/minicluster/class-use/MemoryUnit.html |   0
 .../minicluster/class-use/MiniAccumuloCluster.html |   0
 .../minicluster/class-use/MiniAccumuloConfig.html  |   0
 .../class-use/MiniAccumuloInstance.html            |   0
 .../class-use/MiniAccumuloRunner.Opts.html         |   0
 .../MiniAccumuloRunner.PropertiesConverter.html    |   0
 .../minicluster/class-use/MiniAccumuloRunner.html  |   0
 .../accumulo/minicluster/class-use/ServerType.html |   0
 .../apache/accumulo/minicluster/package-frame.html |   0
 .../accumulo/minicluster/package-summary.html      |   0
 .../apache/accumulo/minicluster/package-tree.html  |   0
 .../apache/accumulo/minicluster/package-use.html   |   0
 {2.x => docs/2.x}/apidocs/overview-frame.html      |   0
 {2.x => docs/2.x}/apidocs/overview-summary.html    |   0
 {2.x => docs/2.x}/apidocs/overview-tree.html       |   0
 {2.x => docs/2.x}/apidocs/package-list             |   0
 {2.x => docs/2.x}/apidocs/script.js                |   0
 {2.x => docs/2.x}/apidocs/serialized-form.html     |   0
 {2.x => docs/2.x}/apidocs/stylesheet.css           |   0
 .../development/client-properties.html             |  76 +++++------
 .../development/development_tools.html             |  88 ++++++------
 .../development/high_speed_ingest.html             |  80 +++++------
 docs/{2.0 => 2.x}/development/iterators.html       | 146 ++++++++++----------
 docs/{2.0 => 2.x}/development/mapreduce.html       |  84 ++++++------
 docs/{2.0 => 2.x}/development/proxy.html           |  78 +++++------
 docs/{2.0 => 2.x}/development/sampling.html        |  98 ++++++-------
 docs/{2.0 => 2.x}/development/security.html        |  96 ++++++-------
 docs/{2.0 => 2.x}/development/summaries.html       |  92 ++++++-------
 docs/{2.0 => 2.x}/getting-started/clients.html     | 150 ++++++++++----------
 docs/{2.0 => 2.x}/getting-started/design.html      |  86 ++++++------
 .../getting-started/quick-install.html             |  98 ++++++-------
 docs/{2.0 => 2.x}/getting-started/shell.html       |  76 +++++------
 .../getting-started/table_configuration.html       | 122 ++++++++---------
 .../{2.0 => 2.x}/getting-started/table_design.html |  74 +++++-----
 docs/{2.0 => 2.x}/index.html                       |   8 +-
 docs/{2.0 => 2.x}/troubleshooting/advanced.html    |  78 +++++------
 docs/{2.0 => 2.x}/troubleshooting/basic.html       |  78 +++++------
 docs/{2.0 => 2.x}/troubleshooting/performance.html |  96 ++++++-------
 .../troubleshooting/system-metadata-tables.html    |  74 +++++-----
 docs/{2.0 => 2.x}/troubleshooting/tools.html       |  74 +++++-----
 downloads/index.html                               |   6 +-
 feed.xml                                           |   4 +-
 latest/accumulo_user_manual/index.html             |   8 +-
 latest/apidocs/index.html                          |   8 +-
 latest/examples/index.html                         |   8 +-
 redirects.json                                     |   2 +-
 release/accumulo-2.0.0/index.html                  |   4 +-
 search_data.json                                   | 152 ++++++++++-----------
 548 files changed, 1702 insertions(+), 1702 deletions(-)

diff --git a/README.md b/README.md
index cca86c5..b6ed8f5 100644
--- a/README.md
+++ b/README.md
@@ -59,8 +59,8 @@ regenerate these, do the following.
 ```
 cd <accumulo source dir>
 mvn package -DskipTests
-cp ./core/target/generated-docs/properties.md <accumulo website source>/_docs-2-0/administration
-cp ./core/target/generated-docs/client-properties.md <accumulo website source>/_docs-2-0/administration
+cp ./core/target/generated-docs/properties.md <accumulo website source>/_docs-2/administration
+cp ./core/target/generated-docs/client-properties.md <accumulo website source>/_docs-2/administration
 ```
 
 ## Update the production website
diff --git a/contributor/making-release.html b/contributor/making-release.html
index f9515a0..ccce7a7 100644
--- a/contributor/making-release.html
+++ b/contributor/making-release.html
@@ -283,34 +283,34 @@ for two markdown files that should be changed in the Accumulo repo and copied/mi
 
 <ol>
   <li>
-    <p><code class="highlighter-rouge">INSTALL.md</code> is mirrored from Accumulo repo using a tool like <code class="highlighter-rouge">meld</code>.</p>
+    <p><code class="highlighter-rouge">INSTALL.md</code> is mirrored from Accumulo repo using a diff tool like <code class="highlighter-rouge">meld</code> or <code class="highlighter-rouge">vimdiff</code>.</p>
 
     <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> meld /path/to/accumulo/INSTALL.md /path/to/accumulo-website/_docs-2-x/getting-started/quick-install.md
 </code></pre></div>    </div>
   </li>
   <li>
-    <p><code class="highlighter-rouge">properties.md</code> is copied after it is generated by the Accumulo build.</p>
+    <p><code class="highlighter-rouge">properties.md</code> and <code class="highlighter-rouge">client-properties.md</code> should be copied after it is generated by the Accumulo build.</p>
 
-    <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> cp /path/to/accumulo/core/target/generated-docs/properties.md /path/to/accumulo-website/_docs-2-x/administration/properties.md
+    <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> cp /path/to/accumulo/core/target/generated-docs/{,client-}properties.md /path/to/accumulo-website/_docs-2-x/administration/properties.md
 </code></pre></div>    </div>
   </li>
 </ol>
 
-<p><strong>For 2.x minor releases,</strong> follow the steps below to create docs for next release:</p>
+<p><strong>For major releases,</strong> follow the steps below to create docs for next release:</p>
 
 <ol>
   <li>
-    <p>Create a new documentation collection for the new minor release (i.e <code class="highlighter-rouge">2.0</code>) using the collection of the last release. Avoid using a dot <code class="highlighter-rouge">.</code> in
+    <p>Create a new documentation collection for the new major release (i.e <code class="highlighter-rouge">3.x</code>) using the collection of the last release. Avoid using a dot <code class="highlighter-rouge">.</code> in
 the directory name:</p>
 
-    <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> cp -r _docs-2-0 _docs-2-1
+    <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> cp -r _docs-2 _docs-3
 </code></pre></div>    </div>
   </li>
   <li>
-    <p>Create a new doc layout using the previous layout. Update the reference to <code class="highlighter-rouge">site.docs-2-0</code> to <code class="highlighter-rouge">site.docs-2-1</code> (if creating 2.1 docs):</p>
+    <p>Create a new doc layout using the previous layout. Update the reference to <code class="highlighter-rouge">site.docs-2</code> to <code class="highlighter-rouge">site.docs-3</code> (if creating 3.x docs):</p>
 
-    <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> cp _layouts/docs-2.0.html _layouts/docs-2.1.html
- vim _layouts/docs-2.1.html
+    <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> cp _layouts/docs-3.html _layouts/docs-3.html
+ vim _layouts/docs-3.html
 </code></pre></div>    </div>
   </li>
   <li>
@@ -318,13 +318,13 @@ the directory name:</p>
 releases.</p>
   </li>
   <li>
-    <p>Copy <code class="highlighter-rouge">properties.md</code> and mirror <code class="highlighter-rouge">INSTALL.md</code>.</p>
+    <p>Copy <code class="highlighter-rouge">properties.md</code> and <code class="highlighter-rouge">client-properties.md</code>, and mirror <code class="highlighter-rouge">INSTALL.md</code>.</p>
   </li>
 </ol>
 
-<p>Once a collection is created for a 2.x minor release, developers can make documentation updates like normal website updates.</p>
+<p>Once a collection is created for a major release, developers can make documentation updates like normal website updates.</p>
 
-<p><strong>For 2.x bugfix releases,</strong> copy <code class="highlighter-rouge">properties.md</code> and mirror <code class="highlighter-rouge">INSTALL.md</code>.</p>
+<p><strong>For 2.x minor &amp; bugfix releases,</strong> copy <code class="highlighter-rouge">properties.md</code> and <code class="highlighter-rouge">client-properties.md</code>, and mirror <code class="highlighter-rouge">INSTALL.md</code>.</p>
 
 <p><strong>For 1.x minor &amp; bugfix releases,</strong> copy <code class="highlighter-rouge">accumulo_user_manual.html</code> generated for release to the <code class="highlighter-rouge">1.x/</code> directory in the <a href="https://github.com/apache/accumulo-website">accumulo-website repo</a>.</p>
 
diff --git a/docs/2.0/administration/caching.html b/docs/2.x/administration/caching.html
similarity index 85%
rename from docs/2.0/administration/caching.html
rename to docs/2.x/administration/caching.html
index e97bbc9..441c4dd 100644
--- a/docs/2.0/administration/caching.html
+++ b/docs/2.x/administration/caching.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,17 +332,17 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Caching</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Caching</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Caching</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/caching.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/caching.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
-    <p>Accumulo <a href="/docs/2.0/getting-started/design#tablet-server-1">tablet servers</a> have <strong>block caches</strong> that buffer data in memory to limit reads from disk.
+    <p>Accumulo <a href="/docs/2.x/getting-started/design#tablet-server-1">tablet servers</a> have <strong>block caches</strong> that buffer data in memory to limit reads from disk.
 This caching has the following benefits:</p>
 
 <ul>
@@ -350,9 +350,9 @@ This caching has the following benefits:</p>
   <li>helps alleviate hotspots in tables</li>
 </ul>
 
-<p>Each tablet server has an index and data block cache that is shared by all hosted tablets (see the <a href="/docs/2.0/getting-started/design#tablet-server-1">tablet server diagram</a>
+<p>Each tablet server has an index and data block cache that is shared by all hosted tablets (see the <a href="/docs/2.x/getting-started/design#tablet-server-1">tablet server diagram</a>
 to learn more). A typical Accumulo read operation will perform a binary search over several index blocks followed by a linear scan
-of one or more data blocks. If these blocks are not in a cache, they will need to be retrieved from <a href="/docs/2.0/getting-started/design#rfile">RFiles</a> in HDFS. While the index
+of one or more data blocks. If these blocks are not in a cache, they will need to be retrieved from <a href="/docs/2.x/getting-started/design#rfile">RFiles</a> in HDFS. While the index
 block cache is enabled for all tables, the data block cache has to be enabled for a table by the user. It is typically only enabled
 for tables where read performance is critical.</p>
 
@@ -361,17 +361,17 @@ for tables where read performance is critical.</p>
 <p>The index and data block caches are configured for tables by the following properties:</p>
 
 <ul>
-  <li><a href="/docs/2.0/administration/properties#table_cache_block_enable">table.cache.block.enable</a> - enables data block cache on the table (default is <code class="highlighter-rouge">false</code>)</li>
-  <li><a href="/docs/2.0/administration/properties#table_cache_index_enable">table.cache.index.enable</a> - enables index block cache on the table (default is <code class="highlighter-rouge">true</code>)</li>
+  <li><a href="/docs/2.x/administration/properties#table_cache_block_enable">table.cache.block.enable</a> - enables data block cache on the table (default is <code class="highlighter-rouge">false</code>)</li>
+  <li><a href="/docs/2.x/administration/properties#table_cache_index_enable">table.cache.index.enable</a> - enables index block cache on the table (default is <code class="highlighter-rouge">true</code>)</li>
 </ul>
 
 <p>While the index block cache is enabled by default for all Accumulo tables, users must enable the data block cache by
-setting <a href="/docs/2.0/administration/properties#table_cache_block_enable">table.cache.block.enable</a> to <code class="highlighter-rouge">true</code> in the shell:</p>
+setting <a href="/docs/2.x/administration/properties#table_cache_block_enable">table.cache.block.enable</a> to <code class="highlighter-rouge">true</code> in the shell:</p>
 
 <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>config -t mytable -s table.cache.block.enable=true
 </code></pre></div></div>
 
-<p>Or programmatically using <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/admin/TableOperations.html#setProperty-java.lang.String-java.lang.String-java.lang.String-">TableOperations.setProperty()</a>:</p>
+<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>
 
 <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>
@@ -380,15 +380,15 @@ setting <a href="/docs/2.0/administration/properties#table_cache_block_enable">t
 their defaults by setting the following properties:</p>
 
 <ul>
-  <li><a href="/docs/2.0/administration/properties#tserver_cache_data_size">tserver.cache.data.size</a></li>
-  <li><a href="/docs/2.0/administration/properties#tserver_cache_index_size">tserver.cache.index.size</a></li>
+  <li><a href="/docs/2.x/administration/properties#tserver_cache_data_size">tserver.cache.data.size</a></li>
+  <li><a href="/docs/2.x/administration/properties#tserver_cache_index_size">tserver.cache.index.size</a></li>
 </ul>
 
 
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/caching.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/caching.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/administration/configuration-management.html b/docs/2.x/administration/configuration-management.html
similarity index 87%
rename from docs/2.0/administration/configuration-management.html
rename to docs/2.x/administration/configuration-management.html
index f743332..ccb3607 100644
--- a/docs/2.0/administration/configuration-management.html
+++ b/docs/2.x/administration/configuration-management.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,26 +332,26 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Configuration Management</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Configuration Management</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Configuration Management</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/configuration-management.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/configuration-management.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <p>Configuration is managed differently for Accumulo clients and servers.</p>
 
 <h2 id="client-configuration">Client Configuration</h2>
 
-<p><a href="/docs/2.0/getting-started/clients#creating-an-accumulo-client">Accumulo clients</a> are created using builder methods or <code class="highlighter-rouge">accumulo-client.properties</code>
-which is configured using <a href="/docs/2.0/development/client-properties">client properties</a>.</p>
+<p><a href="/docs/2.x/getting-started/clients#creating-an-accumulo-client">Accumulo clients</a> are created using builder methods or <code class="highlighter-rouge">accumulo-client.properties</code>
+which is configured using <a href="/docs/2.x/development/client-properties">client properties</a>.</p>
 
 <h2 id="server-configuration">Server Configuration</h2>
 
-<p>Accumulo services (i.e master, tablet server, monitor, etc) are configured using <a href="/docs/2.0/administration/properties">server properties</a> whose values can be
+<p>Accumulo services (i.e master, tablet server, monitor, etc) are configured using <a href="/docs/2.x/administration/properties">server properties</a> whose values can be
 set in the following locations (with increasing precedence):</p>
 
 <ol>
@@ -366,35 +366,35 @@ set in the following locations (with increasing precedence):</p>
 
 <h3 id="default-values">Default values</h3>
 
-<p>All <a href="/docs/2.0/administration/properties">server properties</a> have a default value that is listed for each property on the <a href="/docs/2.0/administration/properties">properties</a> page. Default values are set in the source code.
+<p>All <a href="/docs/2.x/administration/properties">server properties</a> have a default value that is listed for each property on the <a href="/docs/2.x/administration/properties">properties</a> page. Default values are set in the source code.
 While default values have the lowest precedence, they are usually optimal.  However, there are cases where a change can increase query and ingest performance.</p>
 
 <h3 id="accumuloproperties">accumulo.properties</h3>
 
-<p>Setting <a href="/docs/2.0/administration/properties">server properties</a> in accumulo.properties will override their default value. If you are running Accumulo on a cluster, any updates to accumulo.properties must
+<p>Setting <a href="/docs/2.x/administration/properties">server properties</a> in accumulo.properties will override their default value. If you are running Accumulo on a cluster, any updates to accumulo.properties must
 be synced across the cluster. Accumulo processes (master, tserver, etc) read their local accumulo.properties on start up so processes must be restarted to apply changes.
 Certain properties can only be set in accumulo.properties. These properties have <strong>zk mutable: no</strong> in their description. Setting properties in accumulo.properties allows you
 to configure tablet servers with different settings.</p>
 
 <h3 id="zookeeper">Zookeeper</h3>
 
-<p>Many <a href="/docs/2.0/administration/properties">server properties</a> can be set in Zookeeper using the Accumulo API or shell. These properties can identified by <strong>zk mutable: yes</strong> in their description on
-the <a href="/docs/2.0/administration/properties">properties page</a>. Zookeeper properties can be applied on a per-table or system-wide basis. Per-table properties take precedence over system-wide
+<p>Many <a href="/docs/2.x/administration/properties">server properties</a> can be set in Zookeeper using the Accumulo API or shell. These properties can identified by <strong>zk mutable: yes</strong> in their description on
+the <a href="/docs/2.x/administration/properties">properties page</a>. Zookeeper properties can be applied on a per-table or system-wide basis. Per-table properties take precedence over system-wide
 properties. While most properties set in Zookeeper take effect immediately, some require a restart of the process which is indicated in <strong>zk mutable</strong> section
 of their description.</p>
 
 <h4 id="zookeeper-system-properties">Zookeeper System properties</h4>
 
-<p>System properties consist of all <a href="/docs/2.0/administration/properties">properties</a> with <strong>zk mutable: yes</strong> in their description. They are set with the following shell command:</p>
+<p>System properties consist of all <a href="/docs/2.x/administration/properties">properties</a> with <strong>zk mutable: yes</strong> in their description. They are set with the following shell command:</p>
 
 <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>config -s PROPERTY=VALUE
 </code></pre></div></div>
 
-<p>If a <a href="/docs/2.0/administration/properties#table_prefix">table.*</a> property is set using this method, the value will apply to all tables except those configured on per-table basis (which have higher precedence).</p>
+<p>If a <a href="/docs/2.x/administration/properties#table_prefix">table.*</a> property is set using this method, the value will apply to all tables except those configured on per-table basis (which have higher precedence).</p>
 
 <h4 id="zookeeper-table-properties">Zookeeper Table properties</h4>
 
-<p>Table properties consist of all properties with the <a href="/docs/2.0/administration/properties#table_prefix">table.*</a> prefix.</p>
+<p>Table properties consist of all properties with the <a href="/docs/2.x/administration/properties#table_prefix">table.*</a> prefix.</p>
 
 <p>Table properties are configured for a table namespace (i.e group of tables) or on a per-table basis.</p>
 
@@ -412,7 +412,7 @@ of their description.</p>
 
 <h4 id="zookeeper-considerations">Zookeeper Considerations</h4>
 
-<p>Any <a href="/docs/2.0/administration/properties">properties</a> that are set in Zookeeper should consider the limitations of Zookeeper itself with respect to the
+<p>Any <a href="/docs/2.x/administration/properties">properties</a> that are set in Zookeeper should consider the limitations of Zookeeper itself with respect to the
 number of nodes and the size of the node data. Custom table properties and options for Iterators configured on tables
 are two areas in which there aren’t any fail safes built into the API that can prevent the user from making this mistake.</p>
 
@@ -460,7 +460,7 @@ default  | table.failures.ignore ..................... | false
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/configuration-management.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/configuration-management.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/administration/crypto.html b/docs/2.x/administration/crypto.html
similarity index 85%
rename from docs/2.0/administration/crypto.html
rename to docs/2.x/administration/crypto.html
index bcb7ec2..859c277 100644
--- a/docs/2.0/administration/crypto.html
+++ b/docs/2.x/administration/crypto.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,32 +332,32 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; On Disk Encryption</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; On Disk Encryption</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>On Disk Encryption</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/crypto.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/crypto.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <p>For an additional layer of security, Accumulo can encrypt files stored on disk.  On Disk encryption was reworked 
-for 2.0, making it easier to configure and more secure.  The files that can be encrypted include: <a href="/docs/2.0/getting-started/design#rfile">RFiles</a> and Write Ahead Logs (WALs).
-For information on encrypting data over the wire see the section on <a href="/docs/2.0/administration/ssl">SSL</a>.  For information on cryptographic client-server authentication see the section on <a href="/docs/2.0/administration/kerberos">Kerberos</a>.</p>
+for 2.0, making it easier to configure and more secure.  The files that can be encrypted include: <a href="/docs/2.x/getting-started/design#rfile">RFiles</a> and Write Ahead Logs (WALs).
+For information on encrypting data over the wire see the section on <a href="/docs/2.x/administration/ssl">SSL</a>.  For information on cryptographic client-server authentication see the section on <a href="/docs/2.x/administration/kerberos">Kerberos</a>.</p>
 
 <h2 id="configuration">Configuration</h2>
 
 <p>To encrypt all tables on disk, encryption must be enabled before an Accumulo instance is initialized.  If on disk 
 encryption is enabled on an existing cluster, only files created after it is enabled will be encrypted 
 (root and metadata tables will not be encrypted in this case) and existing data won’t be encrypted until compaction.  To configure on disk encryption, add the 
-<a href="/docs/2.0/administration/properties#instance_crypto_service">instance.crypto.service</a> property to your <code class="highlighter-rouge">accumulo.properties</code> file.  The value of this property is the
+<a href="/docs/2.x/administration/properties#instance_crypto_service">instance.crypto.service</a> property to your <code class="highlighter-rouge">accumulo.properties</code> file.  The value of this property is the
 class name of the service which will perform crypto on RFiles and WALs.</p>
 <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>instance.crypto.service=org.apache.accumulo.core.security.crypto.impl.AESCryptoService
 </code></pre></div></div>
 <p>Out of the box, Accumulo provides the <code class="highlighter-rouge">AESCryptoService</code> for basic encryption needs.  This class provides AES encryption 
 with Galois/Counter Mode (GCM) for RFiles and Cipher Block Chaining (CBC) mode for WALs.  The additional property
-below is required by this crypto service to be set using the <a href="/docs/2.0/administration/properties#instance_crypto_opts_prefix">instance.crypto.opts.*</a> prefix.</p>
+below is required by this crypto service to be set using the <a href="/docs/2.x/administration/properties#instance_crypto_opts_prefix">instance.crypto.opts.*</a> prefix.</p>
 <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>instance.crypto.opts.key.location=file:///secure/path/to/crypto-key-file
 </code></pre></div></div>
 <p>This property tells the crypto service where to find the file containing the key encryption key. The key file can be 16 or 32 bytes.
@@ -369,15 +369,15 @@ For example, openssl can be used to create a random 32 byte key:</p>
 <h2 id="custom-crypto">Custom Crypto</h2>
 
 <p>The new crypto interface for 2.0 allows for easier custom implementation of encryption and decryption. Your
-class only has to implement the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/spi/crypto/CryptoService.html">CryptoService</a> interface to work with Accumulo.
+class only has to implement the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/spi/crypto/CryptoService.html">CryptoService</a> interface to work with Accumulo.
 The interface has 3 methods:</p>
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code>  <span class="kt">void</span> <span class="nf">init</span><span class="o">(</span><span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">conf</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">CryptoException</span><span class="o">;</span>
   <span class="n">FileEncrypter</span> <span class="nf">getFileEncrypter</span><span class="o">(</span><span class="n">CryptoEnvironment</span> <span class="n">environment</span><span class="o">);</span>
   <span class="n">FileDecrypter</span> <span class="nf">getFileDecrypter</span><span class="o">(</span><span class="n">CryptoEnvironment</span> <span class="n">environment</span><span class="o">);</span>
 </code></pre></div></div>
 <p>The <code class="highlighter-rouge">init</code> method is where you will initialize any resources required for crypto and will get called once per Tablet Server.
-The <code class="highlighter-rouge">getFileEncrypter</code> method requires implementation of a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/spi/crypto/FileEncrypter.html">FileEncrypter</a> 
-for encryption and the <code class="highlighter-rouge">getFileDecrypter</code> method requires implementation of a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/spi/crypto/FileDecrypter.html">FileDecrypter</a> 
+The <code class="highlighter-rouge">getFileEncrypter</code> method requires implementation of a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/spi/crypto/FileEncrypter.html">FileEncrypter</a> 
+for encryption and the <code class="highlighter-rouge">getFileDecrypter</code> method requires implementation of a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/spi/crypto/FileDecrypter.html">FileDecrypter</a> 
 for decryption. The <code class="highlighter-rouge">CryptoEnvironment</code> passed into these methods will provide the scope of the crypto. 
 The FileEncrypter has two methods:</p>
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code>  <span class="n">OutputStream</span> <span class="nf">encryptStream</span><span class="o">(</span><span class="n">OutputStream</span> <span class="n">outputStream</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">CryptoService</span><span class="o">.</span><span class="na">CryptoException</span><span class="o">;</span>
@@ -388,7 +388,7 @@ wrapped in at least one other OutputStream.  The <code class="highlighter-rouge"
 required to perform decryption. The FileDecrypter only has one method:</p>
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code>  <span class="n">InputStream</span> <span class="nf">decryptStream</span><span class="o">(</span><span class="n">InputStream</span> <span class="n">inputStream</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">CryptoService</span><span class="o">.</span><span class="na">CryptoException</span><span class="o">;</span>
 </code></pre></div></div>
-<p>For more help getting started see <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/security/crypto/impl/AESCryptoService.html">AESCryptoService</a>.</p>
+<p>For more help getting started see <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/security/crypto/impl/AESCryptoService.html">AESCryptoService</a>.</p>
 
 <h2 id="things-to-keep-in-mind">Things to keep in mind</h2>
 
@@ -411,8 +411,8 @@ its the additional data that gets encrypted on disk that could be exposed in a l
 
 <h3 id="bulk-import">Bulk Import</h3>
 
-<p>There are 2 ways to create RFiles for bulk ingest: with the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/rfile/RFile.html">RFile API</a> and during Map Reduce using <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.2/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html">AccumuloOutputFormat</a>.<br />
-The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/rfile/RFile.html">RFile API</a> allows passing in the configuration properties for encryption mentioned above.  The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.2/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html">AccumuloOutputFormat</a> does 
+<p>There are 2 ways to create RFiles for bulk ingest: with the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/rfile/RFile.html">RFile API</a> and during Map Reduce using <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/2.0.0-alpha-1/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html">AccumuloOutputFormat</a>.<br />
+The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/rfile/RFile.html">RFile API</a> allows passing in the configuration properties for encryption mentioned above.  The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/2.0.0-alpha-1/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html">AccumuloOutputFormat</a> does 
 not allow for encryption of RFiles so any data bulk imported through this process will be unencrypted.</p>
 
 <h3 id="zookeeper">Zookeeper</h3>
@@ -439,7 +439,7 @@ Java 8 GCM times:
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/crypto.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/crypto.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/administration/fate.html b/docs/2.x/administration/fate.html
similarity index 89%
rename from docs/2.0/administration/fate.html
rename to docs/2.x/administration/fate.html
index 51ecff1..bb41063 100644
--- a/docs/2.0/administration/fate.html
+++ b/docs/2.x/administration/fate.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,14 +332,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; FATE</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; FATE</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>FATE</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/fate.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/fate.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <p>Accumulo must implement a number of distributed, multi-step operations to support
@@ -413,7 +413,7 @@ JSON in order to make them human readable.</p>
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/fate.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/fate.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/administration/in-depth-install.html b/docs/2.x/administration/in-depth-install.html
similarity index 92%
rename from docs/2.0/administration/in-depth-install.html
rename to docs/2.x/administration/in-depth-install.html
index 8250c38..defd4ff 100644
--- a/docs/2.0/administration/in-depth-install.html
+++ b/docs/2.x/administration/in-depth-install.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,18 +332,18 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; In-depth Installation</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; In-depth Installation</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>In-depth Installation</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/in-depth-install.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/in-depth-install.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <p>This document provides detailed instructions for installing Accumulo. For basic
-instructions, see the <a href="/docs/2.0/getting-started/quick-install">quick installation guide</a>.</p>
+instructions, see the <a href="/docs/2.x/getting-started/quick-install">quick installation guide</a>.</p>
 
 <h2 id="hardware">Hardware</h2>
 
@@ -389,32 +389,32 @@ their value in accumulo.properties.</p>
     <tr>
       <td>4560</td>
       <td>Accumulo monitor (for centralized log display)</td>
-      <td><a href="/docs/2.0/administration/properties#monitor_port_log4j">monitor.port.log4j</a></td>
+      <td><a href="/docs/2.x/administration/properties#monitor_port_log4j">monitor.port.log4j</a></td>
     </tr>
     <tr>
       <td>9995</td>
       <td>Accumulo HTTP monitor</td>
-      <td><a href="/docs/2.0/administration/properties#monitor_port_client">monitor.port.client</a></td>
+      <td><a href="/docs/2.x/administration/properties#monitor_port_client">monitor.port.client</a></td>
     </tr>
     <tr>
       <td>9997</td>
       <td>Tablet Server</td>
-      <td><a href="/docs/2.0/administration/properties#tserver_port_client">tserver.port.client</a></td>
+      <td><a href="/docs/2.x/administration/properties#tserver_port_client">tserver.port.client</a></td>
     </tr>
     <tr>
       <td>9998</td>
       <td>Accumulo GC</td>
-      <td><a href="/docs/2.0/administration/properties#gc_port_client">gc.port.client</a></td>
+      <td><a href="/docs/2.x/administration/properties#gc_port_client">gc.port.client</a></td>
     </tr>
     <tr>
       <td>9999</td>
       <td>Master Server</td>
-      <td><a href="/docs/2.0/administration/properties#master_port_client">master.port.client</a></td>
+      <td><a href="/docs/2.x/administration/properties#master_port_client">master.port.client</a></td>
     </tr>
     <tr>
       <td>12234</td>
       <td>Accumulo Tracer</td>
-      <td><a href="/docs/2.0/administration/properties#trace_port_client">trace.port.client</a></td>
+      <td><a href="/docs/2.x/administration/properties#trace_port_client">trace.port.client</a></td>
     </tr>
     <tr>
       <td>42424</td>
@@ -424,12 +424,12 @@ their value in accumulo.properties.</p>
     <tr>
       <td>10001</td>
       <td>Master Replication service</td>
-      <td><a href="/docs/2.0/administration/properties#master_replication_coordinator_port">master.replication.coordinator.port</a></td>
+      <td><a href="/docs/2.x/administration/properties#master_replication_coordinator_port">master.replication.coordinator.port</a></td>
     </tr>
     <tr>
       <td>10002</td>
       <td>TabletServer Replication service</td>
-      <td><a href="/docs/2.0/administration/properties#replication_receipt_service_port">replication.receipt.service.port</a></td>
+      <td><a href="/docs/2.x/administration/properties#replication_receipt_service_port">replication.receipt.service.port</a></td>
     </tr>
   </tbody>
 </table>
@@ -449,8 +449,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-bin.tar.gz
-cd accumulo-2.0.0
+tar xzf accumulo-2.0.0-alpha-1-bin.tar.gz
+cd accumulo-2.0.0-alpha-1
 </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>
@@ -562,18 +562,18 @@ also locate the native maps shared library by setting <code class="highlighter-r
 <h4 id="native-maps-configuration">Native Maps Configuration</h4>
 
 <p>As mentioned, Accumulo will use the native libraries if they are found in the expected
-location and <a href="/docs/2.0/administration/properties#tserver_memory_maps_native_enabled">tserver.memory.maps.native.enabled</a> is set to <code class="highlighter-rouge">true</code> (which is the default).
+location and <a href="/docs/2.x/administration/properties#tserver_memory_maps_native_enabled">tserver.memory.maps.native.enabled</a> is set to <code class="highlighter-rouge">true</code> (which is the default).
 Using the native maps over JVM Maps nets a noticeable improvement in ingest rates; however,
 certain configuration variables are important to modify when increasing the size of the
 native map.</p>
 
-<p>To adjust the size of the native map, modify the value of <a href="/docs/2.0/administration/properties#tserver_memory_maps_max">tserver.memory.maps.max</a>. When increasing
+<p>To adjust the size of the native map, modify the value of <a href="/docs/2.x/administration/properties#tserver_memory_maps_max">tserver.memory.maps.max</a>. When increasing
 this value, it is also important to adjust the values below:</p>
 
 <ul>
-  <li><a href="/docs/2.0/administration/properties#table_compaction_minor_logs_threshold">table.compaction.minor.logs.threshold</a> - maximum number of write-ahead log files that a tablet can
+  <li><a href="/docs/2.x/administration/properties#table_compaction_minor_logs_threshold">table.compaction.minor.logs.threshold</a> - maximum number of write-ahead log files that a tablet can
 reference before they will be automatically minor compacted</li>
-  <li><a href="/docs/2.0/administration/properties#tserver_walog_max_size">tserver.walog.max.size</a> - maximum size of a write-ahead log.</li>
+  <li><a href="/docs/2.x/administration/properties#tserver_walog_max_size">tserver.walog.max.size</a> - maximum size of a write-ahead log.</li>
 </ul>
 
 <p>The maximum size of the native maps for a server should be less than the product of the write-ahead
@@ -587,8 +587,8 @@ maps can be completely saturated.</p>
 
 <p>Subsequently, when increasing the size of the write-ahead logs, it can also be important
 to increase the HDFS block size that Accumulo uses when creating the files for the write-ahead log.
-This is controlled via <a href="/docs/2.0/administration/properties#tserver_wal_blocksize">tserver.wal.blocksize</a>. A basic recommendation is that when
-<a href="/docs/2.0/administration/properties#tserver_walog_max_size">tserver.walog.max.size</a> is larger than 2GB in size, set <a href="/docs/2.0/administration/properties#tserver_wal_blocksize">tserver.wal.blocksize</a> to 2GB.
+This is controlled via <a href="/docs/2.x/administration/properties#tserver_wal_blocksize">tserver.wal.blocksize</a>. A basic recommendation is that when
+<a href="/docs/2.x/administration/properties#tserver_walog_max_size">tserver.walog.max.size</a> is larger than 2GB in size, set <a href="/docs/2.x/administration/properties#tserver_wal_blocksize">tserver.wal.blocksize</a> to 2GB.
 Increasing the block size to a value larger than 2GB can result in decreased write
 performance to the write-ahead log file which will slow ingest.</p>
 
@@ -611,16 +611,16 @@ of errors.</p>
 <p>Specify appropriate values for the following properties in <code class="highlighter-rouge">accumulo.properties</code>:</p>
 
 <ul>
-  <li><a href="/docs/2.0/administration/properties#instance_zookeeper_host">instance.zookeeper.host</a> - Enables Accumulo to find ZooKeeper. Accumulo uses ZooKeeper
+  <li><a href="/docs/2.x/administration/properties#instance_zookeeper_host">instance.zookeeper.host</a> - Enables Accumulo to find ZooKeeper. Accumulo uses ZooKeeper
 to coordinate settings between processes and helps finalize TabletServer failure.</li>
-  <li><a href="/docs/2.0/administration/properties#instance_secret">instance.secret</a> - The instance needs a secret to enable secure communication between servers.
+  <li><a href="/docs/2.x/administration/properties#instance_secret">instance.secret</a> - The instance needs a secret to enable secure communication between servers.
 Configure your secret and make sure that the <code class="highlighter-rouge">accumulo.properties</code> file is not readable to other users.
-For alternatives to storing the <a href="/docs/2.0/administration/properties#instance_secret">instance.secret</a> in plaintext, please read the
+For alternatives to storing the <a href="/docs/2.x/administration/properties#instance_secret">instance.secret</a> in plaintext, please read the
 <a href="#sensitive-configuration-values">Sensitive Configuration Values</a> section.</li>
 </ul>
 
 <p>Some settings can be modified via the Accumulo shell and take effect immediately, but
-some settings require a process restart to take effect. See the <a href="/docs/2.0/administration/configuration-management">configuration management</a>
+some settings require a process restart to take effect. See the <a href="/docs/2.x/administration/configuration-management">configuration management</a>
 documentation for details.</p>
 
 <h3 id="hostnames-in-configuration-files">Hostnames in configuration files</h3>
@@ -649,7 +649,7 @@ where that command is run.</p>
 <h3 id="sensitive-configuration-values">Sensitive Configuration Values</h3>
 
 <p>Accumulo has a number of properties that can be specified via the accumulo.properties
-file which are sensitive in nature, <a href="/docs/2.0/administration/properties#instance_secret">instance.secret</a> and <code class="highlighter-rouge">trace.token.property.password</code>
+file which are sensitive in nature, <a href="/docs/2.x/administration/properties#instance_secret">instance.secret</a> and <code class="highlighter-rouge">trace.token.property.password</code>
 are two common examples. Both of these properties, if compromised, have the ability
 to result in data being leaked to users who should not have access to that data.</p>
 
@@ -660,14 +660,14 @@ is a candidate for use with these CredentialProviders. For version of Hadoop whi
 these classes, the feature will just be unavailable for use.</p>
 
 <p>A comma separated list of CredentialProviders can be configured using the Accumulo Property
-<a href="/docs/2.0/administration/properties#general_security_credential_provider_paths">general.security.credential.provider.paths</a>. Each configured URL will be consulted
+<a href="/docs/2.x/administration/properties#general_security_credential_provider_paths">general.security.credential.provider.paths</a>. Each configured URL will be consulted
 when the Configuration object for accumulo.properties is accessed.</p>
 
 <h3 id="using-a-javakeystorecredentialprovider-for-storage">Using a JavaKeyStoreCredentialProvider for storage</h3>
 
 <p>One of the implementations provided in Hadoop-2.6.0 is a Java KeyStore CredentialProvider.
 Each entry in the KeyStore is the Accumulo Property key name. For example, to store the
-<a href="/docs/2.0/administration/properties#instance_secret">instance.secret</a>, the following command can be used:</p>
+<a href="/docs/2.x/administration/properties#instance_secret">instance.secret</a>, the following command can be used:</p>
 
 <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>hadoop credential create instance.secret --provider jceks://file/etc/accumulo/conf/accumulo.jceks
 </code></pre></div></div>
@@ -682,7 +682,7 @@ Each entry in the KeyStore is the Accumulo Property key name. For example, to st
 <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>general.security.credential.provider.paths=jceks://file/path/to/accumulo/conf/accumulo.jceks
 </code></pre></div></div>
 
-<p>This configuration will then transparently extract the <a href="/docs/2.0/administration/properties#instance_secret">instance.secret</a> from
+<p>This configuration will then transparently extract the <a href="/docs/2.x/administration/properties#instance_secret">instance.secret</a> from
 the configured KeyStore and alleviates a human readable storage of the sensitive
 property.</p>
 
@@ -692,16 +692,16 @@ will expect the KeyStore in the same location.</p>
 
 <h3 id="client-configuration">Client Configuration</h3>
 
-<p>Accumulo clients are configured in a different way than Accumulo servers. <a href="/docs/2.0/getting-started/clients#creating-an-accumulo-client">Accumulo clients
+<p>Accumulo clients are configured in a different way than Accumulo servers. <a href="/docs/2.x/getting-started/clients#creating-an-accumulo-client">Accumulo clients
 are created</a> using Java builder methods or a <code class="highlighter-rouge">accumulo-client.properties</code>
-file containing <a href="/docs/2.0/development/client-properties">client properties</a>.</p>
+file containing <a href="/docs/2.x/development/client-properties">client properties</a>.</p>
 
 <h3 id="custom-table-tags">Custom Table Tags</h3>
 
 <p>Accumulo has the ability for users to add custom tags to tables.  This allows
 applications to set application-level metadata about a table.  These tags can be
 anything from a table description, administrator notes, date created, etc.
-This is done by naming and setting a property with a prefix <a href="/docs/2.0/administration/properties#table_custom_prefix">table.custom.*</a>.</p>
+This is done by naming and setting a property with a prefix <a href="/docs/2.x/administration/properties#table_custom_prefix">table.custom.*</a>.</p>
 
 <p>Currently, table properties are stored in ZooKeeper. This means that the number
 and size of custom properties should be restricted on the order of 10’s of properties
@@ -713,14 +713,14 @@ consideration. There is no enforcement of these warnings via the API.</p>
 <h3 id="configuring-the-classloader">Configuring the ClassLoader</h3>
 
 <p>Accumulo builds its Java classpath in <code class="highlighter-rouge">accumulo-env.sh</code>.  After an Accumulo application has started, it will load classes from the locations
-specified in the deprecated <a href="/docs/2.0/administration/properties#general_classpaths">general.classpaths</a> property. Additionally, Accumulo will load classes from the locations specified in the
-<a href="/docs/2.0/administration/properties#general_dynamic_classpaths">general.dynamic.classpaths</a> property and will monitor and reload them if they change. The reloading feature is useful during the development
+specified in the deprecated <a href="/docs/2.x/administration/properties#general_classpaths">general.classpaths</a> property. Additionally, Accumulo will load classes from the locations specified in the
+<a href="/docs/2.x/administration/properties#general_dynamic_classpaths">general.dynamic.classpaths</a> property and will monitor and reload them if they change. The reloading feature is useful during the development
 and testing of iterators as new or modified iterator classes can be deployed to Accumulo without having to restart the database.</p>
 
 <p>Accumulo also has an alternate configuration for the classloader which will allow it to load classes from remote locations. This mechanism
 uses Apache Commons VFS which enables locations such as http and hdfs to be used. This alternate configuration also uses the
-<a href="/docs/2.0/administration/properties#general_classpaths">general.classpaths</a> property in the same manner described above. It differs in that you need to configure the
-<a href="/docs/2.0/administration/properties#general_vfs_classpaths">general.vfs.classpaths</a> property instead of the <a href="/docs/2.0/administration/properties#general_dynamic_classpaths">general.dynamic.classpaths</a> property. As in the default configuration, this alternate
+<a href="/docs/2.x/administration/properties#general_classpaths">general.classpaths</a> property in the same manner described above. It differs in that you need to configure the
+<a href="/docs/2.x/administration/properties#general_vfs_classpaths">general.vfs.classpaths</a> property instead of the <a href="/docs/2.x/administration/properties#general_dynamic_classpaths">general.dynamic.classpaths</a> property. As in the default configuration, this alternate
 configuration will also monitor the vfs locations for changes and reload if necessary.</p>
 
 <p>The Accumulo classpath can be viewed in human readable format by running <code class="highlighter-rouge">accumulo classpath -d</code>.</p>
@@ -772,7 +772,7 @@ Make sure ZooKeeper is configured and running on at least one machine in the
 cluster.
 Start Accumulo using <code class="highlighter-rouge">accumulo-cluster start</code>.</p>
 
-<p>To verify that Accumulo is running, check the <a href="/docs/2.0/administration/monitoring-metrics#monitor">Accumulo monitor</a>.
+<p>To verify that Accumulo is running, check the <a href="/docs/2.x/administration/monitoring-metrics#monitor">Accumulo monitor</a>.
 In addition, the Shell can provide some information about the status of tables via reading the metadata tables.</p>
 
 <h3 id="stopping-accumulo">Stopping Accumulo</h3>
@@ -1071,7 +1071,7 @@ mailing lists at https://accumulo.apache.org for more info.</p>
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/in-depth-install.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/in-depth-install.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/administration/kerberos.html b/docs/2.x/administration/kerberos.html
similarity index 95%
rename from docs/2.0/administration/kerberos.html
rename to docs/2.x/administration/kerberos.html
index 8292766..757c27f 100644
--- a/docs/2.0/administration/kerberos.html
+++ b/docs/2.x/administration/kerberos.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,14 +332,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Kerberos</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Kerberos</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Kerberos</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/kerberos.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/kerberos.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <h2 id="overview">Overview</h2>
@@ -721,9 +721,9 @@ below in <code class="highlighter-rouge">accumulo-client.properties</code> which
 the <code class="highlighter-rouge">--config-file</code> command line option.</p>
 
 <ul>
-  <li><a href="/docs/2.0/development/client-properties#sasl_enabled">sasl.enabled</a> = true</li>
-  <li><a href="/docs/2.0/development/client-properties#sasl_qop">sasl.qop</a> = auth</li>
-  <li><a href="/docs/2.0/development/client-properties#sasl_kerberos_server_primary">sasl.kerberos.server.primary</a> = accumulo</li>
+  <li><a href="/docs/2.x/development/client-properties#sasl_enabled">sasl.enabled</a> = true</li>
+  <li><a href="/docs/2.x/development/client-properties#sasl_qop">sasl.qop</a> = auth</li>
+  <li><a href="/docs/2.x/development/client-properties#sasl_kerberos_server_primary">sasl.kerberos.server.primary</a> = accumulo</li>
 </ul>
 
 <p>Each of these properties <em>must</em> match the configuration of the accumulo servers; this is
@@ -953,7 +953,7 @@ when I attempt to use the “Recent Traces” page on the Monitor UI I get a sta
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/kerberos.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/kerberos.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/administration/monitoring-metrics.html b/docs/2.x/administration/monitoring-metrics.html
similarity index 88%
rename from docs/2.0/administration/monitoring-metrics.html
rename to docs/2.x/administration/monitoring-metrics.html
index 17e5119..82a300e 100644
--- a/docs/2.0/administration/monitoring-metrics.html
+++ b/docs/2.x/administration/monitoring-metrics.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,14 +332,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Monitoring & Metrics</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Monitoring & Metrics</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Monitoring & Metrics</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/monitoring-metrics.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/monitoring-metrics.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <h2 id="monitoring">Monitoring</h2>
@@ -368,7 +368,7 @@ The Overall Avg metric is only used on the Server Activity page, and represents
 Similarly, the Overall Max metric picks the metric with the maximum normalized value.</p>
 
 <p>The Garbage Collector page displays a list of garbage collection cycles, the number of files found of each type (including deletion candidates in use and files actually deleted), and the length of the deletion cycle.
-The Traces page displays data for recent traces performed (see the following section for information on <a href="/docs/2.0/administration/tracing">tracing</a>).
+The Traces page displays data for recent traces performed (see the following section for information on <a href="/docs/2.x/administration/tracing">tracing</a>).
 The Recent Logs page displays warning and error logs forwarded to the monitor from all Accumulo processes.
 Also, the XML and JSON links provide metrics in XML and JSON formats, respectively.</p>
 
@@ -382,10 +382,10 @@ is strongly recommended that the Monitor is not exposed to any publicly-accessib
 <p>SSL may be enabled for the monitor page by setting the following properties in the <code class="highlighter-rouge">accumulo.properties</code> file:</p>
 
 <ul>
-  <li><a href="/docs/2.0/administration/properties#monitor_ssl_keyStore">monitor.ssl.keyStore</a></li>
-  <li><a href="/docs/2.0/administration/properties#monitor_ssl_keyStorePassword">monitor.ssl.keyStorePassword</a></li>
-  <li><a href="/docs/2.0/administration/properties#monitor_ssl_trustStore">monitor.ssl.trustStore</a></li>
-  <li><a href="/docs/2.0/administration/properties#monitor_ssl_trustStorePassword">monitor.ssl.trustStorePassword</a></li>
+  <li><a href="/docs/2.x/administration/properties#monitor_ssl_keyStore">monitor.ssl.keyStore</a></li>
+  <li><a href="/docs/2.x/administration/properties#monitor_ssl_keyStorePassword">monitor.ssl.keyStorePassword</a></li>
+  <li><a href="/docs/2.x/administration/properties#monitor_ssl_trustStore">monitor.ssl.trustStore</a></li>
+  <li><a href="/docs/2.x/administration/properties#monitor_ssl_trustStorePassword">monitor.ssl.trustStorePassword</a></li>
 </ul>
 
 <p>If the Accumulo conf directory has been configured (in particular the <code class="highlighter-rouge">accumulo-env.sh</code> file must be set up), the 
@@ -396,8 +396,8 @@ Java <code class="highlighter-rouge">keytool</code> command, whose usage can be
 <p>If desired, the SSL ciphers allowed for connections can be controlled via the following properties in <code class="highlighter-rouge">accumulo.properties</code>:</p>
 
 <ul>
-  <li><a href="/docs/2.0/administration/properties#monitor_ssl_include_ciphers">monitor.ssl.include.ciphers</a></li>
-  <li><a href="/docs/2.0/administration/properties#monitor_ssl_exclude_ciphers">monitor.ssl.exclude.ciphers</a></li>
+  <li><a href="/docs/2.x/administration/properties#monitor_ssl_include_ciphers">monitor.ssl.include.ciphers</a></li>
+  <li><a href="/docs/2.x/administration/properties#monitor_ssl_exclude_ciphers">monitor.ssl.exclude.ciphers</a></li>
 </ul>
 
 <p>If SSL is enabled, the monitor URL can only be accessed via https.
@@ -412,7 +412,7 @@ An Accumulo user name and password must be entered for access to the shell.</p>
 <h3 id="legacy-metrics">Legacy Metrics</h3>
 
 <p>Accumulo has a legacy metrics library that can be exposes metrics using JMX endpoints or file-based logging. These metrics can
-be enabled by setting <a href="/docs/2.0/administration/properties#general_legacy_metrics">general.legacy.metrics</a> to <code class="highlighter-rouge">true</code> in <code class="highlighter-rouge">accumulo.properties</code> and placing the <code class="highlighter-rouge">accumulo-metrics.xml</code>
+be enabled by setting <a href="/docs/2.x/administration/properties#general_legacy_metrics">general.legacy.metrics</a> to <code class="highlighter-rouge">true</code> in <code class="highlighter-rouge">accumulo.properties</code> and placing the <code class="highlighter-rouge">accumulo-metrics.xml</code>
 configuration file on the classpath (which is typically done by placing the file in the <code class="highlighter-rouge">conf/</code> directory). A template for
 <code class="highlighter-rouge">accumulo-metrics.xml</code> can be found in <code class="highlighter-rouge">conf/templates</code> of the Accumulo tarball.</p>
 
@@ -448,7 +448,7 @@ the Accumulo processes log files when debugging missing metrics output.</p>
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/monitoring-metrics.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/monitoring-metrics.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/administration/multivolume.html b/docs/2.x/administration/multivolume.html
similarity index 88%
rename from docs/2.0/administration/multivolume.html
rename to docs/2.x/administration/multivolume.html
index 839a272..bdc420f 100644
--- a/docs/2.0/administration/multivolume.html
+++ b/docs/2.x/administration/multivolume.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,14 +332,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Multi-Volume Installations</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Multi-Volume Installations</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Multi-Volume Installations</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/multivolume.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/multivolume.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <p>This is an advanced configuration setting for very large clusters
@@ -362,7 +362,7 @@ routinely runs in less than a minute, the NameNode is performing well.</p>
 
 <p>However, if you do begin to experience slow-down and poor GC
 performance, Accumulo can be configured to use multiple NameNode
-servers.  The configuration <a href="/docs/2.0/administration/properties#instance_volumes">instance.volumes</a> should be set to a
+servers.  The configuration <a href="/docs/2.x/administration/properties#instance_volumes">instance.volumes</a> should be set to a
 comma-separated list, using full URI references to different NameNode
 servers:</p>
 
@@ -380,7 +380,7 @@ the same way they were before 1.6.</p>
 moved to host2), then Accumulo will no longer function.  Even if Hadoop and
 Accumulo configurations are changed, the fully qualified URIs stored in
 Accumulo will still contain the old URI.  To handle this Accumulo has the
-configuration property <a href="/docs/2.0/administration/properties#instance_volumes_replacements">instance.volumes.replacements</a> for replacing URI stored
+configuration property <a href="/docs/2.x/administration/properties#instance_volumes_replacements">instance.volumes.replacements</a> for replacing URI stored
 in its metadata.  The example configuration below will replace ns1 with nsA and
 ns2 with nsB in Accumulo metadata. For this property to take affect, Accumulo will
 need to be restarted.</p>
@@ -406,7 +406,7 @@ NameNode.</p>
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/multivolume.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/multivolume.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/administration/properties.html b/docs/2.x/administration/properties.html
similarity index 95%
rename from docs/2.0/administration/properties.html
rename to docs/2.x/administration/properties.html
index d1f0f8f..bd39ffe 100644
--- a/docs/2.0/administration/properties.html
+++ b/docs/2.x/administration/properties.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,14 +332,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Server Properties</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Server Properties</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Server Properties</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/properties.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/properties.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <!-- WARNING: Do not edit this file. It is a generated file that is copied from Accumulo build (from core/target/generated-docs) -->
@@ -460,7 +460,7 @@
     </tr>
     <tr>
       <td><a name="general_volume_chooser" class="prop"></a> general.volume.chooser</td>
-      <td><strong>Experimental.</strong> The class that will be used to select which volume will be used to create new files.<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> no, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/1.9.2/org/apache/accumulo/server/fs/RandomVolumeChooser.html">org.apache.accumulo.server.fs.RandomVolumeChooser</a></td>
+      <td><strong>Experimental.</strong> The class that will be used to select which volume will be used to create new files.<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> no, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/fs/RandomVolumeChooser.html">org.apache.accumulo.server.fs.RandomVolumeChooser</a></td>
     </tr>
     <tr>
       <td><a name="instance_prefix" class="prop"></a> <strong>instance.</strong>*</td>
@@ -476,7 +476,7 @@
     </tr>
     <tr>
       <td><a name="instance_crypto_service" class="prop"></a> instance.crypto.service</td>
-      <td><strong>Experimental.</strong> The class which executes on-disk file encryption. The default does nothing. To enable encryption, replace this classname with an implementation of theorg.apache.accumulo.core.spi.crypto.CryptoService interface.<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> no, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/security/crypto/impl/NoCryptoService [...]
+      <td><strong>Experimental.</strong> The class which executes on-disk file encryption. The default does nothing. To enable encryption, replace this classname with an implementation of theorg.apache.accumulo.core.spi.crypto.CryptoService interface.<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> no, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/security/crypto/impl/NoCrypt [...]
     </tr>
     <tr>
       <td><a name="instance_dfs_dir" class="prop"></a> instance.dfs.dir</td>
@@ -512,15 +512,15 @@
     </tr>
     <tr>
       <td><a name="instance_security_authenticator" class="prop"></a> instance.security.authenticator</td>
-      <td>The authenticator class that accumulo will use to determine if a user has privilege to perform an action<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> no, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/1.9.2/org/apache/accumulo/server/security/handler/ZKAuthenticator.html">org.apache.accumulo.server.security.handler.ZKAuthenticator</a></td>
+      <td>The authenticator class that accumulo will use to determine if a user has privilege to perform an action<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> no, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/security/handler/ZKAuthenticator.html">org.apache.accumulo.server.security.handler.ZKAuthenticator</a></td>
     </tr>
     <tr>
       <td><a name="instance_security_authorizor" class="prop"></a> instance.security.authorizor</td>
-      <td>The authorizor class that accumulo will use to determine what labels a user has privilege to see<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> no, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/1.9.2/org/apache/accumulo/server/security/handler/ZKAuthorizor.html">org.apache.accumulo.server.security.handler.ZKAuthorizor</a></td>
+      <td>The authorizor class that accumulo will use to determine what labels a user has privilege to see<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> no, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/security/handler/ZKAuthorizor.html">org.apache.accumulo.server.security.handler.ZKAuthorizor</a></td>
     </tr>
     <tr>
       <td><a name="instance_security_permissionHandler" class="prop"></a> instance.security.permissionHandler</td>
-      <td>The permission handler class that accumulo will use to determine if a user has privilege to perform an action<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> no, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/1.9.2/org/apache/accumulo/server/security/handler/ZKPermHandler.html">org.apache.accumulo.server.security.handler.ZKPermHandler</a></td>
+      <td>The permission handler class that accumulo will use to determine if a user has privilege to perform an action<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> no, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/security/handler/ZKPermHandler.html">org.apache.accumulo.server.security.handler.ZKPermHandler</a></td>
     </tr>
     <tr>
       <td><a name="instance_volumes" class="prop"></a> instance.volumes</td>
@@ -612,11 +612,11 @@
     </tr>
     <tr>
       <td><a name="master_tablet_balancer" class="prop"></a> master.tablet.balancer</td>
-      <td>The balancer class that accumulo will use to make tablet assignment and migration decisions.<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/1.9.2/org/apache/accumulo/server/master/balancer/TableLoadBalancer.html">org.apache.accumulo.server.master.balancer.TableLoadBalancer</a></td>
+      <td>The balancer class that accumulo will use to make tablet assignment and migration decisions.<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/master/balancer/TableLoadBalancer.html">org.apache.accumulo.server.master.balancer.TableLoadBalancer</a></td>
     </tr>
     <tr>
       <td><a name="master_walog_closer_implementation" class="prop"></a> master.walog.closer.implementation</td>
-      <td>A class that implements a mechanism to steal write access to a write-ahead log<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/1.9.2/org/apache/accumulo/server/master/recovery/HadoopLogCloser.html">org.apache.accumulo.server.master.recovery.HadoopLogCloser</a></td>
+      <td>A class that implements a mechanism to steal write access to a write-ahead log<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/master/recovery/HadoopLogCloser.html">org.apache.accumulo.server.master.recovery.HadoopLogCloser</a></td>
     </tr>
     <tr>
       <td><a name="monitor_prefix" class="prop"></a> <strong>monitor.</strong>*</td>
@@ -732,7 +732,7 @@
     </tr>
     <tr>
       <td><a name="replication_work_assigner" class="prop"></a> replication.work.assigner</td>
-      <td>Replication WorkAssigner implementation to use<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-master/1.9.2/org/apache/accumulo/master/replication/UnorderedWorkAssigner.html">org.apache.accumulo.master.replication.UnorderedWorkAssigner</a></td>
+      <td>Replication WorkAssigner implementation to use<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-master/2.0.0-alpha-1/org/apache/accumulo/master/replication/UnorderedWorkAssigner.html">org.apache.accumulo.master.replication.UnorderedWorkAssigner</a></td>
     </tr>
     <tr>
       <td><a name="replication_work_assignment_sleep" class="prop"></a> replication.work.assignment.sleep</td>
@@ -824,7 +824,7 @@
     </tr>
     <tr>
       <td><a name="table_bloom_key_functor" class="prop"></a> table.bloom.key.functor</td>
-      <td>A function that can transform the key prior to insertion and check of bloom filter. org.apache.accumulo.core.file.keyfunctor.RowFunctor, org.apache.accumulo.core.file.keyfunctor.ColumnFamilyFunctor, and org.apache.accumulo.core.file.keyfunctor.ColumnQualifierFunctor are allowable values. One can extend any of the above mentioned classes to perform specialized parsing of the key. <br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</st [...]
+      <td>A function that can transform the key prior to insertion and check of bloom filter. org.apache.accumulo.core.file.keyfunctor.RowFunctor, org.apache.accumulo.core.file.keyfunctor.ColumnFamilyFunctor, and org.apache.accumulo.core.file.keyfunctor.ColumnQualifierFunctor are allowable values. One can extend any of the above mentioned classes to perform specialized parsing of the key. <br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</st [...]
     </tr>
     <tr>
       <td><a name="table_bloom_load_threshold" class="prop"></a> table.bloom.load.threshold</td>
@@ -952,7 +952,7 @@
     </tr>
     <tr>
       <td><a name="table_majc_compaction_strategy" class="prop"></a> table.majc.compaction.strategy</td>
-      <td>A customizable major compaction strategy.<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/1.9.2/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategy.html">org.apache.accumulo.tserver.compaction.DefaultCompactionStrategy</a></td>
+      <td>A customizable major compaction strategy.<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/2.0.0-alpha-1/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategy.html">org.apache.accumulo.tserver.compaction.DefaultCompactionStrategy</a></td>
     </tr>
     <tr>
       <td><a name="table_majc_compaction_strategy_opts_prefix" class="prop"></a> <strong>table.majc.compaction.strategy.opts.</strong>*</td>
@@ -976,7 +976,7 @@
     </tr>
     <tr>
       <td><a name="table_scan_dispatcher" class="prop"></a> table.scan.dispatcher</td>
-      <td>This class is used to dynamically dispatch scans to configured scan executors.  Configured classes must implement <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/spi/scan/ScanDispatcher.html">ScanDispatcher</a> See <a href="/docs/2.0/administration/scan-executors">scan executors</a> for an overview of why and how to use this property. This property is ignored for the root and metadata table.  The metadata table always dispatch [...]
+      <td>This class is used to dynamically dispatch scans to configured scan executors.  Configured classes must implement <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/spi/scan/ScanDispatcher.html">ScanDispatcher</a> See <a href="/docs/2.x/administration/scan-executors">scan executors</a> for an overview of why and how to use this property. This property is ignored for the root and metadata table.  The metadata table always  [...]
     </tr>
     <tr>
       <td><a name="table_scan_dispatcher_opts_prefix" class="prop"></a> <strong>table.scan.dispatcher.opts.</strong>*</td>
@@ -1040,7 +1040,7 @@
     </tr>
     <tr>
       <td><a name="trace_token_type" class="prop"></a> trace.token.type</td>
-      <td>An AuthenticationToken type supported by the authorizer<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> no, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/security/tokens/PasswordToken.html">org.apache.accumulo.core.client.security.tokens.PasswordToken</a></td>
+      <td>An AuthenticationToken type supported by the authorizer<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> no, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/security/tokens/PasswordToken.html">org.apache.accumulo.core.client.security.tokens.PasswordToken</a></td>
     </tr>
     <tr>
       <td><a name="trace_user" class="prop"></a> trace.user</td>
@@ -1152,7 +1152,7 @@
     </tr>
     <tr>
       <td><a name="tserver_memory_manager" class="prop"></a> tserver.memory.manager</td>
-      <td>An implementation of MemoryManger that accumulo will use.<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/1.9.2/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.html">org.apache.accumulo.server.tabletserver.LargestFirstMemoryManager</a></td>
+      <td>An implementation of MemoryManger that accumulo will use.<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.html">org.apache.accumulo.server.tabletserver.LargestFirstMemoryManager</a></td>
     </tr>
     <tr>
       <td><a name="tserver_memory_maps_max" class="prop"></a> tserver.memory.maps.max</td>
@@ -1196,7 +1196,7 @@
     </tr>
     <tr>
       <td><a name="tserver_replication_default_replayer" class="prop"></a> tserver.replication.default.replayer</td>
-      <td>Default AccumuloReplicationReplayer implementation<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/1.9.2/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayer.html">org.apache.accumulo.tserver.replication.BatchWriterReplicationReplayer</a></td>
+      <td>Default AccumuloReplicationReplayer implementation<br /><strong>type:</strong> CLASSNAME, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/2.0.0-alpha-1/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayer.html">org.apache.accumulo.tserver.replication.BatchWriterReplicationReplayer</a></td>
     </tr>
     <tr>
       <td><a name="tserver_replication_replayer_prefix" class="prop"></a> <strong>tserver.replication.replayer.</strong>*</td>
@@ -1204,7 +1204,7 @@
     </tr>
     <tr>
       <td><a name="tserver_scan_executors_prefix" class="prop"></a> <strong>tserver.scan.executors.</strong>*</td>
-      <td>Prefix for defining executors to service scans. See <a href="/docs/2.0/administration/scan-executors">scan executors</a> for an overview of why and how to use this property. For each executor the number of threads, thread priority, and an optional prioritizer can be configured. To configure a new executor, set <code class="highlighter-rouge">tserver.scan.executors.&lt;name&gt;.threads=&lt;number&gt;</code>.  Optionally, can also set <code class="highlighter-rouge">tserver.scan. [...]
+      <td>Prefix for defining executors to service scans. See <a href="/docs/2.x/administration/scan-executors">scan executors</a> for an overview of why and how to use this property. For each executor the number of threads, thread priority, and an optional prioritizer can be configured. To configure a new executor, set <code class="highlighter-rouge">tserver.scan.executors.&lt;name&gt;.threads=&lt;number&gt;</code>.  Optionally, can also set <code class="highlighter-rouge">tserver.scan. [...]
     </tr>
     <tr>
       <td><a name="tserver_scan_executors_default_prioritizer" class="prop"></a> tserver.scan.executors.default.prioritizer</td>
@@ -1389,7 +1389,7 @@
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/properties.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/properties.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/administration/replication.html b/docs/2.x/administration/replication.html
similarity index 88%
rename from docs/2.0/administration/replication.html
rename to docs/2.x/administration/replication.html
index c28da9e..e270974 100644
--- a/docs/2.0/administration/replication.html
+++ b/docs/2.x/administration/replication.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,14 +332,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Replication</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Replication</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Replication</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/replication.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/replication.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <h2 id="overview">Overview</h2>
@@ -389,7 +389,7 @@ into the following sections.</p>
 
 <p>Each system involved in replication (even the primary) needs a name that uniquely
 identifies it across all peers in the replication graph. This should be considered
-fixed for an instance, and set using <a href="/docs/2.0/administration/properties#replication_name">replication.name</a> in <code class="highlighter-rouge">accumulo.properties</code>.</p>
+fixed for an instance, and set using <a href="/docs/2.x/administration/properties#replication_name">replication.name</a> in <code class="highlighter-rouge">accumulo.properties</code>.</p>
 
 <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code># Unique name for this system used by replication
 replication.name=primary
@@ -462,15 +462,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/1.9.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.0/administration/properties#replication_work_assigner">replication.work.assigner</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-1/org/apache/accumulo/server/replication/WorkAssigner.html">WorkAssigner</a>
+used could be configured. The implementation is controlled via the property <a href="/docs/2.x/administration/properties#replication_work_assigner">replication.work.assigner</a>
 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/1.9.2/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-1/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/1.9.2/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-1/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
@@ -478,7 +478,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/1.9.2/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-1/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
@@ -488,21 +488,21 @@ 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/1.9.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/1.9.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/1.9.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.0/administration/replication#instance-configuration">Instance Configuration</a>
+<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
+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/1.9.2/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-1/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>
 
 <p>The TabletServer on the primary will then replicate data in batches of a configurable
-size (<a href="/docs/2.0/administration/properties#replication_max_unit_size">replication.max.unit.size</a>). The TabletServer on the peer will report how many
+size (<a href="/docs/2.x/administration/properties#replication_max_unit_size">replication.max.unit.size</a>). The TabletServer on the peer will report how many
 records were applied back to the primary, which will be used to record how many records
 were successfully replicated. The TabletServer on the primary will continue to replicate
 data in these batches until no more data can be read from the file.</p>
@@ -513,16 +513,16 @@ data in these batches until no more data can be read from the file.</p>
 the implementation of various components operate.</p>
 
 <ul>
-  <li><a href="/docs/2.0/administration/properties#replication_max_work_queue">replication.max.work.queue</a> - Maximum number of files queued for replication at one time</li>
-  <li><a href="/docs/2.0/administration/properties#replication_work_assignment_sleep">replication.work.assignment.sleep</a> - Time between invocations of the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/1.9.2/org/apache/accumulo/server/replication/WorkAssigner.html">WorkAssigner</a></li>
-  <li><a href="/docs/2.0/administration/properties#replication_worker_threads">replication.worker.threads</a> - Size of threadpool used to replicate data to peers</li>
-  <li><a href="/docs/2.0/administration/properties#replication_receipt_service_port">replication.receipt.service.port</a> - Thrift service port to listen for replication requests, can use ‘0’ for a random port</li>
-  <li><a href="/docs/2.0/administration/properties#replication_work_attempts">replication.work.attempts</a> - Number of attempts to replicate to a peer before aborting the attempt</li>
-  <li><a href="/docs/2.0/administration/properties#replication_receiver_min_threads">replication.receiver.min.threads</a> - Minimum number of idle threads for handling incoming replication</li>
-  <li><a href="/docs/2.0/administration/properties#replication_receiver_threadcheck_time">replication.receiver.threadcheck.time</a> - Time between attempting adjustments of thread pool for incoming replications</li>
-  <li><a href="/docs/2.0/administration/properties#replication_max_unit_size">replication.max.unit.size</a> - Maximum amount of data to be replicated in one RPC</li>
-  <li><a href="/docs/2.0/administration/properties#replication_work_assigner">replication.work.assigner</a> - <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/1.9.2/org/apache/accumulo/server/replication/WorkAssigner.html">WorkAssigner</a> implementation</li>
-  <li><a href="/docs/2.0/administration/properties#tserver_replication_batchwriter_replayer_memory">tserver.replication.batchwriter.replayer.memory</a> - Size of BatchWriter cache to use in applying replication requests</li>
+  <li><a href="/docs/2.x/administration/properties#replication_max_work_queue">replication.max.work.queue</a> - Maximum number of files queued for replication at one time</li>
+  <li><a href="/docs/2.x/administration/properties#replication_work_assignment_sleep">replication.work.assignment.sleep</a> - Time between invocations of the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/WorkAssigner.html">WorkAssigner</a></li>
+  <li><a href="/docs/2.x/administration/properties#replication_worker_threads">replication.worker.threads</a> - Size of threadpool used to replicate data to peers</li>
+  <li><a href="/docs/2.x/administration/properties#replication_receipt_service_port">replication.receipt.service.port</a> - Thrift service port to listen for replication requests, can use ‘0’ for a random port</li>
+  <li><a href="/docs/2.x/administration/properties#replication_work_attempts">replication.work.attempts</a> - Number of attempts to replicate to a peer before aborting the attempt</li>
+  <li><a href="/docs/2.x/administration/properties#replication_receiver_min_threads">replication.receiver.min.threads</a> - Minimum number of idle threads for handling incoming replication</li>
+  <li><a href="/docs/2.x/administration/properties#replication_receiver_threadcheck_time">replication.receiver.threadcheck.time</a> - Time between attempting adjustments of thread pool for incoming replications</li>
+  <li><a href="/docs/2.x/administration/properties#replication_max_unit_size">replication.max.unit.size</a> - Maximum amount of data to be replicated in one RPC</li>
+  <li><a href="/docs/2.x/administration/properties#replication_work_assigner">replication.work.assigner</a> - <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/WorkAssigner.html">WorkAssigner</a> implementation</li>
+  <li><a href="/docs/2.x/administration/properties#tserver_replication_batchwriter_replayer_memory">tserver.replication.batchwriter.replayer.memory</a> - Size of BatchWriter cache to use in applying replication requests</li>
 </ul>
 
 <h2 id="example-practical-configuration">Example Practical Configuration</h2>
@@ -584,8 +584,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.0/administration/properties#replication_name">replication.name</a> of <code class="highlighter-rouge">peer</code> as a peer. We provide the implementation of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/1.9.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/1.9.2/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/administration/properties#replication_name">replication.name</a> of <code class="highlighter-rouge">peer</code> as a peer. We provide the implementation of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/ReplicaSystem.html">ReplicaSystem</a>
+that we want to use, and the configuration for the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/2.0.0-alpha-1/org/apache/accumulo/server/replication/AccumuloReplicaSystem.html">AccumuloReplicaSystem</a>. In this case, the configuration is the Accumulo
 Instance name for <code class="highlighter-rouge">peer</code> and the ZooKeeper quorum string. The configuration key is of the form
 <code class="highlighter-rouge">replication.peer.$peer_name</code>.</p>
 
@@ -604,8 +604,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/1.9.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/1.9.2/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-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>
 
 <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
@@ -747,7 +747,7 @@ the WAL is fully replicated to all remote locations.</p>
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/replication.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/replication.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/administration/scan-executors.html b/docs/2.x/administration/scan-executors.html
similarity index 87%
rename from docs/2.0/administration/scan-executors.html
rename to docs/2.x/administration/scan-executors.html
index 2779262..6a04e35 100644
--- a/docs/2.0/administration/scan-executors.html
+++ b/docs/2.x/administration/scan-executors.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,17 +332,17 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Scan Executors</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Scan Executors</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Scan Executors</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/scan-executors.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/scan-executors.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
-    <p>Accumulo scans operate by repeatedly fetching batches of data from a <a href="/docs/2.0/getting-started/design#tablet-server-1">tablet
+    <p>Accumulo scans operate by repeatedly fetching batches of data from a <a href="/docs/2.x/getting-started/design#tablet-server-1">tablet
 server</a>.  On the tablet server side, a thread pool fetches batches.
 In Java threads pools are called executors.  By default, a single executor per
 tablet server handles all scans in FIFO order.  For some workloads, the single
@@ -358,7 +358,7 @@ prioritizer can reorder queued work.</p>
 
 <p>By default, Accumulo sets <code class="highlighter-rouge">tserver.scan.executors.default.threads=16</code> which
 creates the default scan executor.  To configure additional scan executors,
-chose a unique name and configure <a href="/docs/2.0/administration/properties#tserver_scan_executors_prefix">tserver.scan.executors.*</a>.  Setting
+chose a unique name and configure <a href="/docs/2.x/administration/properties#tserver_scan_executors_prefix">tserver.scan.executors.*</a>.  Setting
 the following causes each tablet server to create a scan executor with the
 specified threads.</p>
 
@@ -374,8 +374,8 @@ tserver.scan.executors.&lt;name&gt;.prioritizer=&lt;class name&gt;
 tserver.scan.executors.&lt;name&gt;.prioritizer.opts.&lt;key&gt;=&lt;value&gt;
 </code></pre></div></div>
 
-<p>After creating an executor, configure <a href="/docs/2.0/administration/properties#table_scan_dispatcher">table.scan.dispatcher</a> to use it.  A
-dispatcher is Java subclass of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/spi/scan/ScanDispatcher.html">ScanDispatcher</a>
+<p>After creating an executor, configure <a href="/docs/2.x/administration/properties#table_scan_dispatcher">table.scan.dispatcher</a> to use it.  A
+dispatcher is Java subclass of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/spi/scan/ScanDispatcher.html">ScanDispatcher</a>
 that decides which scan executor should service a table.  Set the following table
 property to configure a dispatcher.</p>
 
@@ -387,7 +387,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/1.9.2/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-1/org/apache/accumulo/core/spi/scan/SimpleScanDispatcher.html">SimpleScanDispatcher</a>.
 SimpleScanDispatcher supports an <code class="highlighter-rouge">executor</code> option for choosing a scan
 executor.  If this option is not set, then SimpleScanDispatcher will dispatch
 to the scan executor named <code class="highlighter-rouge">default</code>.</p>
@@ -431,8 +431,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/1.9.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/1.9.2/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-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
 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.
@@ -449,7 +449,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/1.9.2/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-1/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
@@ -462,7 +462,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/1.9.2/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-1/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
@@ -478,7 +478,7 @@ that uses the executor <code class="highlighter-rouge">special</code> with a pri
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/scan-executors.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/scan-executors.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/administration/ssl.html b/docs/2.x/administration/ssl.html
similarity index 88%
rename from docs/2.0/administration/ssl.html
rename to docs/2.x/administration/ssl.html
index ef3568e..832e0ac 100644
--- a/docs/2.0/administration/ssl.html
+++ b/docs/2.x/administration/ssl.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,14 +332,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; SSL</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; SSL</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>SSL</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/ssl.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/ssl.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <p>Accumulo, through Thrift’s TSSLTransport, provides the ability to encrypt
@@ -371,15 +371,15 @@ these files already exist.</p>
 <p>In <code class="highlighter-rouge">accumulo.properties</code>, the following properties are required:</p>
 
 <ul>
-  <li><a href="/docs/2.0/administration/properties#rpc_javax_net_ssl_keyStore">rpc.javax.net.ssl.keyStore</a>  = <em>The path on the local filesystem to the keystore containing the server’s certificate</em></li>
-  <li><a href="/docs/2.0/administration/properties#rpc_javax_net_ssl_keyStorePassword">rpc.javax.net.ssl.keyStorePassword</a> = <em>The password for the keystore containing the server’s certificate</em></li>
-  <li><a href="/docs/2.0/administration/properties#rpc_javax_net_ssl_trustStore">rpc.javax.net.ssl.trustStore</a> = <em>The path on the local filesystem to the keystore containing the certificate authority’s public key</em></li>
-  <li><a href="/docs/2.0/administration/properties#rpc_javax_net_ssl_trustStorePassword">rpc.javax.net.ssl.trustStorePassword</a> = <em>The password for the keystore containing the certificate authority’s public key</em></li>
-  <li><a href="/docs/2.0/administration/properties#instance_rpc_ssl_enabled">instance.rpc.ssl.enabled</a> = <em>true</em></li>
+  <li><a href="/docs/2.x/administration/properties#rpc_javax_net_ssl_keyStore">rpc.javax.net.ssl.keyStore</a>  = <em>The path on the local filesystem to the keystore containing the server’s certificate</em></li>
+  <li><a href="/docs/2.x/administration/properties#rpc_javax_net_ssl_keyStorePassword">rpc.javax.net.ssl.keyStorePassword</a> = <em>The password for the keystore containing the server’s certificate</em></li>
+  <li><a href="/docs/2.x/administration/properties#rpc_javax_net_ssl_trustStore">rpc.javax.net.ssl.trustStore</a> = <em>The path on the local filesystem to the keystore containing the certificate authority’s public key</em></li>
+  <li><a href="/docs/2.x/administration/properties#rpc_javax_net_ssl_trustStorePassword">rpc.javax.net.ssl.trustStorePassword</a> = <em>The password for the keystore containing the certificate authority’s public key</em></li>
+  <li><a href="/docs/2.x/administration/properties#instance_rpc_ssl_enabled">instance.rpc.ssl.enabled</a> = <em>true</em></li>
 </ul>
 
 <p>Optionally, SSL client-authentication (two-way SSL) can also be enabled by setting
-<a href="/docs/2.0/administration/properties#instance_rpc_ssl_clientAuth">instance.rpc.ssl.clientAuth</a> <code class="highlighter-rouge">true</code> in <code class="highlighter-rouge">accumulo.properties</code>.
+<a href="/docs/2.x/administration/properties#instance_rpc_ssl_clientAuth">instance.rpc.ssl.clientAuth</a> <code class="highlighter-rouge">true</code> in <code class="highlighter-rouge">accumulo.properties</code>.
 This requires that each client has access to  valid certificate to set up a secure connection
 to the servers. By default, Accumulo uses one-way SSL which does not require clients to have
 their own certificate.</p>
@@ -387,22 +387,22 @@ their own certificate.</p>
 <h2 id="client-configuration">Client configuration</h2>
 
 <p>To establish a connection to Accumulo servers, each client must also have
-special configuration. This is typically accomplished by <a href="/docs/2.0/getting-started/clients#creating-an-accumulo-client">creating an Accumulo
+special configuration. This is typically accomplished by <a href="/docs/2.x/getting-started/clients#creating-an-accumulo-client">creating an Accumulo
 client</a> using <code class="highlighter-rouge">accumulo-client.properties</code> and setting the following
 the properties to connect to an Accumulo instance using SSL:</p>
 
 <ul>
-  <li><a href="/docs/2.0/development/client-properties#ssl_enabled">ssl.enabled</a> to <code class="highlighter-rouge">true</code></li>
-  <li><a href="/docs/2.0/development/client-properties#ssl_truststore_path">ssl.truststore.path</a></li>
-  <li><a href="/docs/2.0/development/client-properties#ssl_truststore_password">ssl.truststore.password</a></li>
+  <li><a href="/docs/2.x/development/client-properties#ssl_enabled">ssl.enabled</a> to <code class="highlighter-rouge">true</code></li>
+  <li><a href="/docs/2.x/development/client-properties#ssl_truststore_path">ssl.truststore.path</a></li>
+  <li><a href="/docs/2.x/development/client-properties#ssl_truststore_password">ssl.truststore.password</a></li>
 </ul>
 
 <p>If two-way SSL is enabled for the Accumulo instance (by setting [instance.rpc.ssl.clientAuth] to <code class="highlighter-rouge">true</code> in <code class="highlighter-rouge">accumulo.properties</code>),
 Accumulo clients must also define their own certificate by setting the following properties:</p>
 
 <ul>
-  <li><a href="/docs/2.0/development/client-properties#ssl_keystore_path">ssl.keystore.path</a></li>
-  <li><a href="/docs/2.0/development/client-properties#ssl_keystore_password">ssl.keystore.password</a></li>
+  <li><a href="/docs/2.x/development/client-properties#ssl_keystore_path">ssl.keystore.path</a></li>
+  <li><a href="/docs/2.x/development/client-properties#ssl_keystore_password">ssl.keystore.password</a></li>
 </ul>
 
 <h2 id="generating-ssl-material-using-openssl">Generating SSL material using OpenSSL</h2>
@@ -467,7 +467,7 @@ methods are equivalent whether the certificate is generate for an Accumulo serve
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/ssl.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/ssl.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/administration/tracing.html b/docs/2.x/administration/tracing.html
similarity index 92%
rename from docs/2.0/administration/tracing.html
rename to docs/2.x/administration/tracing.html
index 506642d..ef4ca73 100644
--- a/docs/2.0/administration/tracing.html
+++ b/docs/2.x/administration/tracing.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,14 +332,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Tracing</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Tracing</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Tracing</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/tracing.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/tracing.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <p>It can be difficult to determine why some operations are taking longer
@@ -365,20 +365,20 @@ other table.</p>
 
 <p>To collect traces, Accumulo needs at least one tracer server running. If you are using <code class="highlighter-rouge">accumulo-cluster</code> to start your cluster,
 configure your server in <code class="highlighter-rouge">conf/tracers</code>. The server collects traces from clients and writes them to the <code class="highlighter-rouge">trace</code> table. The Accumulo
-user that the tracer connects to Accumulo with can be configured with the following properties (see the <a href="/docs/2.0/administration/configuration-management">configuration management</a> 
+user that the tracer connects to Accumulo with can be configured with the following properties (see the <a href="/docs/2.x/administration/configuration-management">configuration management</a> 
 page for setting Accumulo server properties)</p>
 
 <ul>
-  <li><a href="/docs/2.0/administration/properties#trace_user">trace.user</a></li>
-  <li><a href="/docs/2.0/administration/properties#trace_token_property_password">trace.token.property.password</a></li>
+  <li><a href="/docs/2.x/administration/properties#trace_user">trace.user</a></li>
+  <li><a href="/docs/2.x/administration/properties#trace_token_property_password">trace.token.property.password</a></li>
 </ul>
 
 <p>Other tracer configuration properties include</p>
 
 <ul>
-  <li><a href="/docs/2.0/administration/properties#trace_port_client">trace.port.client</a> - port tracer listens on</li>
-  <li><a href="/docs/2.0/administration/properties#trace_table">trace.table</a> - table tracer writes to</li>
-  <li><a href="/docs/2.0/administration/properties#trace_zookeeper_path">trace.zookeeper.path</a> - zookeeper path where tracers register</li>
+  <li><a href="/docs/2.x/administration/properties#trace_port_client">trace.port.client</a> - port tracer listens on</li>
+  <li><a href="/docs/2.x/administration/properties#trace_table">trace.table</a> - table tracer writes to</li>
+  <li><a href="/docs/2.x/administration/properties#trace_zookeeper_path">trace.zookeeper.path</a> - zookeeper path where tracers register</li>
 </ul>
 
 <p>The zookeeper path is configured to /tracers by default.  If
@@ -393,10 +393,10 @@ configured is org.apache.accumulo.core.trace.ZooTraceClient, which
 sends spans to an Accumulo Tracer process, as discussed in the
 previous section. This default can be changed to a different span
 receiver, or additional span receivers can be added in a
-comma-separated list, by modifying the property <a href="/docs/2.0/administration/properties#trace_span_receivers">trace.span.receivers</a>.</p>
+comma-separated list, by modifying the property <a href="/docs/2.x/administration/properties#trace_span_receivers">trace.span.receivers</a>.</p>
 
 <p>Individual span receivers may require their own configuration
-parameters, which are grouped under the <a href="/docs/2.0/administration/properties#trace_span_receiver_prefix">trace.span.receiver.*</a>
+parameters, which are grouped under the <a href="/docs/2.x/administration/properties#trace_span_receiver_prefix">trace.span.receiver.*</a>
 prefix.  ZooTraceClient uses the following properties.  The first
 three properties are populated from other Accumulo properties,
 while the remaining ones should be prefixed with
@@ -410,8 +410,8 @@ tracer.queue.size - max queue size (default 5000)
 tracer.span.min.ms - minimum span length to store (in ms, default 1)
 </code></pre></div></div>
 
-<p>To configure an Accumulo client for tracing, set <a href="/docs/2.0/development/client-properties#trace_span_receivers">trace.span.receivers</a> and <a href="/docs/2.0/development/client-properties#trace_zookeeper_path">trace.zookeeper.path</a>
-in <code class="highlighter-rouge">accumulo-client.properties</code>. Also, any <a href="/docs/2.0/administration/properties#trace_span_receiver_prefix">trace.span.receiver.*</a> properties set in <code class="highlighter-rouge">accumulo.properties</code> should be set in
+<p>To configure an Accumulo client for tracing, set <a href="/docs/2.x/development/client-properties#trace_span_receivers">trace.span.receivers</a> and <a href="/docs/2.x/development/client-properties#trace_zookeeper_path">trace.zookeeper.path</a>
+in <code class="highlighter-rouge">accumulo-client.properties</code>. Also, any <a href="/docs/2.x/administration/properties#trace_span_receiver_prefix">trace.span.receiver.*</a> properties set in <code class="highlighter-rouge">accumulo.properties</code> should be set in
 <code class="highlighter-rouge">accumulo-client.properties</code>.</p>
 
 <p>Hadoop can also be configured to send traces to Accumulo, as of
@@ -688,7 +688,7 @@ Time  Start  Service@Location       Name
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/tracing.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/tracing.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/administration/upgrading.html b/docs/2.x/administration/upgrading.html
similarity index 90%
rename from docs/2.0/administration/upgrading.html
rename to docs/2.x/administration/upgrading.html
index 6aff706..fd826f7 100644
--- a/docs/2.0/administration/upgrading.html
+++ b/docs/2.x/administration/upgrading.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,14 +332,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Upgrading Accumulo</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Administration &nbsp;&gt;&gt;&nbsp; Upgrading Accumulo</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Upgrading Accumulo</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/upgrading.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/upgrading.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <h2 id="upgrading-from-17-to-18">Upgrading from 1.7 to 1.8</h2>
@@ -461,7 +461,7 @@ that 1.4 was using.</li>
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/administration/upgrading.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/administration/upgrading.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/2.x/apidocs/allclasses-frame.html b/docs/2.x/apidocs/allclasses-frame.html
similarity index 100%
rename from 2.x/apidocs/allclasses-frame.html
rename to docs/2.x/apidocs/allclasses-frame.html
diff --git a/2.x/apidocs/allclasses-noframe.html b/docs/2.x/apidocs/allclasses-noframe.html
similarity index 100%
rename from 2.x/apidocs/allclasses-noframe.html
rename to docs/2.x/apidocs/allclasses-noframe.html
diff --git a/2.x/apidocs/constant-values.html b/docs/2.x/apidocs/constant-values.html
similarity index 100%
rename from 2.x/apidocs/constant-values.html
rename to docs/2.x/apidocs/constant-values.html
diff --git a/2.x/apidocs/deprecated-list.html b/docs/2.x/apidocs/deprecated-list.html
similarity index 100%
rename from 2.x/apidocs/deprecated-list.html
rename to docs/2.x/apidocs/deprecated-list.html
diff --git a/2.x/apidocs/help-doc.html b/docs/2.x/apidocs/help-doc.html
similarity index 100%
rename from 2.x/apidocs/help-doc.html
rename to docs/2.x/apidocs/help-doc.html
diff --git a/2.x/apidocs/index-all.html b/docs/2.x/apidocs/index-all.html
similarity index 100%
rename from 2.x/apidocs/index-all.html
rename to docs/2.x/apidocs/index-all.html
diff --git a/2.x/apidocs/index.html b/docs/2.x/apidocs/index.html
similarity index 100%
rename from 2.x/apidocs/index.html
rename to docs/2.x/apidocs/index.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/Accumulo.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/Accumulo.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/Accumulo.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/Accumulo.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.AccumuloClientFactory.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.AuthenticationArgs.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ClientInfoFactory.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ClientInfoOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.ConnectionOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.FromOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.FromOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.FromOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.FromOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.InstanceArgs.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.PropertyOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.SaslOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.SslOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.SslOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.SslOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.SslOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloClient.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/AccumuloException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/AccumuloException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/AccumuloSecurityException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloSecurityException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/AccumuloSecurityException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/AccumuloSecurityException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/BatchDeleter.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/BatchDeleter.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/BatchDeleter.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/BatchDeleter.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/BatchScanner.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/BatchScanner.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/BatchScanner.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/BatchScanner.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/BatchWriter.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/BatchWriter.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/BatchWriter.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/BatchWriter.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/BatchWriterConfig.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/BatchWriterConfig.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/BatchWriterConfig.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/BatchWriterConfig.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/ClientConfiguration.ClientProperty.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/ClientConfiguration.ClientProperty.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/ClientConfiguration.ClientProperty.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/ClientConfiguration.ClientProperty.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/ClientConfiguration.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/ClientConfiguration.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/ClientConfiguration.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/ClientConfiguration.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/ClientInfo.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/ClientInfo.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/ClientInfo.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/ClientInfo.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/ClientSideIteratorScanner.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/ClientSideIteratorScanner.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/ClientSideIteratorScanner.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/ClientSideIteratorScanner.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/ConditionalWriter.Result.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/ConditionalWriter.Result.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/ConditionalWriter.Result.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/ConditionalWriter.Result.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/ConditionalWriter.Status.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/ConditionalWriter.Status.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/ConditionalWriter.Status.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/ConditionalWriter.Status.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/ConditionalWriter.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/ConditionalWriter.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/ConditionalWriter.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/ConditionalWriter.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/ConditionalWriterConfig.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/ConditionalWriterConfig.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/ConditionalWriterConfig.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/ConditionalWriterConfig.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/Connector.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/Connector.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/Connector.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/Connector.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/Durability.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/Durability.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/Durability.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/Durability.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/Instance.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/Instance.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/Instance.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/Instance.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/IsolatedScanner.MemoryRowBuffer.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/IsolatedScanner.MemoryRowBuffer.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/IsolatedScanner.MemoryRowBuffer.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/IsolatedScanner.MemoryRowBuffer.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/IsolatedScanner.MemoryRowBufferFactory.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/IsolatedScanner.MemoryRowBufferFactory.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/IsolatedScanner.MemoryRowBufferFactory.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/IsolatedScanner.MemoryRowBufferFactory.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/IsolatedScanner.RowBuffer.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/IsolatedScanner.RowBuffer.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/IsolatedScanner.RowBuffer.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/IsolatedScanner.RowBuffer.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/IsolatedScanner.RowBufferFactory.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/IsolatedScanner.RowBufferFactory.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/IsolatedScanner.RowBufferFactory.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/IsolatedScanner.RowBufferFactory.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/IsolatedScanner.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/IsolatedScanner.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/IsolatedScanner.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/IsolatedScanner.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/IteratorSetting.Column.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/IteratorSetting.Column.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/IteratorSetting.Column.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/IteratorSetting.Column.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/IteratorSetting.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/IteratorSetting.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/IteratorSetting.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/IteratorSetting.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/MultiTableBatchWriter.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/MultiTableBatchWriter.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/MultiTableBatchWriter.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/MultiTableBatchWriter.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/MutationsRejectedException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/MutationsRejectedException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/MutationsRejectedException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/MutationsRejectedException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/NamespaceExistsException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/NamespaceExistsException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/NamespaceExistsException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/NamespaceExistsException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/NamespaceNotEmptyException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/NamespaceNotEmptyException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/NamespaceNotEmptyException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/NamespaceNotEmptyException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/NamespaceNotFoundException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/NamespaceNotFoundException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/NamespaceNotFoundException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/NamespaceNotFoundException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/RowIterator.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/RowIterator.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/RowIterator.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/RowIterator.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/SampleNotPresentException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/SampleNotPresentException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/SampleNotPresentException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/SampleNotPresentException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/Scanner.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/Scanner.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/Scanner.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/Scanner.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/ScannerBase.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/ScannerBase.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/ScannerBase.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/ScannerBase.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/TableDeletedException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/TableDeletedException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/TableDeletedException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/TableDeletedException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/TableExistsException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/TableExistsException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/TableExistsException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/TableExistsException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/TableNotFoundException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/TableNotFoundException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/TableNotFoundException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/TableNotFoundException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/TableOfflineException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/TableOfflineException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/TableOfflineException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/TableOfflineException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/TimedOutException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/TimedOutException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/TimedOutException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/TimedOutException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/ZooKeeperInstance.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/ZooKeeperInstance.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/ZooKeeperInstance.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/ZooKeeperInstance.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/ActiveCompaction.CompactionReason.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/ActiveCompaction.CompactionReason.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/ActiveCompaction.CompactionReason.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/ActiveCompaction.CompactionReason.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/ActiveCompaction.CompactionType.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/ActiveCompaction.CompactionType.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/ActiveCompaction.CompactionType.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/ActiveCompaction.CompactionType.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/ActiveCompaction.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/ActiveCompaction.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/ActiveCompaction.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/ActiveCompaction.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/ActiveScan.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/ActiveScan.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/ActiveScan.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/ActiveScan.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/CompactionConfig.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/CompactionConfig.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/CompactionConfig.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/CompactionConfig.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/CompactionStrategyConfig.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/CompactionStrategyConfig.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/CompactionStrategyConfig.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/CompactionStrategyConfig.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/DelegationTokenConfig.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/DelegationTokenConfig.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/DelegationTokenConfig.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/DelegationTokenConfig.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/DiskUsage.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/DiskUsage.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/DiskUsage.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/DiskUsage.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/FindMax.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/FindMax.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/FindMax.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/FindMax.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/InitialTableState.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/InitialTableState.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/InitialTableState.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/InitialTableState.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/InstanceOperations.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/InstanceOperations.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/InstanceOperations.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/InstanceOperations.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/Locations.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/Locations.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/Locations.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/Locations.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/NamespaceOperations.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/NamespaceOperations.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/NamespaceOperations.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/NamespaceOperations.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/NewTableConfiguration.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/NewTableConfiguration.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/NewTableConfiguration.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/NewTableConfiguration.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/ReplicationOperations.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/ReplicationOperations.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/ReplicationOperations.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/ReplicationOperations.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/ScanState.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/ScanState.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/ScanState.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/ScanState.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/ScanType.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/ScanType.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/ScanType.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/ScanType.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/SecurityOperations.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/SecurityOperations.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/SecurityOperations.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/SecurityOperations.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/SummaryRetriever.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/SummaryRetriever.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/SummaryRetriever.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/SummaryRetriever.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/TableOperations.ImportDestinationArguments.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/TableOperations.ImportDestinationArguments.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/TableOperations.ImportDestinationArguments.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/TableOperations.ImportDestinationArguments.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/TableOperations.ImportMappingOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/TableOperations.ImportMappingOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/TableOperations.ImportMappingOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/TableOperations.ImportMappingOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/TableOperations.ImportOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/TableOperations.ImportOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/TableOperations.ImportOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/TableOperations.ImportOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/TableOperations.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/TableOperations.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/TableOperations.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/TableOperations.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/TimeType.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/TimeType.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/TimeType.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/TimeType.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ActiveCompaction.CompactionReason.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ActiveCompaction.CompactionReason.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ActiveCompaction.CompactionReason.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ActiveCompaction.CompactionReason.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ActiveCompaction.CompactionType.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ActiveCompaction.CompactionType.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ActiveCompaction.CompactionType.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ActiveCompaction.CompactionType.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ActiveCompaction.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ActiveCompaction.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ActiveCompaction.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ActiveCompaction.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ActiveScan.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ActiveScan.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ActiveScan.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ActiveScan.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/CompactionConfig.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/CompactionConfig.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/CompactionConfig.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/CompactionConfig.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/CompactionStrategyConfig.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/CompactionStrategyConfig.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/CompactionStrategyConfig.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/CompactionStrategyConfig.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/DelegationTokenConfig.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/DelegationTokenConfig.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/DelegationTokenConfig.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/DelegationTokenConfig.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/DiskUsage.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/DiskUsage.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/DiskUsage.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/DiskUsage.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/FindMax.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/FindMax.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/FindMax.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/FindMax.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/InitialTableState.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/InitialTableState.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/InitialTableState.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/InitialTableState.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/InstanceOperations.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/InstanceOperations.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/InstanceOperations.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/InstanceOperations.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/Locations.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/Locations.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/Locations.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/Locations.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/NamespaceOperations.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/NamespaceOperations.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/NamespaceOperations.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/NamespaceOperations.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/NewTableConfiguration.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/NewTableConfiguration.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/NewTableConfiguration.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/NewTableConfiguration.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ReplicationOperations.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ReplicationOperations.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ReplicationOperations.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ReplicationOperations.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ScanState.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ScanState.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ScanState.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ScanState.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ScanType.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ScanType.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ScanType.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/ScanType.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/SecurityOperations.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/SecurityOperations.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/SecurityOperations.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/SecurityOperations.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/SummaryRetriever.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/SummaryRetriever.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/SummaryRetriever.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/SummaryRetriever.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/TableOperations.ImportDestinationArguments.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/TableOperations.ImportDestinationArguments.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/TableOperations.ImportDestinationArguments.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/TableOperations.ImportDestinationArguments.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/TableOperations.ImportMappingOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/TableOperations.ImportMappingOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/TableOperations.ImportMappingOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/TableOperations.ImportMappingOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/TableOperations.ImportOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/TableOperations.ImportOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/TableOperations.ImportOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/TableOperations.ImportOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/TableOperations.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/TableOperations.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/TableOperations.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/TableOperations.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/TimeType.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/TimeType.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/TimeType.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/class-use/TimeType.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/package-frame.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/package-frame.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/package-frame.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/package-frame.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/package-summary.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/package-summary.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/package-summary.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/package-summary.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/package-tree.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/package-tree.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/package-tree.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/package-tree.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/admin/package-use.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/admin/package-use.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/admin/package-use.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/admin/package-use.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/Accumulo.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/Accumulo.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/Accumulo.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/Accumulo.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.AccumuloClientFactory.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.AccumuloClientFactory.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.AccumuloClientFactory.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.AccumuloClientFactory.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.AuthenticationArgs.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.AuthenticationArgs.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.AuthenticationArgs.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.AuthenticationArgs.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.ClientInfoFactory.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.ClientInfoFactory.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.ClientInfoFactory.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.ClientInfoFactory.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.ClientInfoOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.ClientInfoOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.ClientInfoOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.ClientInfoOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.ConnectionOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.ConnectionOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.ConnectionOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.ConnectionOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.FromOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.FromOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.FromOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.FromOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.InstanceArgs.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.InstanceArgs.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.InstanceArgs.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.InstanceArgs.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.PropertyOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.PropertyOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.PropertyOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.PropertyOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.SaslOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.SaslOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.SaslOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.SaslOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.SslOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.SslOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.SslOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.SslOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloClient.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloSecurityException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloSecurityException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloSecurityException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/AccumuloSecurityException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/BatchDeleter.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/BatchDeleter.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/BatchDeleter.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/BatchDeleter.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/BatchScanner.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/BatchScanner.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/BatchScanner.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/BatchScanner.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/BatchWriter.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/BatchWriter.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/BatchWriter.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/BatchWriter.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/BatchWriterConfig.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/BatchWriterConfig.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/BatchWriterConfig.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/BatchWriterConfig.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/ClientConfiguration.ClientProperty.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/ClientConfiguration.ClientProperty.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/ClientConfiguration.ClientProperty.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/ClientConfiguration.ClientProperty.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/ClientConfiguration.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/ClientConfiguration.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/ClientConfiguration.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/ClientConfiguration.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/ClientInfo.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/ClientInfo.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/ClientInfo.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/ClientInfo.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/ClientSideIteratorScanner.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/ClientSideIteratorScanner.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/ClientSideIteratorScanner.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/ClientSideIteratorScanner.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/ConditionalWriter.Result.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/ConditionalWriter.Result.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/ConditionalWriter.Result.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/ConditionalWriter.Result.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/ConditionalWriter.Status.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/ConditionalWriter.Status.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/ConditionalWriter.Status.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/ConditionalWriter.Status.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/ConditionalWriter.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/ConditionalWriter.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/ConditionalWriter.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/ConditionalWriter.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/ConditionalWriterConfig.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/ConditionalWriterConfig.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/ConditionalWriterConfig.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/ConditionalWriterConfig.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/Connector.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/Connector.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/Connector.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/Connector.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/Durability.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/Durability.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/Durability.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/Durability.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/Instance.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/Instance.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/Instance.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/Instance.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/IsolatedScanner.MemoryRowBuffer.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/IsolatedScanner.MemoryRowBuffer.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/IsolatedScanner.MemoryRowBuffer.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/IsolatedScanner.MemoryRowBuffer.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/IsolatedScanner.MemoryRowBufferFactory.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/IsolatedScanner.MemoryRowBufferFactory.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/IsolatedScanner.MemoryRowBufferFactory.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/IsolatedScanner.MemoryRowBufferFactory.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/IsolatedScanner.RowBuffer.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/IsolatedScanner.RowBuffer.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/IsolatedScanner.RowBuffer.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/IsolatedScanner.RowBuffer.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/IsolatedScanner.RowBufferFactory.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/IsolatedScanner.RowBufferFactory.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/IsolatedScanner.RowBufferFactory.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/IsolatedScanner.RowBufferFactory.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/IsolatedScanner.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/IsolatedScanner.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/IsolatedScanner.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/IsolatedScanner.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/IteratorSetting.Column.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/IteratorSetting.Column.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/IteratorSetting.Column.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/IteratorSetting.Column.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/IteratorSetting.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/IteratorSetting.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/IteratorSetting.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/IteratorSetting.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/MultiTableBatchWriter.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/MultiTableBatchWriter.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/MultiTableBatchWriter.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/MultiTableBatchWriter.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/MutationsRejectedException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/MutationsRejectedException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/MutationsRejectedException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/MutationsRejectedException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/NamespaceExistsException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/NamespaceExistsException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/NamespaceExistsException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/NamespaceExistsException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/NamespaceNotEmptyException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/NamespaceNotEmptyException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/NamespaceNotEmptyException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/NamespaceNotEmptyException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/NamespaceNotFoundException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/NamespaceNotFoundException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/NamespaceNotFoundException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/NamespaceNotFoundException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/RowIterator.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/RowIterator.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/RowIterator.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/RowIterator.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/SampleNotPresentException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/SampleNotPresentException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/SampleNotPresentException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/SampleNotPresentException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/Scanner.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/Scanner.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/Scanner.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/Scanner.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/ScannerBase.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/ScannerBase.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/ScannerBase.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/ScannerBase.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/TableDeletedException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/TableDeletedException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/TableDeletedException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/TableDeletedException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/TableExistsException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/TableExistsException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/TableExistsException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/TableExistsException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/TableNotFoundException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/TableNotFoundException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/TableNotFoundException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/TableNotFoundException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/TableOfflineException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/TableOfflineException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/TableOfflineException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/TableOfflineException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/TimedOutException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/TimedOutException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/TimedOutException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/TimedOutException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/class-use/ZooKeeperInstance.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/ZooKeeperInstance.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/class-use/ZooKeeperInstance.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/class-use/ZooKeeperInstance.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/AbstractEncoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/AbstractEncoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/AbstractEncoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/AbstractEncoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/DateLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/DateLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/DateLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/DateLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/Encoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/Encoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/Encoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/Encoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/FloatLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/FloatLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/FloatLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/FloatLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/Lexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/Lexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/Lexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/Lexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/ListLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/ListLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/ListLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/ListLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/LongLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/LongLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/LongLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/LongLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/PairLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/PairLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/PairLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/PairLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/StringLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/StringLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/StringLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/StringLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/TextLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/TextLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/TextLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/TextLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/AbstractEncoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/AbstractEncoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/AbstractEncoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/AbstractEncoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/BigIntegerLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/BigIntegerLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/BigIntegerLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/BigIntegerLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/BytesLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/BytesLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/BytesLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/BytesLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/DateLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/DateLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/DateLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/DateLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/DoubleLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/DoubleLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/DoubleLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/DoubleLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/Encoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/Encoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/Encoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/Encoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/FloatLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/FloatLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/FloatLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/FloatLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/IntegerLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/IntegerLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/IntegerLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/IntegerLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/Lexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/Lexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/Lexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/Lexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/ListLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/ListLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/ListLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/ListLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/LongLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/LongLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/LongLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/LongLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/PairLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/PairLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/PairLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/PairLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/ReverseLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/ReverseLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/ReverseLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/ReverseLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/StringLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/StringLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/StringLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/StringLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/TextLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/TextLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/TextLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/TextLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/UIntegerLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/UIntegerLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/UIntegerLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/UIntegerLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/ULongLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/ULongLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/ULongLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/ULongLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/UUIDLexicoder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/UUIDLexicoder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/UUIDLexicoder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/class-use/UUIDLexicoder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/package-frame.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/package-frame.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/package-frame.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/package-frame.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/package-summary.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/package-summary.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/package-summary.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/package-summary.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/package-tree.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/package-tree.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/package-tree.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/package-tree.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/package-use.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/package-use.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/lexicoder/package-use.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/lexicoder/package-use.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/AbstractInputFormat.AbstractRecordReader.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/AbstractInputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/AbstractInputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/AbstractInputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/AbstractInputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.AccumuloRecordWriter.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.AccumuloRecordWriter.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.AccumuloRecordWriter.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.AccumuloRecordWriter.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/InputFormatBase.RecordReaderBase.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/InputFormatBase.RecordReaderBase.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/InputFormatBase.RecordReaderBase.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/InputFormatBase.RecordReaderBase.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/InputFormatBase.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/InputFormatBase.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/InputFormatBase.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/InputFormatBase.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/RangeInputSplit.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/RangeInputSplit.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/RangeInputSplit.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/RangeInputSplit.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AbstractInputFormat.AbstractRecordReader.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AbstractInputFormat.AbstractRecordReader.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AbstractInputFormat.AbstractRecordReader.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AbstractInputFormat.AbstractRecordReader.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AbstractInputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AbstractInputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AbstractInputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AbstractInputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloFileOutputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloFileOutputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloFileOutputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloFileOutputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloInputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloInputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloInputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloInputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloMultiTableInputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloMultiTableInputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloMultiTableInputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloMultiTableInputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloOutputFormat.AccumuloRecordWriter.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloOutputFormat.AccumuloRecordWriter.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloOutputFormat.AccumuloRecordWriter.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloOutputFormat.AccumuloRecordWriter.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloOutputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloOutputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloOutputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloOutputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloRowInputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloRowInputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloRowInputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/AccumuloRowInputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/InputFormatBase.RecordReaderBase.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/InputFormatBase.RecordReaderBase.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/InputFormatBase.RecordReaderBase.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/InputFormatBase.RecordReaderBase.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/InputFormatBase.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/InputFormatBase.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/InputFormatBase.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/InputFormatBase.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/RangeInputSplit.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/RangeInputSplit.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/RangeInputSplit.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/class-use/RangeInputSplit.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/package-frame.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/package-frame.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/package-frame.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/package-frame.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/package-summary.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/package-summary.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/package-summary.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/package-summary.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/package-tree.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/package-tree.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/package-tree.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/package-tree.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapred/package-use.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/package-use.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapred/package-use.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapred/package-use.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.AbstractRecordReader.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.AccumuloRecordWriter.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.AccumuloRecordWriter.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.AccumuloRecordWriter.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.AccumuloRecordWriter.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/InputFormatBase.RecordReaderBase.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/InputFormatBase.RecordReaderBase.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/InputFormatBase.RecordReaderBase.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/InputFormatBase.RecordReaderBase.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/InputFormatBase.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/InputFormatBase.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/InputFormatBase.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/InputFormatBase.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/InputTableConfig.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/InputTableConfig.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/InputTableConfig.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/InputTableConfig.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AbstractInputFormat.AbstractRecordReader.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AbstractInputFormat.AbstractRecordReader.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AbstractInputFormat.AbstractRecordReader.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AbstractInputFormat.AbstractRecordReader.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AbstractInputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AbstractInputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AbstractInputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AbstractInputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloFileOutputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloFileOutputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloFileOutputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloFileOutputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloInputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloInputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloInputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloInputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloMultiTableInputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloMultiTableInputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloMultiTableInputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloMultiTableInputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloOutputFormat.AccumuloRecordWriter.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloOutputFormat.AccumuloRecordWriter.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloOutputFormat.AccumuloRecordWriter.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloOutputFormat.AccumuloRecordWriter.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloOutputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloOutputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloOutputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloOutputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloRowInputFormat.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloRowInputFormat.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloRowInputFormat.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/AccumuloRowInputFormat.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/InputFormatBase.RecordReaderBase.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/InputFormatBase.RecordReaderBase.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/InputFormatBase.RecordReaderBase.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/InputFormatBase.RecordReaderBase.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/InputFormatBase.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/InputFormatBase.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/InputFormatBase.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/InputFormatBase.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/InputTableConfig.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/InputTableConfig.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/InputTableConfig.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/InputTableConfig.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/RangeInputSplit.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/RangeInputSplit.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/RangeInputSplit.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/class-use/RangeInputSplit.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/KeyRangePartitioner.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/KeyRangePartitioner.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/KeyRangePartitioner.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/KeyRangePartitioner.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/class-use/KeyRangePartitioner.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/class-use/KeyRangePartitioner.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/class-use/KeyRangePartitioner.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/class-use/KeyRangePartitioner.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/class-use/RangePartitioner.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/class-use/RangePartitioner.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/class-use/RangePartitioner.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/class-use/RangePartitioner.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/package-frame.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/package-frame.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/package-frame.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/package-frame.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/package-summary.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/package-summary.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/package-summary.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/package-summary.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/package-tree.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/package-tree.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/package-tree.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/package-tree.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/package-use.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/package-use.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/package-use.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/package-use.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/package-frame.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/package-frame.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/package-frame.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/package-frame.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/package-summary.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/package-summary.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/package-summary.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/package-summary.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/package-tree.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/package-tree.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/package-tree.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/package-tree.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/package-use.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/package-use.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/mapreduce/package-use.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/mapreduce/package-use.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/package-frame.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/package-frame.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/package-frame.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/package-frame.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/package-summary.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/package-summary.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/package-summary.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/package-summary.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/package-tree.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/package-tree.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/package-tree.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/package-tree.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/package-use.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/package-use.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/package-use.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/package-use.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/replication/PeerExistsException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/replication/PeerExistsException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/replication/PeerExistsException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/replication/PeerExistsException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/replication/PeerNotFoundException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/replication/PeerNotFoundException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/replication/PeerNotFoundException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/replication/PeerNotFoundException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/replication/class-use/PeerExistsException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/replication/class-use/PeerExistsException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/replication/class-use/PeerExistsException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/replication/class-use/PeerExistsException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/replication/class-use/PeerNotFoundException.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/replication/class-use/PeerNotFoundException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/replication/class-use/PeerNotFoundException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/replication/class-use/PeerNotFoundException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/replication/package-frame.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/replication/package-frame.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/replication/package-frame.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/replication/package-frame.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/replication/package-summary.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/replication/package-summary.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/replication/package-summary.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/replication/package-summary.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/replication/package-tree.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/replication/package-tree.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/replication/package-tree.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/replication/package-tree.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/replication/package-use.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/replication/package-use.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/replication/package-use.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/replication/package-use.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.InputArguments.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.InputArguments.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.InputArguments.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.InputArguments.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.OutputArguments.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.OutputArguments.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.OutputArguments.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.OutputArguments.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.ScannerFSOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.ScannerFSOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.ScannerFSOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.ScannerFSOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.ScannerOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.ScannerOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.ScannerOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.ScannerOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.SummaryFSOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.SummaryFSOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.SummaryFSOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.SummaryFSOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.SummaryInputArguments.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.SummaryInputArguments.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.SummaryInputArguments.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.SummaryInputArguments.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.SummaryOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.SummaryOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.SummaryOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.SummaryOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.WriterFSOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.WriterFSOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.WriterFSOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.WriterFSOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.WriterOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.WriterOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.WriterOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.WriterOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFile.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFileSource.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFileSource.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/RFileSource.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFileSource.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFileWriter.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFileWriter.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/RFileWriter.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/RFileWriter.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.InputArguments.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.InputArguments.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.InputArguments.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.InputArguments.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.OutputArguments.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.OutputArguments.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.OutputArguments.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.OutputArguments.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.ScannerFSOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.ScannerFSOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.ScannerFSOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.ScannerFSOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.ScannerOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.ScannerOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.ScannerOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.ScannerOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.SummaryFSOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.SummaryFSOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.SummaryFSOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.SummaryFSOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.SummaryInputArguments.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.SummaryInputArguments.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.SummaryInputArguments.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.SummaryInputArguments.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.SummaryOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.SummaryOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.SummaryOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.SummaryOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.WriterFSOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.WriterFSOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.WriterFSOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.WriterFSOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.WriterOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.WriterOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.WriterOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.WriterOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFile.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFileSource.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFileSource.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFileSource.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFileSource.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFileWriter.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFileWriter.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFileWriter.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/class-use/RFileWriter.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/package-frame.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/package-frame.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/package-frame.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/package-frame.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/package-summary.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/package-summary.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/package-summary.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/package-summary.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/package-tree.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/package-tree.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/package-tree.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/package-tree.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/rfile/package-use.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/package-use.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/rfile/package-use.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/rfile/package-use.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/sample/AbstractHashSampler.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/sample/AbstractHashSampler.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/sample/AbstractHashSampler.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/sample/AbstractHashSampler.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/sample/RowColumnSampler.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/sample/RowColumnSampler.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/sample/RowColumnSampler.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/sample/RowColumnSampler.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/sample/RowSampler.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/sample/RowSampler.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/sample/RowSampler.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/sample/RowSampler.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/sample/Sampler.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/sample/Sampler.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/sample/Sampler.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/sample/Sampler.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/sample/SamplerConfiguration.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/sample/SamplerConfiguration.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/sample/SamplerConfiguration.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/sample/SamplerConfiguration.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/sample/class-use/AbstractHashSampler.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/sample/class-use/AbstractHashSampler.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/sample/class-use/AbstractHashSampler.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/sample/class-use/AbstractHashSampler.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/sample/class-use/RowColumnSampler.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/sample/class-use/RowColumnSampler.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/sample/class-use/RowColumnSampler.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/sample/class-use/RowColumnSampler.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/sample/class-use/RowSampler.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/sample/class-use/RowSampler.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/sample/class-use/RowSampler.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/sample/class-use/RowSampler.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/sample/class-use/Sampler.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/sample/class-use/Sampler.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/sample/class-use/Sampler.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/sample/class-use/Sampler.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/sample/class-use/SamplerConfiguration.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/sample/class-use/SamplerConfiguration.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/sample/class-use/SamplerConfiguration.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/sample/class-use/SamplerConfiguration.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/sample/package-frame.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/sample/package-frame.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/sample/package-frame.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/sample/package-frame.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/sample/package-summary.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/sample/package-summary.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/sample/package-summary.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/sample/package-summary.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/sample/package-tree.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/sample/package-tree.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/sample/package-tree.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/sample/package-tree.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/sample/package-use.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/sample/package-use.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/sample/package-use.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/sample/package-use.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/SecurityErrorCode.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/SecurityErrorCode.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/SecurityErrorCode.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/SecurityErrorCode.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/class-use/SecurityErrorCode.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/class-use/SecurityErrorCode.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/class-use/SecurityErrorCode.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/class-use/SecurityErrorCode.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/package-frame.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/package-frame.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/package-frame.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/package-frame.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/package-summary.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/package-summary.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/package-summary.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/package-summary.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/package-tree.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/package-tree.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/package-tree.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/package-tree.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/package-use.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/package-use.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/package-use.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/package-use.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.AuthenticationTokenSerializer.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.AuthenticationTokenSerializer.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.AuthenticationTokenSerializer.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.AuthenticationTokenSerializer.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.Properties.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.Properties.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.Properties.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.Properties.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.TokenProperty.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.TokenProperty.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.TokenProperty.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.TokenProperty.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/DelegationToken.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/DelegationToken.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/tokens/DelegationToken.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/DelegationToken.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/KerberosToken.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/KerberosToken.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/tokens/KerberosToken.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/KerberosToken.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/NullToken.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/NullToken.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/tokens/NullToken.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/NullToken.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/PasswordToken.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/PasswordToken.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/tokens/PasswordToken.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/PasswordToken.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/AuthenticationToken.AuthenticationTokenSerializer.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/AuthenticationToken.AuthenticationTokenSerializer.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/AuthenticationToken.AuthenticationTokenSerializer.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/AuthenticationToken.AuthenticationTokenSerializer.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/AuthenticationToken.Properties.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/AuthenticationToken.Properties.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/AuthenticationToken.Properties.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/AuthenticationToken.Properties.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/AuthenticationToken.TokenProperty.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/AuthenticationToken.TokenProperty.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/AuthenticationToken.TokenProperty.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/AuthenticationToken.TokenProperty.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/AuthenticationToken.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/AuthenticationToken.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/AuthenticationToken.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/AuthenticationToken.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/CredentialProviderToken.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/CredentialProviderToken.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/CredentialProviderToken.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/CredentialProviderToken.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/DelegationToken.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/DelegationToken.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/DelegationToken.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/DelegationToken.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/KerberosToken.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/KerberosToken.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/KerberosToken.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/KerberosToken.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/NullToken.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/NullToken.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/NullToken.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/NullToken.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/PasswordToken.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/PasswordToken.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/PasswordToken.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/class-use/PasswordToken.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/package-frame.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/package-frame.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/tokens/package-frame.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/package-frame.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/package-summary.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/package-summary.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/tokens/package-summary.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/package-summary.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/package-tree.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/package-tree.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/tokens/package-tree.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/package-tree.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/package-use.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/package-use.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/security/tokens/package-use.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/security/tokens/package-use.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/CounterSummary.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/CounterSummary.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/CounterSummary.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/CounterSummary.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/CountingSummarizer.Converter.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/CountingSummarizer.Converter.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/CountingSummarizer.Converter.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/CountingSummarizer.Converter.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/CountingSummarizer.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/CountingSummarizer.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/CountingSummarizer.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/CountingSummarizer.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/Summarizer.Collector.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/Summarizer.Collector.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/Summarizer.Collector.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/Summarizer.Collector.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/Summarizer.Combiner.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/Summarizer.Combiner.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/Summarizer.Combiner.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/Summarizer.Combiner.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/Summarizer.StatisticConsumer.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/Summarizer.StatisticConsumer.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/Summarizer.StatisticConsumer.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/Summarizer.StatisticConsumer.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/Summarizer.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/Summarizer.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/Summarizer.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/Summarizer.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/SummarizerConfiguration.Builder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/SummarizerConfiguration.Builder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/SummarizerConfiguration.Builder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/SummarizerConfiguration.Builder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/SummarizerConfiguration.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/SummarizerConfiguration.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/SummarizerConfiguration.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/SummarizerConfiguration.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/Summary.FileStatistics.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/Summary.FileStatistics.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/Summary.FileStatistics.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/Summary.FileStatistics.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/Summary.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/Summary.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/Summary.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/Summary.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/CounterSummary.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/CounterSummary.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/CounterSummary.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/CounterSummary.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/CountingSummarizer.Converter.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/CountingSummarizer.Converter.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/CountingSummarizer.Converter.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/CountingSummarizer.Converter.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/CountingSummarizer.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/CountingSummarizer.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/CountingSummarizer.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/CountingSummarizer.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summarizer.Collector.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summarizer.Collector.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summarizer.Collector.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summarizer.Collector.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summarizer.Combiner.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summarizer.Combiner.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summarizer.Combiner.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summarizer.Combiner.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summarizer.StatisticConsumer.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summarizer.StatisticConsumer.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summarizer.StatisticConsumer.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summarizer.StatisticConsumer.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summarizer.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summarizer.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summarizer.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summarizer.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/SummarizerConfiguration.Builder.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/SummarizerConfiguration.Builder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/SummarizerConfiguration.Builder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/SummarizerConfiguration.Builder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/SummarizerConfiguration.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/SummarizerConfiguration.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/SummarizerConfiguration.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/SummarizerConfiguration.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summary.FileStatistics.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summary.FileStatistics.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summary.FileStatistics.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summary.FileStatistics.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summary.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summary.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summary.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/class-use/Summary.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/package-frame.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/package-frame.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/package-frame.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/package-frame.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/package-summary.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/package-summary.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/package-summary.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/package-summary.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/package-tree.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/package-tree.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/package-tree.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/package-tree.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/package-use.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/package-use.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/package-use.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/package-use.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/DeletesSummarizer.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/DeletesSummarizer.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/DeletesSummarizer.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/DeletesSummarizer.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/EntryLengthSummarizer.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/EntryLengthSummarizer.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/EntryLengthSummarizer.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/EntryLengthSummarizer.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/FamilySummarizer.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/FamilySummarizer.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/FamilySummarizer.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/FamilySummarizer.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/VisibilitySummarizer.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/VisibilitySummarizer.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/VisibilitySummarizer.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/VisibilitySummarizer.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/class-use/DeletesSummarizer.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/class-use/DeletesSummarizer.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/class-use/DeletesSummarizer.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/class-use/DeletesSummarizer.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/class-use/EntryLengthSummarizer.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/class-use/EntryLengthSummarizer.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/class-use/EntryLengthSummarizer.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/class-use/EntryLengthSummarizer.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/class-use/FamilySummarizer.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/class-use/FamilySummarizer.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/class-use/FamilySummarizer.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/class-use/FamilySummarizer.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/class-use/VisibilitySummarizer.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/class-use/VisibilitySummarizer.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/class-use/VisibilitySummarizer.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/class-use/VisibilitySummarizer.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/package-frame.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/package-frame.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/package-frame.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/package-frame.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/package-summary.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/package-summary.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/package-summary.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/package-summary.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/package-tree.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/package-tree.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/package-tree.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/package-tree.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/package-use.html b/docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/package-use.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/package-use.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/client/summary/summarizers/package-use.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/ArrayByteSequence.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/ArrayByteSequence.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/ArrayByteSequence.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/ArrayByteSequence.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/ByteSequence.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/ByteSequence.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/ByteSequence.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/ByteSequence.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/Column.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/Column.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/Column.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/Column.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/ColumnUpdate.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/ColumnUpdate.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/ColumnUpdate.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/ColumnUpdate.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/Condition.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/Condition.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/Condition.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/Condition.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/ConditionalMutation.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/ConditionalMutation.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/ConditionalMutation.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/ConditionalMutation.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/ConstraintViolationSummary.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/ConstraintViolationSummary.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/ConstraintViolationSummary.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/ConstraintViolationSummary.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/Key.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/Key.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/Key.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/Key.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.Build.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.Build.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.Build.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.Build.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.ColumnFamilyStep.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.ColumnFamilyStep.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.ColumnFamilyStep.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.ColumnFamilyStep.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.ColumnQualifierStep.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.ColumnQualifierStep.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.ColumnQualifierStep.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.ColumnQualifierStep.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.ColumnVisibilityStep.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.ColumnVisibilityStep.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.ColumnVisibilityStep.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.ColumnVisibilityStep.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.RowStep.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.RowStep.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.RowStep.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.RowStep.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/KeyBuilder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/KeyValue.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/KeyValue.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/KeyValue.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/KeyValue.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/LoadPlan.Builder.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/LoadPlan.Builder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/LoadPlan.Builder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/LoadPlan.Builder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/LoadPlan.Destination.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/LoadPlan.Destination.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/LoadPlan.Destination.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/LoadPlan.Destination.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/LoadPlan.RangeType.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/LoadPlan.RangeType.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/LoadPlan.RangeType.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/LoadPlan.RangeType.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/LoadPlan.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/LoadPlan.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/LoadPlan.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/LoadPlan.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/Mutation.FamilyOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/Mutation.FamilyOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/Mutation.FamilyOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/Mutation.FamilyOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/Mutation.MutationOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/Mutation.MutationOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/Mutation.MutationOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/Mutation.MutationOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/Mutation.QualifierOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/Mutation.QualifierOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/Mutation.QualifierOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/Mutation.QualifierOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/Mutation.SERIALIZED_FORMAT.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/Mutation.SERIALIZED_FORMAT.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/Mutation.SERIALIZED_FORMAT.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/Mutation.SERIALIZED_FORMAT.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/Mutation.TimestampOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/Mutation.TimestampOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/Mutation.TimestampOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/Mutation.TimestampOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/Mutation.VisibilityOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/Mutation.VisibilityOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/Mutation.VisibilityOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/Mutation.VisibilityOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/Mutation.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/Mutation.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/Mutation.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/Mutation.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/PartialKey.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/PartialKey.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/PartialKey.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/PartialKey.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/Range.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/Range.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/Range.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/Range.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/TabletId.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/TabletId.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/TabletId.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/TabletId.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/Value.Comparator.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/Value.Comparator.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/Value.Comparator.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/Value.Comparator.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/Value.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/Value.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/Value.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/Value.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/ArrayByteSequence.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/ArrayByteSequence.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/ArrayByteSequence.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/ArrayByteSequence.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/ByteSequence.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/ByteSequence.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/ByteSequence.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/ByteSequence.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/Column.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Column.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/Column.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Column.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/ColumnUpdate.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/ColumnUpdate.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/ColumnUpdate.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/ColumnUpdate.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/Condition.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Condition.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/Condition.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Condition.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/ConditionalMutation.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/ConditionalMutation.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/ConditionalMutation.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/ConditionalMutation.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/ConstraintViolationSummary.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/ConstraintViolationSummary.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/ConstraintViolationSummary.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/ConstraintViolationSummary.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/Key.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Key.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/Key.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Key.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.Build.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.Build.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.Build.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.Build.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.ColumnFamilyStep.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.ColumnFamilyStep.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.ColumnFamilyStep.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.ColumnFamilyStep.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.ColumnQualifierStep.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.ColumnQualifierStep.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.ColumnQualifierStep.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.ColumnQualifierStep.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.ColumnVisibilityStep.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.ColumnVisibilityStep.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.ColumnVisibilityStep.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.ColumnVisibilityStep.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.RowStep.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.RowStep.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.RowStep.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.RowStep.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyBuilder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyValue.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyValue.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyValue.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/KeyValue.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/LoadPlan.Builder.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/LoadPlan.Builder.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/LoadPlan.Builder.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/LoadPlan.Builder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/LoadPlan.Destination.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/LoadPlan.Destination.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/LoadPlan.Destination.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/LoadPlan.Destination.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/LoadPlan.RangeType.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/LoadPlan.RangeType.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/LoadPlan.RangeType.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/LoadPlan.RangeType.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/LoadPlan.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/LoadPlan.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/LoadPlan.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/LoadPlan.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.FamilyOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.FamilyOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.FamilyOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.FamilyOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.MutationOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.MutationOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.MutationOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.MutationOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.QualifierOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.QualifierOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.QualifierOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.QualifierOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.SERIALIZED_FORMAT.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.SERIALIZED_FORMAT.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.SERIALIZED_FORMAT.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.SERIALIZED_FORMAT.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.TimestampOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.TimestampOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.TimestampOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.TimestampOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.VisibilityOptions.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.VisibilityOptions.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.VisibilityOptions.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.VisibilityOptions.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Mutation.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/PartialKey.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/PartialKey.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/PartialKey.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/PartialKey.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/Range.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Range.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/Range.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Range.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/TabletId.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/TabletId.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/TabletId.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/TabletId.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/Value.Comparator.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Value.Comparator.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/Value.Comparator.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Value.Comparator.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/class-use/Value.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Value.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/class-use/Value.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/class-use/Value.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/doc-files/mutation-serialization.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/doc-files/mutation-serialization.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/doc-files/mutation-serialization.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/doc-files/mutation-serialization.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/package-frame.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/package-frame.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/package-frame.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/package-frame.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/package-summary.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/package-summary.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/package-summary.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/package-summary.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/package-tree.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/package-tree.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/package-tree.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/package-tree.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/package-use.html b/docs/2.x/apidocs/org/apache/accumulo/core/data/package-use.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/data/package-use.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/data/package-use.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/AuthorizationContainer.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/AuthorizationContainer.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/AuthorizationContainer.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/AuthorizationContainer.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/Authorizations.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/Authorizations.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/Authorizations.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/Authorizations.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/ColumnVisibility.Node.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/ColumnVisibility.Node.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/ColumnVisibility.Node.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/ColumnVisibility.Node.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/ColumnVisibility.NodeComparator.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/ColumnVisibility.NodeComparator.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/ColumnVisibility.NodeComparator.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/ColumnVisibility.NodeComparator.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/ColumnVisibility.NodeType.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/ColumnVisibility.NodeType.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/ColumnVisibility.NodeType.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/ColumnVisibility.NodeType.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/ColumnVisibility.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/ColumnVisibility.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/ColumnVisibility.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/ColumnVisibility.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/NamespacePermission.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/NamespacePermission.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/NamespacePermission.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/NamespacePermission.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/SystemPermission.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/SystemPermission.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/SystemPermission.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/SystemPermission.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/TablePermission.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/TablePermission.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/TablePermission.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/TablePermission.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/VisibilityEvaluator.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/VisibilityEvaluator.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/VisibilityEvaluator.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/VisibilityEvaluator.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/VisibilityParseException.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/VisibilityParseException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/VisibilityParseException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/VisibilityParseException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/class-use/AuthorizationContainer.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/class-use/AuthorizationContainer.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/class-use/AuthorizationContainer.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/class-use/AuthorizationContainer.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/class-use/Authorizations.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/class-use/Authorizations.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/class-use/Authorizations.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/class-use/Authorizations.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/class-use/ColumnVisibility.Node.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/class-use/ColumnVisibility.Node.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/class-use/ColumnVisibility.Node.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/class-use/ColumnVisibility.Node.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/class-use/ColumnVisibility.NodeComparator.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/class-use/ColumnVisibility.NodeComparator.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/class-use/ColumnVisibility.NodeComparator.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/class-use/ColumnVisibility.NodeComparator.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/class-use/ColumnVisibility.NodeType.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/class-use/ColumnVisibility.NodeType.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/class-use/ColumnVisibility.NodeType.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/class-use/ColumnVisibility.NodeType.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/class-use/ColumnVisibility.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/class-use/ColumnVisibility.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/class-use/ColumnVisibility.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/class-use/ColumnVisibility.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/class-use/NamespacePermission.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/class-use/NamespacePermission.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/class-use/NamespacePermission.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/class-use/NamespacePermission.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/class-use/SystemPermission.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/class-use/SystemPermission.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/class-use/SystemPermission.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/class-use/SystemPermission.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/class-use/TablePermission.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/class-use/TablePermission.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/class-use/TablePermission.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/class-use/TablePermission.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/class-use/VisibilityEvaluator.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/class-use/VisibilityEvaluator.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/class-use/VisibilityEvaluator.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/class-use/VisibilityEvaluator.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/class-use/VisibilityParseException.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/class-use/VisibilityParseException.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/class-use/VisibilityParseException.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/class-use/VisibilityParseException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/package-frame.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/package-frame.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/package-frame.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/package-frame.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/package-summary.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/package-summary.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/package-summary.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/package-summary.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/package-tree.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/package-tree.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/package-tree.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/package-tree.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/package-use.html b/docs/2.x/apidocs/org/apache/accumulo/core/security/package-use.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/core/security/package-use.html
rename to docs/2.x/apidocs/org/apache/accumulo/core/security/package-use.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/MemoryUnit.html b/docs/2.x/apidocs/org/apache/accumulo/minicluster/MemoryUnit.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/minicluster/MemoryUnit.html
rename to docs/2.x/apidocs/org/apache/accumulo/minicluster/MemoryUnit.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloCluster.html b/docs/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloCluster.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloCluster.html
rename to docs/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloCluster.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloConfig.html b/docs/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloConfig.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloConfig.html
rename to docs/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloConfig.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloInstance.html b/docs/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloInstance.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloInstance.html
rename to docs/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloInstance.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloRunner.Opts.html b/docs/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloRunner.Opts.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloRunner.Opts.html
rename to docs/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloRunner.Opts.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloRunner.PropertiesConverter.html b/docs/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloRunner.PropertiesConverter.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloRunner.PropertiesConverter.html
rename to docs/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloRunner.PropertiesConverter.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloRunner.html b/docs/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloRunner.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloRunner.html
rename to docs/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloRunner.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/ServerType.html b/docs/2.x/apidocs/org/apache/accumulo/minicluster/ServerType.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/minicluster/ServerType.html
rename to docs/2.x/apidocs/org/apache/accumulo/minicluster/ServerType.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/class-use/MemoryUnit.html b/docs/2.x/apidocs/org/apache/accumulo/minicluster/class-use/MemoryUnit.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/minicluster/class-use/MemoryUnit.html
rename to docs/2.x/apidocs/org/apache/accumulo/minicluster/class-use/MemoryUnit.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloCluster.html b/docs/2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloCluster.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloCluster.html
rename to docs/2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloCluster.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloConfig.html b/docs/2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloConfig.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloConfig.html
rename to docs/2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloConfig.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloInstance.html b/docs/2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloInstance.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloInstance.html
rename to docs/2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloInstance.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloRunner.Opts.html b/docs/2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloRunner.Opts.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloRunner.Opts.html
rename to docs/2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloRunner.Opts.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloRunner.PropertiesConverter.html b/docs/2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloRunner.PropertiesConverter.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloRunner.PropertiesConverter.html
rename to docs/2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloRunner.PropertiesConverter.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloRunner.html b/docs/2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloRunner.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloRunner.html
rename to docs/2.x/apidocs/org/apache/accumulo/minicluster/class-use/MiniAccumuloRunner.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/class-use/ServerType.html b/docs/2.x/apidocs/org/apache/accumulo/minicluster/class-use/ServerType.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/minicluster/class-use/ServerType.html
rename to docs/2.x/apidocs/org/apache/accumulo/minicluster/class-use/ServerType.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/package-frame.html b/docs/2.x/apidocs/org/apache/accumulo/minicluster/package-frame.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/minicluster/package-frame.html
rename to docs/2.x/apidocs/org/apache/accumulo/minicluster/package-frame.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/package-summary.html b/docs/2.x/apidocs/org/apache/accumulo/minicluster/package-summary.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/minicluster/package-summary.html
rename to docs/2.x/apidocs/org/apache/accumulo/minicluster/package-summary.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/package-tree.html b/docs/2.x/apidocs/org/apache/accumulo/minicluster/package-tree.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/minicluster/package-tree.html
rename to docs/2.x/apidocs/org/apache/accumulo/minicluster/package-tree.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/package-use.html b/docs/2.x/apidocs/org/apache/accumulo/minicluster/package-use.html
similarity index 100%
rename from 2.x/apidocs/org/apache/accumulo/minicluster/package-use.html
rename to docs/2.x/apidocs/org/apache/accumulo/minicluster/package-use.html
diff --git a/2.x/apidocs/overview-frame.html b/docs/2.x/apidocs/overview-frame.html
similarity index 100%
rename from 2.x/apidocs/overview-frame.html
rename to docs/2.x/apidocs/overview-frame.html
diff --git a/2.x/apidocs/overview-summary.html b/docs/2.x/apidocs/overview-summary.html
similarity index 100%
rename from 2.x/apidocs/overview-summary.html
rename to docs/2.x/apidocs/overview-summary.html
diff --git a/2.x/apidocs/overview-tree.html b/docs/2.x/apidocs/overview-tree.html
similarity index 100%
rename from 2.x/apidocs/overview-tree.html
rename to docs/2.x/apidocs/overview-tree.html
diff --git a/2.x/apidocs/package-list b/docs/2.x/apidocs/package-list
similarity index 100%
rename from 2.x/apidocs/package-list
rename to docs/2.x/apidocs/package-list
diff --git a/2.x/apidocs/script.js b/docs/2.x/apidocs/script.js
similarity index 100%
rename from 2.x/apidocs/script.js
rename to docs/2.x/apidocs/script.js
diff --git a/2.x/apidocs/serialized-form.html b/docs/2.x/apidocs/serialized-form.html
similarity index 100%
rename from 2.x/apidocs/serialized-form.html
rename to docs/2.x/apidocs/serialized-form.html
diff --git a/2.x/apidocs/stylesheet.css b/docs/2.x/apidocs/stylesheet.css
similarity index 100%
rename from 2.x/apidocs/stylesheet.css
rename to docs/2.x/apidocs/stylesheet.css
diff --git a/docs/2.0/development/client-properties.html b/docs/2.x/development/client-properties.html
similarity index 90%
rename from docs/2.0/development/client-properties.html
rename to docs/2.x/development/client-properties.html
index 2767ff3..e46eadc 100644
--- a/docs/2.0/development/client-properties.html
+++ b/docs/2.x/development/client-properties.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,20 +332,20 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Development &nbsp;&gt;&gt;&nbsp; Client Properties</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Development &nbsp;&gt;&gt;&nbsp; Client Properties</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Client Properties</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/development/client-properties.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/development/client-properties.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <!-- WARNING: Do not edit this file. It is a generated file that is copied from Accumulo build (from core/target/generated-docs) -->
 <!-- Generated by : org.apache.accumulo.core.conf.ClientConfigGenerate$Markdown -->
 
-<p>Below are properties set in <code class="highlighter-rouge">accumulo-client.properties</code> that configure <a href="/docs/2.0/getting-started/clients#connecting">Accumulo clients</a>. All properties have been part of the API since 2.0.0 (unless otherwise specified):</p>
+<p>Below are properties set in <code class="highlighter-rouge">accumulo-client.properties</code> that configure <a href="/docs/2.x/getting-started/clients#connecting">Accumulo clients</a>. All properties have been part of the API since 2.0.0 (unless otherwise specified):</p>
 
 <table>
   <thead>
@@ -519,7 +519,7 @@
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/development/client-properties.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/development/client-properties.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/development/development_tools.html b/docs/2.x/development/development_tools.html
similarity index 88%
rename from docs/2.0/development/development_tools.html
rename to docs/2.x/development/development_tools.html
index 2cd5e43..cf4eb86 100644
--- a/docs/2.0/development/development_tools.html
+++ b/docs/2.x/development/development_tools.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,27 +332,27 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Development &nbsp;&gt;&gt;&nbsp; Development Tools</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Development &nbsp;&gt;&gt;&nbsp; Development Tools</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Development Tools</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/development/development_tools.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/development/development_tools.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <p>Accumulo has several tools that can help developers test their code.</p>
 
 <h2 id="miniaccumulocluster">MiniAccumuloCluster</h2>
 
-<p><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-minicluster/1.9.2/org/apache/accumulo/minicluster/MiniAccumuloCluster.html">MiniAccumuloCluster</a> is a standalone instance of Apache Accumulo for testing. It will
+<p><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-minicluster/2.0.0-alpha-1/org/apache/accumulo/minicluster/MiniAccumuloCluster.html">MiniAccumuloCluster</a> is a standalone instance of Apache Accumulo for testing. It will
 create Zookeeper and Accumulo processes that write all of their data to a single local
-directory. <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-minicluster/1.9.2/org/apache/accumulo/minicluster/MiniAccumuloCluster.html">MiniAccumuloCluster</a> makes it easy to code against a real Accumulo instance.
+directory. <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-minicluster/2.0.0-alpha-1/org/apache/accumulo/minicluster/MiniAccumuloCluster.html">MiniAccumuloCluster</a> makes it easy to code against a real Accumulo instance.
 Developers can write realistic-to-end integration tests that mimic the use of a normal
 Accumulo instance.</p>
 
-<p><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-minicluster/1.9.2/org/apache/accumulo/minicluster/MiniAccumuloCluster.html">MiniAccumuloCluster</a> is published in a separate jar that should be added to your pom.xml
+<p><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-minicluster/2.0.0-alpha-1/org/apache/accumulo/minicluster/MiniAccumuloCluster.html">MiniAccumuloCluster</a> is published in a separate jar that should be added to your pom.xml
 as a test dependency:</p>
 
 <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;dependency&gt;</span>
@@ -403,15 +403,15 @@ a test dependency:</p>
 <span class="nt">&lt;/dependency&gt;</span>
 </code></pre></div></div>
 
-<p>To use the Iterator test harness, create a class that extends the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-iterator-test-harness/1.9.2/org/apache/accumulo/iteratortest/junit4/BaseJUnit4IteratorTest.html">BaseJUnit4IteratorTest</a> class
+<p>To use the Iterator test harness, create a class that extends the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-iterator-test-harness/2.0.0-alpha-1/org/apache/accumulo/iteratortest/junit4/BaseJUnit4IteratorTest.html">BaseJUnit4IteratorTest</a> class
 and defines the following:</p>
 
 <ul>
   <li>A <code class="highlighter-rouge">SortedMap</code> of input data (<code class="highlighter-rouge">Key</code>-<code class="highlighter-rouge">Value</code> pairs)</li>
-  <li>A <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/data/Range.html">Range</a> to use in tests</li>
+  <li>A <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/data/Range.html">Range</a> to use in tests</li>
   <li>A <code class="highlighter-rouge">Map</code> of options (<code class="highlighter-rouge">String</code> to <code class="highlighter-rouge">String</code> pairs)</li>
   <li>A <code class="highlighter-rouge">SortedMap</code> of output data (<code class="highlighter-rouge">Key</code>-<code class="highlighter-rouge">Value</code> pairs)</li>
-  <li>A list of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-iterator-test-harness/1.9.2/org/apache/accumulo/iteratortest/testcases/IteratorTestCase.html">IteratorTestCase</a>s (these can be automatically discovered)</li>
+  <li>A list of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-iterator-test-harness/2.0.0-alpha-1/org/apache/accumulo/iteratortest/testcases/IteratorTestCase.html">IteratorTestCase</a>s (these can be automatically discovered)</li>
 </ul>
 
 <p>The majority of effort a user must make is in creating the input dataset and the expected
@@ -478,7 +478,7 @@ output dataset for the iterator being tested.</p>
 
 <h3 id="limitations">Limitations</h3>
 
-<p>While the provided <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-iterator-test-harness/1.9.2/org/apache/accumulo/iteratortest/testcases/IteratorTestCase.html">IteratorTestCase</a>s should exercise common edge-cases in user iterators,
+<p>While the provided <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-iterator-test-harness/2.0.0-alpha-1/org/apache/accumulo/iteratortest/testcases/IteratorTestCase.html">IteratorTestCase</a>s should exercise common edge-cases in user iterators,
 there are still many limitations to the existing test harness. Some of them are:</p>
 
 <ul>
@@ -493,7 +493,7 @@ there are still many limitations to the existing test harness. Some of them are:
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/development/development_tools.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/development/development_tools.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/development/high_speed_ingest.html b/docs/2.x/development/high_speed_ingest.html
similarity index 88%
rename from docs/2.0/development/high_speed_ingest.html
rename to docs/2.x/development/high_speed_ingest.html
index a46db10..ab8d884 100644
--- a/docs/2.0/development/high_speed_ingest.html
+++ b/docs/2.x/development/high_speed_ingest.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,14 +332,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Development &nbsp;&gt;&gt;&nbsp; High-Speed Ingest</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Development &nbsp;&gt;&gt;&nbsp; High-Speed Ingest</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>High-Speed Ingest</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/development/high_speed_ingest.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/development/high_speed_ingest.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <p>Accumulo is often used as part of a larger data processing and storage system. To
@@ -411,7 +411,7 @@ zy
 zz
 </code></pre></div></div>
 
-<p>Run the MapReduce job, using the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.2/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html">AccumuloFileOutputFormat</a> to create the files to
+<p>Run the MapReduce job, using the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/2.0.0-alpha-1/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html">AccumuloFileOutputFormat</a> to create the files to
 be introduced to Accumulo. Once this is complete, the files can be added to
 Accumulo via the shell:</p>
 
@@ -448,15 +448,15 @@ import file.</p>
 
 <p>It is possible to efficiently write many mutations to Accumulo in parallel via a
 MapReduce job.  Typically, a MapReduce job will process data that lives in HDFS
-and write mutations to Accumulo using <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.2/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html">AccumuloOutputFormat</a>. For more information
-on how use to use MapReduce with Accumulo, see the <a href="/docs/2.0/development/mapreduce">MapReduce documentation</a>
+and write mutations to Accumulo using <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/2.0.0-alpha-1/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html">AccumuloOutputFormat</a>. For more information
+on how use to use MapReduce with Accumulo, see the <a href="/docs/2.x/development/mapreduce">MapReduce documentation</a>
 and the <a href="https://github.com/apache/accumulo-examples/blob/master/docs/mapred.md">MapReduce example code</a>.</p>
 
 
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/development/high_speed_ingest.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/development/high_speed_ingest.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/development/iterators.html b/docs/2.x/development/iterators.html
similarity index 85%
rename from docs/2.0/development/iterators.html
rename to docs/2.x/development/iterators.html
index 8c44740..e0211ce 100644
--- a/docs/2.0/development/iterators.html
+++ b/docs/2.x/development/iterators.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,17 +332,17 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Development &nbsp;&gt;&gt;&nbsp; Iterators</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Development &nbsp;&gt;&gt;&nbsp; Iterators</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Iterators</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/development/iterators.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/development/iterators.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
-    <p>Accumulo <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/SortedKeyValueIterator.html">SortedKeyValueIterators</a>, commonly referred to as <strong>Iterators</strong> for short, are server-side programming constructs
+    <p>Accumulo <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/SortedKeyValueIterator.html">SortedKeyValueIterators</a>, commonly referred to as <strong>Iterators</strong> for short, are server-side programming constructs
 that allow users to implement custom retrieval or computational purpose within Accumulo TabletServers.  The name rightly
 brings forward similarities to the Java Iterator interface; however, Accumulo Iterators are more complex than Java
 Iterators. Notably, in addition to the expected methods to retrieve the current element and advance to the next element
@@ -354,7 +354,7 @@ merge multiple Iterators into a single view. In this sense, a collection of Iter
 a tree-structure than a list, but there is always a sense of a flow of Key-Value pairs through some Iterators. Iterators
 are not designed to act as triggers nor are they designed to operate outside of the purview of a single table.</p>
 
-<p>Understanding how TabletServers invoke the methods on a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/SortedKeyValueIterator.html">SortedKeyValueIterator</a> can be obtuse as the actual code is
+<p>Understanding how TabletServers invoke the methods on a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/SortedKeyValueIterator.html">SortedKeyValueIterator</a> can be obtuse as the actual code is
 buried within the implementation of the TabletServer; however, it is generally unnecessary to have a strong
 understanding of this as the interface provides clear definitions about what each action each method should take. This
 chapter aims to provide a more detailed description of how Iterators are invoked, some best practices and some common
@@ -375,7 +375,7 @@ Iterators must have a public no-args constructor.</p>
 
 <h2 id="interface">Interface</h2>
 
-<p>A normal implementation of the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/SortedKeyValueIterator.html">SortedKeyValueIterator</a> defines functionality for the following methods:</p>
+<p>A normal implementation of the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/SortedKeyValueIterator.html">SortedKeyValueIterator</a> defines functionality for the following methods:</p>
 
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kt">void</span> <span class="nf">init</span><span class="o">(</span><span class="n">SortedKeyValueIterator</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span><span class="n">Value</span><span class="o">&gt;</span> <span class="n">source</span><span class="o">,</span> <span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span> [...]
 
@@ -405,7 +405,7 @@ These options allow for Iterators to dynamically configure themselves on the fly
 (a Scan or Compaction), the Map will be empty. An example of a configuration item for an Iterator could be a pattern used to filter
 Key-Value pairs in a regular expression Iterator.</p>
 
-<p>The third argument, the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/IteratorEnvironment.html">IteratorEnvironment</a>, is a special object which provides information to this Iterator about the
+<p>The third argument, the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/IteratorEnvironment.html">IteratorEnvironment</a>, is a special object which provides information to this Iterator about the
 context in which it was invoked. Commonly, this information is not necessary to inspect. For example, if an Iterator
 knows that it is running in the context of a full-major compaction (reading all of the data) as opposed to a user scan
 (which may strongly limit the number of columns), the Iterator might make different algorithmic decisions in an attempt to
@@ -416,7 +416,7 @@ optimize itself.</p>
 <p>The <code class="highlighter-rouge">seek</code> method is likely the most confusing method on the Iterator interface. The purpose of this method is to
 advance the stream of Key-Value pairs to a certain point in the iteration (the Accumulo table). It is common that before
 the implementation of this method returns some additional processing is performed which may further advance the current
-position past the <code class="highlighter-rouge">startKey</code> of the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/data/Range.html">Range</a>. This, however, is dependent on the functionality the iterator provides. For
+position past the <code class="highlighter-rouge">startKey</code> of the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/data/Range.html">Range</a>. This, however, is dependent on the functionality the iterator provides. For
 example, a filtering iterator would consume a number Key-Value pairs which do not meets its criteria before <code class="highlighter-rouge">seek</code>
 returns. The important condition for <code class="highlighter-rouge">seek</code> to meet is that this Iterator should be ready to return the first Key-Value
 pair, or none if no such pair is available, when the method returns. The Key-Value pair would be returned by <code class="highlighter-rouge">getTopKey</code>
@@ -425,9 +425,9 @@ a Key-Value pair to return.</p>
 
 <p>The arguments passed to seek are as follows:</p>
 
-<p>The TabletServer first provides a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/data/Range.html">Range</a>, an object which defines some collection of Accumulo <code class="highlighter-rouge">Key</code>s, which defines the
-Key-Value pairs that this Iterator should return. Each <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/data/Range.html">Range</a> has a <code class="highlighter-rouge">startKey</code> and <code class="highlighter-rouge">endKey</code> with an inclusive flag for
-both. While this Range is often similar to the Range(s) set by the client on a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/Scanner.html">Scanner</a> or <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/BatchScanner.html">BatchScanner</a>, it is not
+<p>The TabletServer first provides a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/data/Range.html">Range</a>, an object which defines some collection of Accumulo <code class="highlighter-rouge">Key</code>s, which defines the
+Key-Value pairs that this Iterator should return. Each <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/data/Range.html">Range</a> has a <code class="highlighter-rouge">startKey</code> and <code class="highlighter-rouge">endKey</code> with an inclusive flag for
+both. While this Range is often similar to the Range(s) set by the client on a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/Scanner.html">Scanner</a> or <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/BatchScanner.html">BatchScanner</a>, it is not
 guaranteed to be a Range that the client set. Accumulo will split up larger ranges and group them together based on
 Tablet boundaries per TabletServer. Iterators should not attempt to implement any custom logic based on the Range(s)
 provided to <code class="highlighter-rouge">seek</code> and Iterators should not return any Keys that fall outside of the provided Range.</p>
@@ -438,14 +438,14 @@ should be treated as an inclusion collection (true) or an exclusion collection (
 
 <p>It is likely that all implementations of <code class="highlighter-rouge">seek</code> will first make a call to the <code class="highlighter-rouge">seek</code> method on the
 “source” Iterator that was provided in the <code class="highlighter-rouge">init</code> method. The collection of column families and
-the boolean <code class="highlighter-rouge">include</code> argument should be passed down as well as the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/data/Range.html">Range</a>. Somewhat commonly, the Iterator will
+the boolean <code class="highlighter-rouge">include</code> argument should be passed down as well as the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/data/Range.html">Range</a>. Somewhat commonly, the Iterator will
 also implement some sort of additional logic to find or compute the first Key-Value pair in the provided
 Range. For example, a regular expression Iterator would consume all records which do not match the given
 pattern before returning from <code class="highlighter-rouge">seek</code>.</p>
 
-<p>It is important to retain the original <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/data/Range.html">Range</a> passed to this method to know when this Iterator should stop
-reading more Key-Value pairs. Ignoring this typically does not affect scans from a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/Scanner.html">Scanner</a>, but it
-will result in duplicate keys emitting from a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/BatchScanner.html">BatchScanner</a> if the scanned table has more than one tablet.
+<p>It is important to retain the original <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/data/Range.html">Range</a> passed to this method to know when this Iterator should stop
+reading more Key-Value pairs. Ignoring this typically does not affect scans from a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/Scanner.html">Scanner</a>, but it
+will result in duplicate keys emitting from a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/BatchScanner.html">BatchScanner</a> if the scanned table has more than one tablet.
 Best practice is to never emit entries outside the seek range.</p>
 
 <h3 id="next">next</h3>
@@ -495,12 +495,12 @@ returned from <code class="highlighter-rouge">getTopKey</code>/<code class="high
 Implementations of this method should return a new object of the same type as the Accumulo Iterator
 instance it was called on. Any internal state from the instance <code class="highlighter-rouge">deepCopy</code> was called
 on should be carried over to the returned copy. The returned copy should be ready to have
-<code class="highlighter-rouge">seek</code> called on it. The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/SortedKeyValueIterator.html">SortedKeyValueIterator</a> interface guarantees that <code class="highlighter-rouge">init</code> will be called on
+<code class="highlighter-rouge">seek</code> called on it. The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/SortedKeyValueIterator.html">SortedKeyValueIterator</a> interface guarantees that <code class="highlighter-rouge">init</code> will be called on
 an iterator before <code class="highlighter-rouge">deepCopy</code> and that <code class="highlighter-rouge">init</code> will not be called on the iterator returned by
 <code class="highlighter-rouge">deepCopy</code>.</p>
 
 <p>Typically, implementations of <code class="highlighter-rouge">deepCopy</code> call a copy-constructor which will initialize
-internal data structures. As with <code class="highlighter-rouge">seek</code>, it is common for the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/IteratorEnvironment.html">IteratorEnvironment</a>
+internal data structures. As with <code class="highlighter-rouge">seek</code>, it is common for the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/IteratorEnvironment.html">IteratorEnvironment</a>
 argument to be ignored as most Iterator implementations can be written without the explicit
 information the environment provides.</p>
 
@@ -581,18 +581,18 @@ next possible row.</p>
 <h2 id="abstract-iterators">Abstract Iterators</h2>
 
 <p>A number of Abstract implementations of Iterators are provided to allow for faster creation
-of common patterns. The most commonly used abstract implementations are the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/Filter.html">Filter</a> and
-<a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/Combiner.html">Combiner</a> classes. When possible these classes should be used instead as they have been
+of common patterns. The most commonly used abstract implementations are the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/Filter.html">Filter</a> and
+<a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/Combiner.html">Combiner</a> classes. When possible these classes should be used instead as they have been
 thoroughly tested inside Accumulo itself.</p>
 
 <h3 id="filter">Filter</h3>
 
-<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/Filter.html">Filter</a> abstract Iterator provides a very simple implementation which allows implementations
+<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/Filter.html">Filter</a> abstract Iterator provides a very simple implementation which allows implementations
 to define whether or not a Key-Value pair should be returned via an <code class="highlighter-rouge">accept(Key, Value)</code> method.</p>
 
 <p>Filters are extremely simple to implement; however, when the implementation is filtering a
 large percentage of Key-Value pairs with respect to the total number of pairs examined,
-it can be very inefficient. For example, if a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/Filter.html">Filter</a> implementation can determine after examining
+it can be very inefficient. For example, if a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/Filter.html">Filter</a> implementation can determine after examining
 part of the row that no other pairs in this row will be accepted, there is no mechanism to
 efficiently skip the remaining Key-Value pairs. Concretely, take a row which is comprised of
 1000 Key-Value pairs. After examining the first 10 Key-Value pairs, it is determined
@@ -601,30 +601,30 @@ remaining 990 Key-Value pairs in this row. Another way to express this deficienc
 Filters have no means to leverage the <code class="highlighter-rouge">seek</code> method to efficiently skip large portions
 of Key-Value pairs.</p>
 
-<p>As such, the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/Filter.html">Filter</a> class functions well for filtering small amounts of data, but is
+<p>As such, the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/Filter.html">Filter</a> class functions well for filtering small amounts of data, but is
 inefficient for filtering large amounts of data. The decision to use a Filter strongly
 depends on the use case and distribution of data being filtered.</p>
 
 <h3 id="combiner">Combiner</h3>
 
-<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/Combiner.html">Combiner</a> class is another common abstract Iterator. Similar to the <code class="highlighter-rouge">Combiner</code> interface
+<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/Combiner.html">Combiner</a> class is another common abstract Iterator. Similar to the <code class="highlighter-rouge">Combiner</code> interface
 define in Hadoop’s MapReduce framework, implementations of this abstract class reduce
 multiple Values for different versions of a Key (Keys which only differ by timestamps) into one Key-Value pair.
 Combiners provide a simple way to implement common operations like summation and
 aggregation without the need to implement the entire Accumulo Iterator interface.</p>
 
-<p>One important consideration when choosing to design a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/Combiner.html">Combiner</a> is that the “reduction” operation
+<p>One important consideration when choosing to design a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/Combiner.html">Combiner</a> is that the “reduction” operation
 is often best represented when it is associative and commutative. Operations which do not meet
 these criteria can be implemented; however, the implementation can be difficult.</p>
 
-<p>A second consideration is that a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/Combiner.html">Combiner</a> is not guaranteed to see every Key-Value pair
+<p>A second consideration is that a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/Combiner.html">Combiner</a> is not guaranteed to see every Key-Value pair
 which differ only by timestamp every time it is invoked. For example, if there are 5 Key-Value
 pairs in a table which only differ by the timestamps 1, 2, 3, 4, and 5, it is not guaranteed that
 every invocation of the Combiner will see 5 timestamps. One invocation might see the Values for
 Keys with timestamp 1 and 4, while another invocation might see the Values for Keys with the
 timestamps 1, 2, 4 and 5.</p>
 
-<p>Finally, when configuring an Accumulo table to use a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/Combiner.html">Combiner</a>, be sure to disable the Versioning Iterator or set the
+<p>Finally, when configuring an Accumulo table to use a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/Combiner.html">Combiner</a>, be sure to disable the Versioning Iterator or set the
 Combiner at a priority less than the Combiner (the Versioning Iterator is added at a priority of 20 by default). The
 Versioning Iterator will filter out multiple Key-Value pairs that differ only by timestamp and return only the Key-Value
 pair that has the largest timestamp.</p>
@@ -632,7 +632,7 @@ pair that has the largest timestamp.</p>
 <h4 id="combiner-applications">Combiner Applications</h4>
 
 <p>Many applications can benefit from the ability to aggregate values across common
-keys. This can be done via <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/Combiner.html">Combiner</a> iterators and is similar to the Reduce step in
+keys. This can be done via <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/Combiner.html">Combiner</a> iterators and is similar to the Reduce step in
 MapReduce. This provides the ability to define online, incrementally updated
 analytics without the overhead or latency associated with batch-oriented
 MapReduce jobs.</p>
@@ -657,15 +657,15 @@ combining iterator.</p>
 
 <h2 id="best-practices">Best practices</h2>
 
-<p>Because of the flexibility that the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/SortedKeyValueIterator.html">SortedKeyValueIterator</a> interface provides, it doesn’t directly disallow
+<p>Because of the flexibility that the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/SortedKeyValueIterator.html">SortedKeyValueIterator</a> interface provides, it doesn’t directly disallow
 many implementations which are poor design decisions. The following are some common recommendations to
 follow and pitfalls to avoid in Iterator implementations.</p>
 
 <h4 id="avoid-special-logic-encoded-in-ranges">Avoid special logic encoded in Ranges</h4>
 
-<p>Commonly, granular Ranges that a client passes to an Iterator from a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/Scanner.html">Scanner</a> or <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/BatchScanner.html">BatchScanner</a> are unmodified.
-If a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/data/Range.html">Range</a> falls within the boundaries of a Tablet, an Iterator will often see that same Range in the
-<code class="highlighter-rouge">seek</code> method. However, there is no guarantee that the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/data/Range.html">Range</a> will remain unaltered from client to server. As such, Iterators
+<p>Commonly, granular Ranges that a client passes to an Iterator from a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/Scanner.html">Scanner</a> or <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/BatchScanner.html">BatchScanner</a> are unmodified.
+If a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/data/Range.html">Range</a> falls within the boundaries of a Tablet, an Iterator will often see that same Range in the
+<code class="highlighter-rouge">seek</code> method. However, there is no guarantee that the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/data/Range.html">Range</a> will remain unaltered from client to server. As such, Iterators
 should <em>never</em> make assumptions about the current state/context based on the Range.</p>
 
 <p>The common failure condition is referred to as a “re-seek”. In the context of a Scan, TabletServers construct the
@@ -683,31 +683,31 @@ non-inclusive.</p>
 By <code class="highlighter-rouge">seek</code>‘ing when it is known that there is a collection of Key-Value pairs which can be ignored can
 greatly increase the speed of a scan as many Key-Value pairs do not have to be deserialized and processed.</p>
 
-<p>While the <code class="highlighter-rouge">seek</code> method provides the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/data/Range.html">Range</a> that should be used to <code class="highlighter-rouge">seek</code> the underlying source Iterator,
+<p>While the <code class="highlighter-rouge">seek</code> method provides the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/data/Range.html">Range</a> that should be used to <code class="highlighter-rouge">seek</code> the underlying source Iterator,
 there is no guarantee that the implementing Iterator uses that Range to perform the <code class="highlighter-rouge">seek</code> on its
 “source” Iterator. As such, it is possible to seek to any Range and the interface has no assertions
 to prevent this from happening.</p>
 
 <p>Since Iterators are allowed to <code class="highlighter-rouge">seek</code> to arbitrary Keys, it also allows Iterators to create infinite loops
-inside Scans that will repeatedly read the same data without end. If an arbitrary <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/data/Range.html">Range</a> is constructed, it should
+inside Scans that will repeatedly read the same data without end. If an arbitrary <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/data/Range.html">Range</a> is constructed, it should
 construct a completely new Range as it allows for bugs to be introduced which will break Accumulo.</p>
 
 <p>Thus, <code class="highlighter-rouge">seek</code>’s should always be thought of as making “forward progress” in the view of the total iteration. The
-<code class="highlighter-rouge">startKey</code> of a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/data/Range.html">Range</a> should always be greater than the current Key seen by the Iterator while the <code class="highlighter-rouge">endKey</code> of the
+<code class="highlighter-rouge">startKey</code> of a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/data/Range.html">Range</a> should always be greater than the current Key seen by the Iterator while the <code class="highlighter-rouge">endKey</code> of the
 Range should always retain the original <code class="highlighter-rouge">endKey</code> (and <code class="highlighter-rouge">endKey</code> inclusivity) of the last Range seen by your
 Iterator’s implementation of seek.</p>
 
 <h3 id="take-caution-in-constructing-new-data-in-an-iterator">Take caution in constructing new data in an Iterator</h3>
 
-<p>Implementations of Iterator might be tempted to open <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/BatchWriter.html">BatchWriters</a> inside of an Iterator as a means
+<p>Implementations of Iterator might be tempted to open <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/BatchWriter.html">BatchWriters</a> inside of an Iterator as a means
 to implement triggers for writing additional data outside of their client application. The lifecycle of an Iterator
 is <em>not</em> managed in such a way that guarantees that this is safe nor efficient. Specifically, there
 is no way to guarantee that the internal ThreadPool inside of the BatchWriter is closed (and the thread(s)
-are reaped) without calling the close() method. <code class="highlighter-rouge">close</code>‘ing and recreating a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/BatchWriter.html">BatchWriter</a> after every
+are reaped) without calling the close() method. <code class="highlighter-rouge">close</code>‘ing and recreating a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/BatchWriter.html">BatchWriter</a> after every
 Key-Value pair is also prohibitively performance limiting to be considered an option.</p>
 
 <p>The only safe way to generate additional data in an Iterator is to alter the current Key-Value pair.
-For example, the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/user/WholeRowIterator.html">WholeRowIterator</a> serializes the all of the Key-Values pairs that fall within each
+For example, the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/user/WholeRowIterator.html">WholeRowIterator</a> serializes the all of the Key-Values pairs that fall within each
 row. A safe way to generate more data in an Iterator would be to construct an Iterator that is
 “higher” (at a larger priority) than the WholeRowIterator, that is, the Iterator receives the Key-Value pairs which are
 a serialization of many Key-Value pairs. The custom Iterator could deserialize the pairs, compute
@@ -742,20 +742,20 @@ to make different assertions than those who only operate at scan time. Iterators
 Iterators will not necessarily see all of the Key-Value pairs in ever invocation. Because compactions often do not rewrite
 all files (only a subset of them), it is possible that the logic take this into consideration.</p>
 
-<p>For example, a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/Combiner.html">Combiner</a> that runs over data at during compactions, might not see all of the values for a given Key. The
+<p>For example, a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/Combiner.html">Combiner</a> that runs over data at during compactions, might not see all of the values for a given Key. The
 Combiner must recognize this and not perform any function that would be incorrect due
 to the missing values.</p>
 
 <h2 id="testing">Testing</h2>
 
-<p>The <a href="/docs/2.0/development/development_tools#iterator-test-harness">Iterator test harness</a> is generalized testing framework for Accumulo Iterators that can
+<p>The <a href="/docs/2.x/development/development_tools#iterator-test-harness">Iterator test harness</a> is generalized testing framework for Accumulo Iterators that can
 identify common pitfalls in user-created Iterators.</p>
 
 
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/development/iterators.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/development/iterators.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/development/mapreduce.html b/docs/2.x/development/mapreduce.html
similarity index 91%
rename from docs/2.0/development/mapreduce.html
rename to docs/2.x/development/mapreduce.html
index 7a89048..226c12b 100644
--- a/docs/2.0/development/mapreduce.html
+++ b/docs/2.x/development/mapreduce.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,19 +332,19 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Development &nbsp;&gt;&gt;&nbsp; MapReduce</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Development &nbsp;&gt;&gt;&nbsp; MapReduce</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>MapReduce</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/development/mapreduce.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/development/mapreduce.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <p>Accumulo tables can be used as the source and destination of MapReduce jobs. To
 use an Accumulo table with a MapReduce job, configure the job parameters to use
-the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.2/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html">AccumuloInputFormat</a> and <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.2/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html">AccumuloOutputFormat</a>. Accumulo specific parameters
+the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/2.0.0-alpha-1/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html">AccumuloInputFormat</a> and <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/2.0.0-alpha-1/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html">AccumuloOutputFormat</a>. Accumulo specific parameters
 can be set via these two format classes to do the following:</p>
 
 <ul>
@@ -356,7 +356,7 @@ can be set via these two format classes to do the following:</p>
 <h2 id="mapper-and-reducer-classes">Mapper and Reducer classes</h2>
 
 <p>To read from an Accumulo table create a Mapper with the following class
-parameterization and be sure to configure the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.2/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html">AccumuloInputFormat</a>.</p>
+parameterization and be sure to configure the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/2.0.0-alpha-1/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html">AccumuloInputFormat</a>.</p>
 
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">class</span> <span class="nc">MyMapper</span> <span class="kd">extends</span> <span class="n">Mapper</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span><span class="n">Value</span><span class="o">,</span><span class="n">WritableComparable</span><span class="o">,</span><span class="n">Writable</span><span class="o">&gt;</span> <span class="o">{</span>
     <span class="kd">public</span> <span class="kt">void</span> <span class="nf">map</span><span class="o">(</span><span class="n">Key</span> <span class="n">k</span><span class="o">,</span> <span class="n">Value</span> <span class="n">v</span><span class="o">,</span> <span class="n">Context</span> <span class="n">c</span><span class="o">)</span> <span class="o">{</span>
@@ -366,7 +366,7 @@ parameterization and be sure to configure the <a href="https://static.javadoc.io
 </code></pre></div></div>
 
 <p>To write to an Accumulo table, create a Reducer with the following class
-parameterization and be sure to configure the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.2/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html">AccumuloOutputFormat</a>. The key
+parameterization and be sure to configure the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/2.0.0-alpha-1/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html">AccumuloOutputFormat</a>. The key
 emitted from the Reducer identifies the table to which the mutation is sent. This
 allows a single Reducer to write to more than one table if desired. A default table
 can be configured using the AccumuloOutputFormat, in which case the output table
@@ -383,7 +383,7 @@ name does not have to be passed to the Context object within the Reducer.</p>
 
 <p>The Text object passed as the output should contain the name of the table to which
 this mutation should be applied. The Text can be null in which case the mutation
-will be applied to the default table name specified in the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.2/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html">AccumuloOutputFormat</a>
+will be applied to the default table name specified in the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/2.0.0-alpha-1/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.html">AccumuloOutputFormat</a>
 options.</p>
 
 <h2 id="accumuloinputformat-options">AccumuloInputFormat options</h2>
@@ -423,7 +423,7 @@ options.</p>
 
 <h2 id="accumulomultitableinputformat-options">AccumuloMultiTableInputFormat options</h2>
 
-<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.2/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.html">AccumuloMultiTableInputFormat</a> allows the scanning over multiple tables
+<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/2.0.0-alpha-1/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.html">AccumuloMultiTableInputFormat</a> allows the scanning over multiple tables
 in a single MapReduce job. Separate ranges, columns, and iterators can be
 used for each table.</p>
 
@@ -499,7 +499,7 @@ used for each table.</p>
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/development/mapreduce.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/development/mapreduce.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/development/proxy.html b/docs/2.x/development/proxy.html
similarity index 96%
rename from docs/2.0/development/proxy.html
rename to docs/2.x/development/proxy.html
index 4d9d82a..f641eb0 100644
--- a/docs/2.0/development/proxy.html
+++ b/docs/2.x/development/proxy.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,19 +332,19 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Development &nbsp;&gt;&gt;&nbsp; Proxy</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Development &nbsp;&gt;&gt;&nbsp; Proxy</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Proxy</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/development/proxy.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/development/proxy.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <p>The proxy API allows the interaction with Accumulo with languages other than Java.
 A proxy server is provided in the codebase and a client can further be generated.
-The proxy API can also be used instead of the traditional <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a> class to
+The proxy API can also be used instead of the traditional <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a> class to
 provide a single TCP port in which clients can be securely routed through a firewall,
 without requiring access to all tablet servers in the cluster.</p>
 
@@ -513,7 +513,7 @@ Let’s create a table, add some data, scan the table, and delete it.</p>
 
 <p>The example python client code below (if saved to TestClient.py) can be run using the following command:</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>PYTHONPATH=/path/to/accumulo-2.0.0/lib/proxy/gen-py python TestClient.py
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>PYTHONPATH=/path/to/accumulo-2.0.0-alpha-1/lib/proxy/gen-py python TestClient.py
 </code></pre></div></div>
 
 <p>As a warning, this script will create a table in your Accumulo instance and add a few cells to it.</p>
@@ -716,7 +716,7 @@ Let’s create a table, add some data, scan the table, and delete it.</p>
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/development/proxy.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/development/proxy.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/development/sampling.html b/docs/2.x/development/sampling.html
similarity index 81%
rename from docs/2.0/development/sampling.html
rename to docs/2.x/development/sampling.html
index a1e743a..3c3ca59 100644
--- a/docs/2.0/development/sampling.html
+++ b/docs/2.x/development/sampling.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,14 +332,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Development &nbsp;&gt;&gt;&nbsp; Sampling</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Development &nbsp;&gt;&gt;&nbsp; Sampling</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Sampling</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/development/sampling.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/development/sampling.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <h2 id="overview">Overview</h2>
@@ -362,14 +362,14 @@ estimate, and then making decisions based on the estimate.</p>
 <h2 id="configuring">Configuring</h2>
 
 <p>In order to use sampling, an Accumulo table must be configured with a class that
-implements <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/sample/Sampler.html">Sampler</a> along with options for that class.  For guidance on
-implementing a Sampler, see the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/sample/Sampler.html">Sampler interface javadoc</a>. Accumulo provides a few
+implements <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/sample/Sampler.html">Sampler</a> along with options for that class.  For guidance on
+implementing a Sampler, see the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/sample/Sampler.html">Sampler interface javadoc</a>. Accumulo provides a few
 implementations of Sampler out of the box. For information on how to use the samplers that
-ship with Accumulo, look in the package <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/sample/package-summary.html">org.apache.accumulo.core.client.sample</a>
+ship with Accumulo, look in the package <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/sample/package-summary.html">org.apache.accumulo.core.client.sample</a>
 and consult the javadoc of the classes there. See the <a href="https://github.com/apache/accumulo-examples/blob/master/docs/sample.md">sampling example</a>
-for examples of how to configure a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/sample/Sampler.html">Sampler</a> on a table.</p>
+for examples of how to configure a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/sample/Sampler.html">Sampler</a> on a table.</p>
 
-<p>Once a table is configured with a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/sample/Sampler.html">Sampler</a>, all writes after that point will
+<p>Once a table is configured with a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/sample/Sampler.html">Sampler</a>, all writes after that point will
 generate sample data.  For data written before sampling was configured, sample
 data will not be present.  A compaction can be initiated that only compacts the
 files in the table that do not have sample data.  The <a href="https://github.com/apache/accumulo-examples/blob/master/docs/sample.md">sampling example</a> 
@@ -383,17 +383,17 @@ compaction can also be issued in this case to regenerate the sample data.</p>
 <h2 id="scanning-sample-data">Scanning sample data</h2>
 
 <p>In order to scan sample data, use <code class="highlighter-rouge">setSamplerConfiguration(...)</code> method of
-<a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/Scanner.html">Scanner</a> or <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/BatchScanner.html">BatchScanner</a>.  Please consult the javadoc of this method for more
+<a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/Scanner.html">Scanner</a> or <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/BatchScanner.html">BatchScanner</a>.  Please consult the javadoc of this method for more
 information.</p>
 
-<p>Sample data can also be scanned from within an Accumulo <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/SortedKeyValueIterator.html">SortedKeyValueIterator</a>.
+<p>Sample data can also be scanned from within an Accumulo <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/SortedKeyValueIterator.html">SortedKeyValueIterator</a>.
 To see how to do this, look at the example iterator referenced in the <a href="https://github.com/apache/accumulo-examples/blob/master/docs/sample.md">sampling example</a>.
-Also, consult the javadoc on <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/IteratorEnvironment.html#cloneWithSamplingEnabled--">IteratorEnvironment.cloneWithSamplingEnabled()</a>.</p>
+Also, consult the javadoc on <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/IteratorEnvironment.html#cloneWithSamplingEnabled--">IteratorEnvironment.cloneWithSamplingEnabled()</a>.</p>
 
-<p>Map reduce jobs using the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.2/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html">AccumuloInputFormat</a> can also read sample data.  See
-the javadoc for the <code class="highlighter-rouge">setSamplerConfiguration()</code> method of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.2/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html">AccumuloInputFormat</a>.</p>
+<p>Map reduce jobs using the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/2.0.0-alpha-1/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html">AccumuloInputFormat</a> can also read sample data.  See
+the javadoc for the <code class="highlighter-rouge">setSamplerConfiguration()</code> method of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/2.0.0-alpha-1/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.html">AccumuloInputFormat</a>.</p>
 
-<p>Scans over sample data will throw a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/SampleNotPresentException.html">SampleNotPresentException</a> in the following cases :</p>
+<p>Scans over sample data will throw a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/SampleNotPresentException.html">SampleNotPresentException</a> in the following cases :</p>
 
 <ol>
   <li>sample data is not present,</li>
@@ -408,13 +408,13 @@ generated with the same configuration.</p>
 
 <p>When generating rfiles to bulk import into Accumulo, those rfiles can contain
 sample data.  To use this feature, look at the javadoc of the <code class="highlighter-rouge">setSampler(...)</code>
-method of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/1.9.2/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html">AccumuloFileOutputFormat</a>.</p>
+method of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-client-mapreduce/2.0.0-alpha-1/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.html">AccumuloFileOutputFormat</a>.</p>
 
 
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/development/sampling.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/development/sampling.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/development/security.html b/docs/2.x/development/security.html
similarity index 85%
rename from docs/2.0/development/security.html
rename to docs/2.x/development/security.html
index 7c05486..099f06f 100644
--- a/docs/2.0/development/security.html
+++ b/docs/2.x/development/security.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,18 +332,18 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Development &nbsp;&gt;&gt;&nbsp; Security</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Development &nbsp;&gt;&gt;&nbsp; Security</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Security</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/development/security.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/development/security.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <p>Accumulo extends the BigTable data model to implement a security mechanism
-known as cell-level security. Every <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/data/Key.html">Key</a>-<a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/data/Value.html">Value</a> pair has its own security label, stored
+known as cell-level security. Every <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/data/Key.html">Key</a>-<a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/data/Value.html">Value</a> pair has its own security label, stored
 under the column visibility element of the key, which is used to determine whether
 a given user meets the security requirements to read the value. This enables data of
 various security levels to be stored within the same row, and users of varying
@@ -352,7 +352,7 @@ degrees of access to query the same table, while preserving data confidentiality
 <h2 id="security-label-expressions">Security Label Expressions</h2>
 
 <p>When mutations are applied, users can specify a security label for each value. This is
-done as the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/data/Mutation.html">Mutation</a> is created by passing a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/security/ColumnVisibility.html">ColumnVisibility</a> object to the put()
+done as the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/data/Mutation.html">Mutation</a> is created by passing a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/security/ColumnVisibility.html">ColumnVisibility</a> object to the put()
 method:</p>
 
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Text</span> <span class="n">rowID</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Text</span><span class="o">(</span><span class="s">"row1"</span><span class="o">);</span>
@@ -409,12 +409,12 @@ precedence of the operators.</p>
 <h2 id="authorizations">Authorizations</h2>
 
 <p>When clients attempt to read data from Accumulo, any security labels present are
-examined against an <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/security/Authorizations.html">Authorizations</a> object passed by the client code when the
-<a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/Scanner.html">Scanner</a> or <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/BatchScanner.html">BatchScanner</a> are created. If the Authorizations are determined to be
+examined against an <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/security/Authorizations.html">Authorizations</a> object passed by the client code when the
+<a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/Scanner.html">Scanner</a> or <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/BatchScanner.html">BatchScanner</a> are created. If the Authorizations are determined to be
 insufficient to satisfy the security label, the value is suppressed from the set of
 results sent back to the client.</p>
 
-<p><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/security/Authorizations.html">Authorizations</a> are specified as a comma-separated list of tokens the user possesses:</p>
+<p><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/security/Authorizations.html">Authorizations</a> are specified as a comma-separated list of tokens the user possesses:</p>
 
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c1">// user possesses both admin and system level access</span>
 <span class="n">Authorizations</span> <span class="n">auths</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Authorizations</span><span class="o">(</span><span class="s">"admin"</span><span class="o">,</span><span class="s">"system"</span><span class="o">);</span>
@@ -425,11 +425,11 @@ results sent back to the client.</p>
 <h2 id="user-authorizations">User Authorizations</h2>
 
 <p>Each Accumulo user has a set of associated security labels. To manipulate these in
-the <a href="/docs/2.0/getting-started/shell">Accumulo shell</a>, use the <code class="highlighter-rouge">setuaths</code> and <code class="highlighter-rouge">getauths</code> commands. They can be
+the <a href="/docs/2.x/getting-started/shell">Accumulo shell</a>, use the <code class="highlighter-rouge">setuaths</code> and <code class="highlighter-rouge">getauths</code> commands. They can be
 retrieved and modified in Java using <code class="highlighter-rouge">getUserAuthorizations</code> and <code class="highlighter-rouge">changeUserAuthorizations</code>
-methods of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/admin/SecurityOperations.html">SecurityOperations</a>.</p>
+methods of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/admin/SecurityOperations.html">SecurityOperations</a>.</p>
 
-<p>When a user creates a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/Scanner.html">Scanner</a> or <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/BatchScanner.html">BatchScanner</a> a set of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/security/Authorizations.html">Authorizations</a> is passed.
+<p>When a user creates a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/Scanner.html">Scanner</a> or <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/BatchScanner.html">BatchScanner</a> a set of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/security/Authorizations.html">Authorizations</a> is passed.
 If the Authorizations passed to the scanner are not a subset of the user’s Authorizations,
 then an exception will be thrown.</p>
 
@@ -452,9 +452,9 @@ disable the bulk import permission.</p>
 authorization, and permission handling.</p>
 
 <p>Authentication verifies the identity of a user. In Accumulo, authentication occurs when
-the <code class="highlighter-rouge">usingToken'</code> method of the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a> builder is called with a principal (i.e username)
-and an <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.html">AuthenticationToken</a> which is an interface with multiple implementations. The most
-common implementation is <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/security/tokens/PasswordToken.html">PasswordToken</a> which is the default authentication method for Accumulo
+the <code class="highlighter-rouge">usingToken'</code> method of the <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> builder is called with a principal (i.e username)
+and an <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.html">AuthenticationToken</a> which is an interface with multiple implementations. The most
+common implementation is <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/security/tokens/PasswordToken.html">PasswordToken</a> which is the default authentication method for Accumulo
 out of the box.</p>
 
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">()</span>
@@ -511,7 +511,7 @@ Authorizations mechanism.</p>
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/development/security.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/development/security.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/development/summaries.html b/docs/2.x/development/summaries.html
similarity index 90%
rename from docs/2.0/development/summaries.html
rename to docs/2.x/development/summaries.html
index 56037b0..08bac8d 100644
--- a/docs/2.0/development/summaries.html
+++ b/docs/2.x/development/summaries.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,14 +332,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Development &nbsp;&gt;&gt;&nbsp; Summary Statistics</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Development &nbsp;&gt;&gt;&nbsp; Summary Statistics</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Summary Statistics</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/development/summaries.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/development/summaries.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <h2 id="overview">Overview</h2>
@@ -359,8 +359,8 @@ for this to be fast the, summary information should fit in cache.  There is a
 dedicated cache for summary data on each tserver with a configurable size.  In
 order for summary data to fit in cache, it should probably be small.</p>
 
-<p>For information on writing a custom summarizer see the javadoc of the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/summary/Summarizer.html">Summarizer</a>
-class. The package <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/summary/summarizers/package-summary.html">org.apache.accumulo.core.client.summary.summarizers</a>
+<p>For information on writing a custom summarizer see the javadoc of the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/summary/Summarizer.html">Summarizer</a>
+class. The package <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/summary/summarizers/package-summary.html">org.apache.accumulo.core.client.summary.summarizers</a>
 contains summarizer implementations that ship with Accumulo and can be configured for use.</p>
 
 <h2 id="inaccuracies">Inaccuracies</h2>
@@ -386,12 +386,12 @@ information.</p>
 <p>The following tablet server and table properties configure summarization.</p>
 
 <ul>
-  <li><a href="/docs/2.0/administration/properties#tserver_cache_summary_size">tserver.cache.summary.size</a></li>
-  <li><a href="/docs/2.0/administration/properties#tserver_summary_partition_threads">tserver.summary.partition.threads</a></li>
-  <li><a href="/docs/2.0/administration/properties#tserver_summary_remote_threads">tserver.summary.remote.threads</a></li>
-  <li><a href="/docs/2.0/administration/properties#tserver_summary_retrieval_threads">tserver.summary.retrieval.threads</a></li>
-  <li><a href="/docs/2.0/administration/properties#table_summarizer_prefix">table.summarizer.*</a>)</li>
-  <li><a href="/docs/2.0/administration/properties#table_file_summary_maxSize">table.file.summary.maxSize</a></li>
+  <li><a href="/docs/2.x/administration/properties#tserver_cache_summary_size">tserver.cache.summary.size</a></li>
+  <li><a href="/docs/2.x/administration/properties#tserver_summary_partition_threads">tserver.summary.partition.threads</a></li>
+  <li><a href="/docs/2.x/administration/properties#tserver_summary_remote_threads">tserver.summary.remote.threads</a></li>
+  <li><a href="/docs/2.x/administration/properties#tserver_summary_retrieval_threads">tserver.summary.retrieval.threads</a></li>
+  <li><a href="/docs/2.x/administration/properties#table_summarizer_prefix">table.summarizer.*</a>)</li>
+  <li><a href="/docs/2.x/administration/properties#table_file_summary_maxSize">table.file.summary.maxSize</a></li>
 </ul>
 
 <h2 id="permissions">Permissions</h2>
@@ -404,7 +404,7 @@ requires a special permission.  User must have the table permission
 
 <p>When generating RFiles to bulk import into Accumulo, those RFiles can contain
 summary data.  To use this feature, look at the javadoc on the
-<code class="highlighter-rouge">AccumuloFileOutputFormat.setSummarizers(...)</code> method.  Also, the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/rfile/RFile.html">RFile</a>
+<code class="highlighter-rouge">AccumuloFileOutputFormat.setSummarizers(...)</code> method.  Also, the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/rfile/RFile.html">RFile</a>
 class has options for creating RFiles with embedded summary data.</p>
 
 <h2 id="examples">Examples</h2>
@@ -562,7 +562,7 @@ root@uno summary_test&gt;
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/development/summaries.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/development/summaries.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/getting-started/clients.html b/docs/2.x/getting-started/clients.html
similarity index 85%
rename from docs/2.0/getting-started/clients.html
rename to docs/2.x/getting-started/clients.html
index 828d75d..556d8a9 100644
--- a/docs/2.0/getting-started/clients.html
+++ b/docs/2.x/getting-started/clients.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,14 +332,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Getting started &nbsp;&gt;&gt;&nbsp; Accumulo Clients</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Getting started &nbsp;&gt;&gt;&nbsp; Accumulo Clients</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Accumulo Clients</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/getting-started/clients.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/getting-started/clients.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <h2 id="creating-client-code">Creating Client Code</h2>
@@ -349,7 +349,7 @@
 <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;dependency&gt;</span>
   <span class="nt">&lt;groupId&gt;</span>org.apache.accumulo<span class="nt">&lt;/groupId&gt;</span>
   <span class="nt">&lt;artifactId&gt;</span>accumulo-core<span class="nt">&lt;/artifactId&gt;</span>
-  <span class="nt">&lt;version&gt;</span>2.0.0<span class="nt">&lt;/version&gt;</span>
+  <span class="nt">&lt;version&gt;</span>2.0.0-alpha-1<span class="nt">&lt;/version&gt;</span>
 <span class="nt">&lt;/dependency&gt;</span>
 </code></pre></div></div>
 
@@ -367,7 +367,7 @@ Public API and should be avoided.</p>
   <li>Accumulo username &amp; password</li>
 </ul>
 
-<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a> object is the main entry point for Accumulo clients. It can be created using one
+<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a> object is the main entry point for Accumulo clients. It can be created using one
 of the following methods:</p>
 
 <ol>
@@ -377,7 +377,7 @@ of the tarball distribution):
                      <span class="o">.</span><span class="na">usingProperties</span><span class="o">(</span><span class="s">"/path/to/accumulo-client.properties"</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
 </code></pre></div>    </div>
   </li>
-  <li>Using the builder methods of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a>:
+  <li>Using the builder methods of <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>:
     <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">()</span>
                      <span class="o">.</span><span class="na">forInstance</span><span class="o">(</span><span class="s">"myinstance"</span><span class="o">,</span> <span class="s">"zookeeper1,zookeeper2"</span><span class="o">)</span>
                      <span class="o">.</span><span class="na">usingPassword</span><span class="o">(</span><span class="s">"myuser"</span><span class="o">,</span> <span class="s">"mypassword"</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
@@ -395,15 +395,15 @@ of the tarball distribution):
   </li>
 </ol>
 
-<p>If a <code class="highlighter-rouge">accumulo-client.properties</code> file or a Java Properties object is used to create a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a>, the following
-<a href="/docs/2.0/development/client-properties">client properties</a> must be set:</p>
+<p>If a <code class="highlighter-rouge">accumulo-client.properties</code> file or a Java Properties object is used to create a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a>, the following
+<a href="/docs/2.x/development/client-properties">client properties</a> must be set:</p>
 
 <ul>
-  <li><a href="/docs/2.0/development/client-properties#instance_name">instance.name</a> - Name of Accumulo instance to connect to</li>
-  <li><a href="/docs/2.0/development/client-properties#instance_zookeepers">instance.zookeepers</a> - ZooKeeper connection information for this Accumulo instance</li>
-  <li><a href="/docs/2.0/development/client-properties#auth_type">auth.type</a> - Authentication method. Possible values are <code class="highlighter-rouge">password</code>, <code class="highlighter-rouge">kerberos</code>, or authentication token class (i.e <code class="highlighter-rouge">PasswordToken</code>, <code class="highlighter-rouge">org.apache.accumulo.core.client.security.tokens.PasswordToken</code>)</li>
-  <li><a href="/docs/2.0/development/client-properties#auth_principal">auth.principal</a> - Accumulo principal/username</li>
-  <li><a href="/docs/2.0/development/client-properties#auth_token">auth.token</a> - Token associated with <code class="highlighter-rouge">auth.type</code>. See table for mapping below:</li>
+  <li><a href="/docs/2.x/development/client-properties#instance_name">instance.name</a> - Name of Accumulo instance to connect to</li>
+  <li><a href="/docs/2.x/development/client-properties#instance_zookeepers">instance.zookeepers</a> - ZooKeeper connection information for this Accumulo instance</li>
+  <li><a href="/docs/2.x/development/client-properties#auth_type">auth.type</a> - Authentication method. Possible values are <code class="highlighter-rouge">password</code>, <code class="highlighter-rouge">kerberos</code>, or authentication token class (i.e <code class="highlighter-rouge">PasswordToken</code>, <code class="highlighter-rouge">org.apache.accumulo.core.client.security.tokens.PasswordToken</code>)</li>
+  <li><a href="/docs/2.x/development/client-properties#auth_principal">auth.principal</a> - Accumulo principal/username</li>
+  <li><a href="/docs/2.x/development/client-properties#auth_token">auth.token</a> - Token associated with <code class="highlighter-rouge">auth.type</code>. See table for mapping below:</li>
 </ul>
 
 <table>
@@ -445,18 +445,18 @@ auth.token = AAAAGh+LCAAAAAAAAAArTk0uSi0BAOXoolwGAAAA
 
 <h1 id="authentication">Authentication</h1>
 
-<p>When creating a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a>, the user must be authenticated using one of the following
-implementations of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.html">AuthenticationToken</a> below:</p>
+<p>When creating a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a>, the user must be authenticated using one of the following
+implementations of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.html">AuthenticationToken</a> below:</p>
 
 <ol>
-  <li><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/security/tokens/PasswordToken.html">PasswordToken</a> is the must commonly used implementation.</li>
-  <li><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.html">CredentialProviderToken</a> leverages the Hadoop CredentialProviders (new in Hadoop 2.6).
-For example, the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.html">CredentialProviderToken</a> can be used in conjunction with a Java KeyStore to
+  <li><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/security/tokens/PasswordToken.html">PasswordToken</a> is the must commonly used implementation.</li>
+  <li><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.html">CredentialProviderToken</a> leverages the Hadoop CredentialProviders (new in Hadoop 2.6).
+For example, the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.html">CredentialProviderToken</a> can be used in conjunction with a Java KeyStore to
 alleviate passwords stored in cleartext. When stored in HDFS, a single KeyStore can be used across
 an entire instance. Be aware that KeyStores stored on the local filesystem must be made available
 to all nodes in the Accumulo cluster.</li>
   <li>
-    <p><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/security/tokens/KerberosToken.html">KerberosToken</a> can be provided to use the authentication provided by Kerberos. Using Kerberos
+    <p><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/security/tokens/KerberosToken.html">KerberosToken</a> can be provided to use the authentication provided by Kerberos. Using Kerberos
 requires external setup and additional configuration, but provides a single point of authentication
 through HDFS, YARN and ZooKeeper and allowing for password-less authentication with Accumulo.</p>
 
@@ -470,15 +470,15 @@ through HDFS, YARN and ZooKeeper and allowing for password-less authentication w
 
 <h2 id="writing-data">Writing Data</h2>
 
-<p>With a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a> created, it can be used to create objects (like the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/BatchWriter.html">BatchWriter</a>) for
+<p>With a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a> created, it can be used to create objects (like the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/BatchWriter.html">BatchWriter</a>) for
 reading and writing from Accumulo:</p>
 
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">BatchWriter</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="s">"table"</span><span class="o">);</span>
 </code></pre></div></div>
 
-<p>Data is written to Accumulo by creating <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/data/Mutation.html">Mutation</a> objects that represent all the
+<p>Data is written to Accumulo by creating <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/data/Mutation.html">Mutation</a> objects that represent all the
 changes to the columns of a single row. The changes are made atomically in the
-TabletServer. Clients then add Mutations to a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/BatchWriter.html">BatchWriter</a> which submits them to
+TabletServer. Clients then add Mutations to a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/BatchWriter.html">BatchWriter</a> which submits them to
 the appropriate TabletServers.</p>
 
 <p>Mutations can be created thus:</p>
@@ -497,7 +497,7 @@ the appropriate TabletServers.</p>
 
 <h3 id="batchwriter">BatchWriter</h3>
 
-<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/BatchWriter.html">BatchWriter</a> is highly optimized to send Mutations to multiple TabletServers
+<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/BatchWriter.html">BatchWriter</a> is highly optimized to send Mutations to multiple TabletServers
 and automatically batches Mutations destined for the same TabletServer to
 amortize network overhead. Care must be taken to avoid changing the contents of
 any Object passed to the BatchWriter since it keeps objects in memory while
@@ -518,11 +518,11 @@ batching.</p>
 
 <h3 id="conditionalwriter">ConditionalWriter</h3>
 
-<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/ConditionalWriter.html">ConditionalWriter</a> enables efficient, atomic read-modify-write operations on
+<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/ConditionalWriter.html">ConditionalWriter</a> enables efficient, atomic read-modify-write operations on
 rows.  The ConditionalWriter writes special Mutations which have a list of per
 column conditions that must all be met before the mutation is applied.  The
 conditions are checked in the tablet server while a row lock is
-held (Mutations written by the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/BatchWriter.html">BatchWriter</a> will not obtain a row
+held (Mutations written by the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/BatchWriter.html">BatchWriter</a> will not obtain a row
 lock).  The conditions that can be checked for a column are equality and
 absence.  For example a conditional mutation can require that column A is
 absent inorder to be applied.  Iterators can be applied when checking
@@ -533,13 +533,13 @@ mutation when a column is less than 5.</p>
 
 <p>In the case when a tablet server dies after a client sent a conditional
 mutation, its not known if the mutation was applied or not.  When this happens
-the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/ConditionalWriter.html">ConditionalWriter</a> reports a status of UNKNOWN for the ConditionalMutation.
+the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/ConditionalWriter.html">ConditionalWriter</a> reports a status of UNKNOWN for the ConditionalMutation.
 In many cases this situation can be dealt with by simply reading the row again
 and possibly sending another conditional mutation.  If this is not sufficient,
 then a higher level of abstraction can be built by storing transactional
 information within a row.</p>
 
-<p>See the <a href="https://github.com/apache/accumulo-examples/blob/master/docs/reservations.md">reservations example</a> for example code that uses the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/ConditionalWriter.html">ConditionalWriter</a>.</p>
+<p>See the <a href="https://github.com/apache/accumulo-examples/blob/master/docs/reservations.md">reservations example</a> for example code that uses the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/ConditionalWriter.html">ConditionalWriter</a>.</p>
 
 <h3 id="durability">Durability</h3>
 
@@ -563,8 +563,8 @@ These levels are:</p>
 
 <ol>
   <li>The default durability of a table can be set in the Accumulo shell</li>
-  <li>When creating a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a>, the default durability can be overridden using <code class="highlighter-rouge">withBatchWriterConfig()</code>
-or by setting <a href="/docs/2.0/development/client-properties#batch_writer_durability">batch.writer.durability</a> in <code class="highlighter-rouge">accumulo-client.properties</code>.</li>
+  <li>When creating a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a>, the default durability can be overridden using <code class="highlighter-rouge">withBatchWriterConfig()</code>
+or by setting <a href="/docs/2.x/development/client-properties#batch_writer_durability">batch.writer.durability</a> in <code class="highlighter-rouge">accumulo-client.properties</code>.</li>
   <li>
     <p>When a BatchWriter or ConditionalWriter is created, the durability settings above will be overridden
 by the <code class="highlighter-rouge">BatchWriterConfig</code> that is passed in.</p>
@@ -586,7 +586,7 @@ to efficiently return ranges of consecutive keys and their associated values.</p
 
 <h3 id="scanner">Scanner</h3>
 
-<p>To retrieve data, Clients use a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/Scanner.html">Scanner</a>, which acts like an Iterator over
+<p>To retrieve data, Clients use a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/Scanner.html">Scanner</a>, which acts like an Iterator over
 keys and values. Scanners can be configured to start and stop at particular keys, and
 to return a subset of the columns available.</p>
 
@@ -615,18 +615,18 @@ scanning. There are three possible ways that a row could change in Accumulo :</p
 </ul>
 
 <p>Isolation guarantees that either all or none of the changes made by these
-operations on a row are seen. Use the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/IsolatedScanner.html">IsolatedScanner</a> to obtain an isolated
+operations on a row are seen. Use the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/IsolatedScanner.html">IsolatedScanner</a> to obtain an isolated
 view of an Accumulo table. When using the regular scanner it is possible to see
 a non isolated view of a row. For example if a mutation modifies three
 columns, it is possible that you will only see two of those modifications.
 With the isolated scanner either all three of the changes are seen or none.</p>
 
-<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/IsolatedScanner.html">IsolatedScanner</a> buffers rows on the client side so a large row will not
+<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/IsolatedScanner.html">IsolatedScanner</a> buffers rows on the client side so a large row will not
 crash a tablet server. By default rows are buffered in memory, but the user
 can easily supply their own buffer if they wish to buffer to disk when rows are
 large.</p>
 
-<p>See the <a href="https://github.com/apache/accumulo-examples/blob/master/docs/isolation.md">isolation example</a> for example code that uses the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/IsolatedScanner.html">IsolatedScanner</a>.</p>
+<p>See the <a href="https://github.com/apache/accumulo-examples/blob/master/docs/isolation.md">isolation example</a> for example code that uses the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/IsolatedScanner.html">IsolatedScanner</a>.</p>
 
 <h3 id="batchscanner">BatchScanner</h3>
 
@@ -634,10 +634,10 @@ large.</p>
 simultaneously. This arises when accessing a set of rows that are not consecutive
 whose IDs have been retrieved from a secondary index, for example.</p>
 
-<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/BatchScanner.html">BatchScanner</a> is configured similarly to the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/Scanner.html">Scanner</a>; it can be configured to
-retrieve a subset of the columns available, but rather than passing a single <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/data/Range.html">Range</a>,
+<p>The <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/BatchScanner.html">BatchScanner</a> is configured similarly to the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/Scanner.html">Scanner</a>; it can be configured to
+retrieve a subset of the columns available, but rather than passing a single <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/data/Range.html">Range</a>,
 BatchScanners accept a set of Ranges. It is important to note that the keys returned
-by a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/BatchScanner.html">BatchScanner</a> are not in sorted order since the keys streamed are from multiple
+by a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/BatchScanner.html">BatchScanner</a> are not in sorted order since the keys streamed are from multiple
 TabletServers in parallel.</p>
 
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">ArrayList</span><span class="o">&lt;</span><span class="n">Range</span><span class="o">&gt;</span> <span class="n">ranges</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ArrayList</span><span class="o">&lt;</span><span class="n">Range</span><span class="o">&gt;();</span>
@@ -654,8 +654,8 @@ TabletServers in parallel.</p>
 
 <p>For more example code, see the <a href="https://github.com/apache/accumulo-examples/blob/master/docs/batch.md">batch writing and scanning example</a>.</p>
 
-<p>At this time, there is no client side isolation support for the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/BatchScanner.html">BatchScanner</a>.
-You may consider using the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/user/WholeRowIterator.html">WholeRowIterator</a> with the BatchScanner to achieve
+<p>At this time, there is no client side isolation support for the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/BatchScanner.html">BatchScanner</a>.
+You may consider using the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/user/WholeRowIterator.html">WholeRowIterator</a> with the BatchScanner to achieve
 isolation. The drawback of this approach is that entire rows are read into
 memory on the server side. If a row is too big, it may crash a tablet server.</p>
 
@@ -720,16 +720,16 @@ for more information.</p>
 <p>This page covers Accumulo client basics.  Below are links to additional documentation that may be useful when creating Accumulo clients:</p>
 
 <ul>
-  <li><a href="/docs/2.0/development/iterators">Iterators</a> - Server-side programming mechanism that can modify key/value pairs at various points in data management process</li>
-  <li><a href="/docs/2.0/development/proxy">Proxy</a> - Documentation for interacting with Accumulo using non-Java languages through a proxy server</li>
-  <li><a href="/docs/2.0/development/mapreduce">MapReduce</a> - Documentation for reading and writing to Accumulo using MapReduce.</li>
+  <li><a href="/docs/2.x/development/iterators">Iterators</a> - Server-side programming mechanism that can modify key/value pairs at various points in data management process</li>
+  <li><a href="/docs/2.x/development/proxy">Proxy</a> - Documentation for interacting with Accumulo using non-Java languages through a proxy server</li>
+  <li><a href="/docs/2.x/development/mapreduce">MapReduce</a> - Documentation for reading and writing to Accumulo using MapReduce.</li>
 </ul>
 
 
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/getting-started/clients.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/getting-started/clients.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/getting-started/design.html b/docs/2.x/getting-started/design.html
similarity index 90%
rename from docs/2.0/getting-started/design.html
rename to docs/2.x/getting-started/design.html
index a6ff580..8a9dad2 100644
--- a/docs/2.0/getting-started/design.html
+++ b/docs/2.x/getting-started/design.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,14 +332,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Getting started &nbsp;&gt;&gt;&nbsp; Accumulo Design</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Getting started &nbsp;&gt;&gt;&nbsp; Accumulo Design</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Accumulo Design</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/getting-started/design.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/getting-started/design.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <h2 id="background">Background</h2>
@@ -410,7 +410,7 @@ and the others will become backups if the master should fail.</p>
 <p>The Accumulo Tracer process supports the distributed timing API provided by Accumulo.
 One to many of these processes can be run on a cluster which will write the timing
 information to a given Accumulo table for future reference. See the
-<a href="/docs/2.0/administration/tracing">tracing documentation</a> for more information.</p>
+<a href="/docs/2.x/administration/tracing">tracing documentation</a> for more information.</p>
 
 <h3 id="monitor">Monitor</h3>
 
@@ -419,7 +419,7 @@ the state of an instance. The Monitor shows graphs and tables which contain info
 about read/write rates, cache hit/miss rates, and Accumulo table information such as scan
 rate and active/queued compactions. Additionally, the Monitor should always be the first
 point of entry when attempting to debug an Accumulo problem as it will show high-level problems
-in addition to aggregated errors from all nodes in the cluster. See the <a href="/docs/2.0/administration/monitoring-metrics#monitoring">Accumulo monitor documentation</a>
+in addition to aggregated errors from all nodes in the cluster. See the <a href="/docs/2.x/administration/monitoring-metrics#monitoring">Accumulo monitor documentation</a>
 for more information.</p>
 
 <p>Multiple Monitors can be run to provide hot-standby support in the face of failure. Due to the
@@ -429,7 +429,7 @@ at one time. Leader election will be performed internally to choose the active M
 <h3 id="client">Client</h3>
 
 <p>Accumulo has a client library that can be used to write applications that write and read
-data to/from Accumulo. See the <a href="/docs/2.0/getting-started/clients">Accumulo clients documentation</a> for more information.</p>
+data to/from Accumulo. See the <a href="/docs/2.x/getting-started/clients">Accumulo clients documentation</a> for more information.</p>
 
 <h2 id="data-management">Data Management</h2>
 
@@ -457,7 +457,7 @@ compaction is recorded in the Write-Ahead Log.</p>
 binary search across the MemTable as well as the index blocks associated with each RFile
 to find the relevant values. If clients are performing a scan, several key-value pairs
 are returned to the client in order from the MemTable and data blocks of RFiles by performing
-a sorted merge as they are read. If <a href="/docs/2.0/administration/caching">caching</a> is enabled for the table, any index or data
+a sorted merge as they are read. If <a href="/docs/2.x/administration/caching">caching</a> is enabled for the table, any index or data
 block is stored in the block cache to speed up future scans.</p>
 
 <p><img src="https://accumulo.apache.org/images/docs/tablet_server.png" alt="tablet server diagram" />
@@ -482,7 +482,7 @@ performs Major Compactions of files within a tablet, in which some set of RFiles
 are combined into one file. The previous files will eventually be removed by the
 Garbage Collector. This also provides an opportunity to permanently remove
 deleted key-value pairs by omitting key-value pairs suppressed by a delete entry
-when the new file is created. See the <a href="/docs/2.0/getting-started/table_configuration#compaction">compaction documentation</a>
+when the new file is created. See the <a href="/docs/2.x/getting-started/table_configuration#compaction">compaction documentation</a>
 for more information.</p>
 
 <h2 id="splitting">Splitting</h2>
@@ -499,7 +499,7 @@ writes giving better initial performance without waiting for automatic
 splitting.</p>
 
 <p>As data is deleted from a table, tablets may shrink. Over time this can lead
-to small or empty tablets. To deal with this, the <a href="/docs/2.0/getting-started/table_configuration#merging-tablets">merging of tablets</a>
+to small or empty tablets. To deal with this, the <a href="/docs/2.x/getting-started/table_configuration#merging-tablets">merging of tablets</a>
 was introduced in Accumulo 1.4.</p>
 
 <h2 id="fault-tolerance">Fault-Tolerance</h2>
@@ -523,7 +523,7 @@ that are destined for the tablets they have now been assigned.</p>
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/getting-started/design.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/getting-started/design.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/getting-started/quick-install.html b/docs/2.x/getting-started/quick-install.html
similarity index 89%
rename from docs/2.0/getting-started/quick-install.html
rename to docs/2.x/getting-started/quick-install.html
index 340ca78..94d4fe5 100644
--- a/docs/2.0/getting-started/quick-install.html
+++ b/docs/2.x/getting-started/quick-install.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,26 +332,26 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Getting started &nbsp;&gt;&gt;&nbsp; Quick Installation</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Getting started &nbsp;&gt;&gt;&nbsp; Quick Installation</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Quick Installation</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/getting-started/quick-install.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/getting-started/quick-install.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <!-- IMPORTANT: This file should mirror (with minor differences) INSTALL.md in the Accumulo repo -->
 
 <p>This document provides basic instructions for installing Accumulo. For detailed instructions,
-see the <a href="/docs/2.0/administration/in-depth-install">in-depth installation guide</a>.</p>
+see the <a href="/docs/2.x/administration/in-depth-install">in-depth installation guide</a>.</p>
 
 <p>Either <a href="https://accumulo.apache.org/downloads/">download</a> or <a href="https://github.com/apache/accumulo/blob/master/README.md#building">build</a> a binary distribution of Accumulo from source code and
 unpack as follows.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>tar xzf /path/to/accumulo-2.0.0-bin.tar.gz
-cd accumulo-2.0.0
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>tar xzf /path/to/accumulo-2.0.0-alpha-1-bin.tar.gz
+cd accumulo-2.0.0-alpha-1
 </code></pre></div></div>
 
 <p>There are four scripts in the <code class="highlighter-rouge">bin</code> directory of the tarball distribution that are used
@@ -365,7 +365,7 @@ to manage Accumulo:</p>
 </ol>
 
 <p>These scripts will be used in the remaining instructions to configure and run Accumulo.
-For convenience, consider adding <code class="highlighter-rouge">accumulo-2.0.0/bin/</code> to your shell’s path.</p>
+For convenience, consider adding <code class="highlighter-rouge">accumulo-2.0.0-alpha-1/bin/</code> to your shell’s path.</p>
 
 <h2 id="configuring-accumulo">Configuring Accumulo</h2>
 
@@ -381,18 +381,18 @@ monitor, etc). Follow these steps to set it up:</p>
 <ol>
   <li>
     <p>Run <code class="highlighter-rouge">accumulo-util build-native</code> to build native code.  If this command fails, disable
-native maps by setting <a href="/docs/2.0/administration/properties#tserver_memory_maps_native_enabled">tserver.memory.maps.native.enabled</a> to <code class="highlighter-rouge">false</code>.</p>
+native maps by setting <a href="/docs/2.x/administration/properties#tserver_memory_maps_native_enabled">tserver.memory.maps.native.enabled</a> to <code class="highlighter-rouge">false</code>.</p>
   </li>
   <li>
-    <p>Set <a href="/docs/2.0/administration/properties#instance_volumes">instance.volumes</a> to HDFS location where Accumulo will store data. If your namenode
+    <p>Set <a href="/docs/2.x/administration/properties#instance_volumes">instance.volumes</a> to HDFS location where Accumulo will store data. If your namenode
 is running at 192.168.1.9:8020 and you want to store data in <code class="highlighter-rouge">/accumulo</code> in HDFS, then set
-<a href="/docs/2.0/administration/properties#instance_volumes">instance.volumes</a> to <code class="highlighter-rouge">hdfs://192.168.1.9:8020/accumulo</code>.</p>
+<a href="/docs/2.x/administration/properties#instance_volumes">instance.volumes</a> to <code class="highlighter-rouge">hdfs://192.168.1.9:8020/accumulo</code>.</p>
   </li>
   <li>
-    <p>Set <a href="/docs/2.0/administration/properties#instance_zookeeper_host">instance.zookeeper.host</a> to the location of your Zookeepers</p>
+    <p>Set <a href="/docs/2.x/administration/properties#instance_zookeeper_host">instance.zookeeper.host</a> to the location of your Zookeepers</p>
   </li>
   <li>
-    <p>(Optional) Change <a href="/docs/2.0/administration/properties#instance_secret">instance.secret</a> (which is used by Accumulo processes to communicate)
+    <p>(Optional) Change <a href="/docs/2.x/administration/properties#instance_secret">instance.secret</a> (which is used by Accumulo processes to communicate)
 from the default. This value should match on all servers.</p>
   </li>
 </ol>
@@ -453,12 +453,12 @@ clients to simplify connecting to Accumulo. Below are steps to configure it.</p>
 
 <ol>
   <li>
-    <p>Set <a href="/docs/2.0/development/client-properties#instance_name">instance.name</a> and <a href="/docs/2.0/development/client-properties#instance_zookeepers">instance.zookeepers</a> to the Accumulo instance and zookeeper connection
+    <p>Set <a href="/docs/2.x/development/client-properties#instance_name">instance.name</a> and <a href="/docs/2.x/development/client-properties#instance_zookeepers">instance.zookeepers</a> to the Accumulo instance and zookeeper connection
 string of your instance.</p>
   </li>
   <li>
-    <p>Pick an authentication type and set <a href="/docs/2.0/development/client-properties#auth_type">auth.type</a> accordingly.  The most common <code class="highlighter-rouge">auth.type</code>
-is <code class="highlighter-rouge">password</code> which requires <a href="/docs/2.0/development/client-properties#auth_principal">auth.principal</a> to be set and <a href="/docs/2.0/development/client-properties#auth_token">auth.token</a> to be set the password
+    <p>Pick an authentication type and set <a href="/docs/2.x/development/client-properties#auth_type">auth.type</a> accordingly.  The most common <code class="highlighter-rouge">auth.type</code>
+is <code class="highlighter-rouge">password</code> which requires <a href="/docs/2.x/development/client-properties#auth_principal">auth.principal</a> to be set and <a href="/docs/2.x/development/client-properties#auth_token">auth.token</a> to be set the password
 of <code class="highlighter-rouge">auth.principal</code>. For the Accumulo shell, <code class="highlighter-rouge">auth.token</code> can be commented out and the shell will
 prompt you for the password of <code class="highlighter-rouge">auth.principal</code> at login.</p>
   </li>
@@ -593,7 +593,7 @@ the cluster:</p>
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/getting-started/quick-install.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/getting-started/quick-install.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/getting-started/shell.html b/docs/2.x/getting-started/shell.html
similarity index 89%
rename from docs/2.0/getting-started/shell.html
rename to docs/2.x/getting-started/shell.html
index d7717a9..2aa894a 100644
--- a/docs/2.0/getting-started/shell.html
+++ b/docs/2.x/getting-started/shell.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,14 +332,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Getting started &nbsp;&gt;&gt;&nbsp; Accumulo Shell</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Getting started &nbsp;&gt;&gt;&nbsp; Accumulo Shell</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Accumulo Shell</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/getting-started/shell.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/getting-started/shell.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <p>Accumulo provides a simple shell that can be used to examine the contents and
@@ -356,7 +356,7 @@ and then display the following prompt:</p>
 
 <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>Shell - Apache Accumulo Interactive Shell
 -
-- version: 2.0.0
+- version: 2.0.0-alpha-1
 - instance name: myinstance
 - instance id: 00000000-0000-0000-0000-000000000000
 -
@@ -458,7 +458,7 @@ root@myinstance bobstable&gt; revoke System.CREATE_TABLE -s -u bob
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/getting-started/shell.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/getting-started/shell.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/getting-started/table_configuration.html b/docs/2.x/getting-started/table_configuration.html
similarity index 91%
rename from docs/2.0/getting-started/table_configuration.html
rename to docs/2.x/getting-started/table_configuration.html
index d177b1a..25fe4c1 100644
--- a/docs/2.0/getting-started/table_configuration.html
+++ b/docs/2.x/getting-started/table_configuration.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,20 +332,20 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Getting started &nbsp;&gt;&gt;&nbsp; Table Configuration</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Getting started &nbsp;&gt;&gt;&nbsp; Table Configuration</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Table Configuration</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/getting-started/table_configuration.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/getting-started/table_configuration.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <p>Accumulo tables have a few options that can be configured to alter the default
 behavior of Accumulo as well as improve performance based on the data stored.
 These include locality groups, constraints, bloom filters, iterators, and block
-cache.  See the <a href="/docs/2.0/administration/properties">configuration properties documentation</a> for
+cache.  See the <a href="/docs/2.x/administration/properties">configuration properties documentation</a> for
 a complete list of available configuration options.</p>
 
 <h2 id="locality-groups">Locality Groups</h2>
@@ -353,7 +353,7 @@ a complete list of available configuration options.</p>
 <p>Accumulo supports storing sets of column families separately on disk to allow
 clients to efficiently scan over columns that are frequently used together and to avoid
 scanning over column families that are not requested. After a locality group is set,
-<a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/Scanner.html">Scanner</a> and <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/client/BatchScanner.html">BatchScanner</a> operations will automatically take advantage of them
+<a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/Scanner.html">Scanner</a> and <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/client/BatchScanner.html">BatchScanner</a> operations will automatically take advantage of them
 whenever the fetchColumnFamilies() method is used.</p>
 
 <p>By default, tables place all column families into the same <code class="highlighter-rouge">default</code> locality group.
@@ -417,9 +417,9 @@ com.test.AnotherConstraint=2
 
 <p>Currently there are no general-purpose constraints provided with the Accumulo
 distribution. New constraints can be created by writing a Java class that implements
-the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/constraints/Constraint.html">Constraint</a> interface.</p>
+the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/constraints/Constraint.html">Constraint</a> interface.</p>
 
-<p>To deploy a new constraint, create a jar file containing a class implementing <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/constraints/Constraint.html">Constraint</a>
+<p>To deploy a new constraint, create a jar file containing a class implementing <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/constraints/Constraint.html">Constraint</a>
 and place it in the <code class="highlighter-rouge">lib/</code> directory of the Accumulo installation. New
 constraint jars can be added to Accumulo and enabled without restarting but any
 change to an existing constraint class requires Accumulo to be restarted.</p>
@@ -432,7 +432,7 @@ change to an existing constraint class requires Accumulo to be restarted.</p>
 bloom filters are enabled, Accumulo will create and load a small data structure into
 memory to determine whether a file contains a given key before opening the file.
 This can speed up lookups considerably. Bloom filters can be enabled on a table by
-setting the <a href="/docs/2.0/administration/properties#table_bloom_enabled">table.bloom.enabled</a> property to <code class="highlighter-rouge">true</code> in the shell:</p>
+setting the <a href="/docs/2.x/administration/properties#table_bloom_enabled">table.bloom.enabled</a> property to <code class="highlighter-rouge">true</code> in the shell:</p>
 
 <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>user@myinstance&gt; config -t mytable -s table.bloom.enabled=true
 </code></pre></div></div>
@@ -446,7 +446,7 @@ TabletServers when scanning or compacting data. This allows users to efficiently
 summarize, filter, and aggregate data. In fact, the built-in features of cell-level
 security and column fetching are implemented using Iterators.
 Some useful Iterators are provided with Accumulo and can be found in the
-<a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/user/package-summary.html">org.apache.accumulo.core.iterators.user</a> package.
+<a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/user/package-summary.html">org.apache.accumulo.core.iterators.user</a> package.
 In each case, any custom Iterators must be included in Accumulo’s classpath,
 typically by including a jar in <code class="highlighter-rouge">lib/</code> or <code class="highlighter-rouge">lib/ext/</code>, although the VFS classloader
 allows for classpath manipulation using a variety of schemes including URLs and HDFS URIs.</p>
@@ -454,7 +454,7 @@ allows for classpath manipulation using a variety of schemes including URLs and
 <h3 id="setting-iterators-via-the-shell">Setting Iterators via the Shell</h3>
 
 <p>Iterators can be configured on a table at scan, minor compaction and/or major
-compaction scopes. If the Iterator implements the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/OptionDescriber.html">OptionDescriber</a> interface, the
+compaction scopes. If the Iterator implements the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/OptionDescriber.html">OptionDescriber</a> interface, the
 setiter command can be used which will interactively prompt the user to provide
 values for the given necessary options.</p>
 
@@ -466,7 +466,7 @@ user@myinstance mytable&gt; setiter -t mytable -scan -p 15 -n myiter -class com.
 </code></pre></div></div>
 
 <p>The config command can always be used to manually configure iterators which is useful
-in cases where the Iterator does not implement the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/OptionDescriber.html">OptionDescriber</a> interface.</p>
+in cases where the Iterator does not implement the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/OptionDescriber.html">OptionDescriber</a> interface.</p>
 
 <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>config -t mytable -s table.iterator.scan.myiter=15,com.company.MyIterator
 config -t mytable -s table.iterator.minc.myiter=15,com.company.MyIterator
@@ -562,10 +562,10 @@ are removed from disk as part of the regular garbage collection process.</p>
 <h3 id="filters">Filters</h3>
 
 <p>When scanning over a set of key-value pairs it is possible to apply an arbitrary
-filtering policy through the use of a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/Filter.html">Filter</a>. Filters are types of iterators that return
+filtering policy through the use of a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/Filter.html">Filter</a>. Filters are types of iterators that return
 only key-value pairs that satisfy the filter logic. Accumulo has a few built-in filters
 that can be configured on any table: AgeOff, ColumnAgeOff, Timestamp, NoVis, and RegEx. More can be added
-by writing a Java class that extends the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/Filter.html">Filter</a> class.</p>
+by writing a Java class that extends the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/Filter.html">Filter</a> class.</p>
 
 <p>The AgeOff filter can be configured to remove data older than a certain date or a fixed
 amount of time from the present. The following example sets a table to delete
@@ -667,17 +667,17 @@ foo day:20080103 []    1
 </code></pre></div></div>
 
 <p>Accumulo includes some useful Combiners out of the box. To find these look in
-the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/user/package-summary.html">org.apache.accumulo.core.iterators.user</a> package.</p>
+the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/user/package-summary.html">org.apache.accumulo.core.iterators.user</a> package.</p>
 
 <p>Additional Combiners can be added by creating a Java class that extends
-<a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.2/org/apache/accumulo/core/iterators/Combiner.html">Combiner</a> and adding a jar containing that class to Accumulo’s <code class="highlighter-rouge">lib/ext</code> directory.</p>
+<a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-1/org/apache/accumulo/core/iterators/Combiner.html">Combiner</a> and adding a jar containing that class to Accumulo’s <code class="highlighter-rouge">lib/ext</code> directory.</p>
 
 <p>See the <a href="https://github.com/apache/accumulo-examples/blob/master/docs/combiner.md">combiner example</a> for example code.</p>
 
 <h2 id="block-cache">Block Cache</h2>
 
 <p>A Block Cache can be enabled on tables to limit reads from disk which can result
-in reduced read latency. Read the <a href="/docs/2.0/administration/caching">Caching</a> documentation to learn more.</p>
+in reduced read latency. Read the <a href="/docs/2.x/administration/caching">Caching</a> documentation to learn more.</p>
 
 <h2 id="compaction">Compaction</h2>
 
@@ -687,7 +687,7 @@ added to tablets directly by bulk import. In the background tablet servers run
 major compactions to merge multiple files into one. The tablet server has to
 decide which tablets to compact and which files within a tablet to compact.
 This decision is made using the compaction ratio, which is configurable on a
-per table basis by the <a href="/docs/2.0/administration/properties#table_compaction_major_ratio">table.compaction.major.ratio</a> property.</p>
+per table basis by the <a href="/docs/2.x/administration/properties#table_compaction_major_ratio">table.compaction.major.ratio</a> property.</p>
 
 <p>Increasing this ratio will result in more files per tablet and less compaction
 work. More files per tablet means more higher query latency. So adjusting
@@ -702,8 +702,8 @@ remaining files are considered for compaction. This is repeated until a
 compaction is triggered or there are no files left to consider.</p>
 
 <p>The number of background threads tablet servers use to run major and minor
-compactions is configured by the <a href="/docs/2.0/administration/properties#tserver_compaction_major_concurrent_max">tserver.compaction.major.concurrent.max</a>
-and <a href="/docs/2.0/administration/properties#tserver_compaction_minor_concurrent_max">tserver.compaction.minor.concurrent.max</a> properties respectively.</p>
+compactions is configured by the <a href="/docs/2.x/administration/properties#tserver_compaction_major_concurrent_max">tserver.compaction.major.concurrent.max</a>
+and <a href="/docs/2.x/administration/properties#tserver_compaction_minor_concurrent_max">tserver.compaction.minor.concurrent.max</a> properties respectively.</p>
 
 <p>The numbers of major and minor compactions running and queued is visible on the
 Accumulo monitor page. This allows you to see if compactions are backing up
@@ -725,7 +725,7 @@ alleviate backups by lowering the amount of major compaction work that needs to
 be done.</p>
 
 <p>Another option to deal with the files per tablet growing too large is to adjust
-the <a href="/docs/2.0/administration/properties#table_file_max">table.file.max</a> property. When a tablet reaches this number of files and needs
+the <a href="/docs/2.x/administration/properties#table_file_max">table.file.max</a> property. When a tablet reaches this number of files and needs
 to flush its in-memory data to disk, it will choose to do a merging minor compaction.
 A merging minor compaction will merge the tablet’s smallest file with the data in memory at
 minor compaction time. Therefore the number of files will not grow beyond this
@@ -757,21 +757,21 @@ This will only compact tablets that overlap the given row range.</p>
 
 <h3 id="compaction-strategies">Compaction Strategies</h3>
 
-<p>The default behavior of major compactions is defined in the class <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/1.9.2/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategy.html">DefaultCompactionStrategy</a>.
-This behavior can be changed by overriding <a href="/docs/2.0/administration/properties#table_majc_compaction_strategy">table.majc.compaction.strategy</a> with a fully
+<p>The default behavior of major compactions is defined in the class <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/2.0.0-alpha-1/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategy.html">DefaultCompactionStrategy</a>.
+This behavior can be changed by overriding <a href="/docs/2.x/administration/properties#table_majc_compaction_strategy">table.majc.compaction.strategy</a> with a fully
 qualified class name.</p>
 
 <p>Custom compaction strategies can have additional properties that are specified with the
-<a href="/docs/2.0/administration/properties#table_majc_compaction_strategy_opts_prefix">table.majc.compaction.strategy.opts.*</a> prefix.</p>
+<a href="/docs/2.x/administration/properties#table_majc_compaction_strategy_opts_prefix">table.majc.compaction.strategy.opts.*</a> prefix.</p>
 
 <p>Accumulo provides a few classes that can be used as an alternative compaction strategy. These classes are located in the 
-<a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/1.9.2/org/apache/accumulo/tserver/compaction/package-summary.html">org.apache.accumulo.tserver.compaction</a> package. <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/1.9.2/org/apache/accumulo/tserver/compaction/EverythingCompactionStrategy.html">EverythingCompactionStrategy</a>
-will simply compact all files. This is the strategy used by the user <code class="highlighter-rouge">compact</code> command. <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/1.9.2/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.html">SizeLimitCompactionStrategy</a> compacts files no bigger than the limit set in the property <code class="highlighter-rouge">table.majc.compaction.strategy.opts.sizeLimit</code>.</p>
+<a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/2.0.0-alpha-1/org/apache/accumulo/tserver/compaction/package-summary.html">org.apache.accumulo.tserver.compaction</a> package. <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/2.0.0-alpha-1/org/apache/accumulo/tserver/compaction/EverythingCompactionStrategy.html">EverythingCompactionStrategy</a>
+will simply compact all files. This is the strategy used by the user <code class="highlighter-rouge">compact</code> command. <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/2.0.0-alpha-1/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.html">SizeLimitCompactionStrategy</a> compacts files no bigger than the limit set in the property <code class="highlighter-rouge">table.majc.compaction.strategy.opts.sizeLimit</code>.</p>
 
-<p><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/1.9.2/org/apache/accumulo/tserver/compaction/TwoTierCompactionStrategy.html">TwoTierCompactionStrategy</a> is a hybrid compaction strategy that supports two types of compression. If the total size of
+<p><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-tserver/2.0.0-alpha-1/org/apache/accumulo/tserver/compaction/TwoTierCompactionStrategy.html">TwoTierCompactionStrategy</a> is a hybrid compaction strategy that supports two types of compression. If the total size of
 files being compacted is larger than <code class="highlighter-rouge">table.majc.compaction.strategy.opts.file.large.compress.threshold</code> than a larger 
 compression type will be used. The larger compression type is specified in <code class="highlighter-rouge">table.majc.compaction.strategy.opts.file.large.compress.type</code>. 
-Otherwise, the configured table compression will be used. To use this strategy with minor compactions set <a href="/docs/2.0/administration/properties#table_file_compress_type">table.file.compress.type</a> to <code class="highlighter-rouge">snappy</code> 
+Otherwise, the configured table compression will be used. To use this strategy with minor compactions set <a href="/docs/2.x/administration/properties#table_file_compress_type">table.file.compress.type</a> to <code class="highlighter-rouge">snappy</code> 
 and set a different compress type in <code class="highlighter-rouge">table.majc.compaction.strategy.opts.file.large.compress.type</code> for larger files.</p>
 
 <h2 id="pre-splitting-tables">Pre-splitting tables</h2>
@@ -1048,7 +1048,7 @@ preserved.</p>
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/getting-started/table_configuration.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/getting-started/table_configuration.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/getting-started/table_design.html b/docs/2.x/getting-started/table_design.html
similarity index 94%
rename from docs/2.0/getting-started/table_design.html
rename to docs/2.x/getting-started/table_design.html
index a64e0ca..d338b85 100644
--- a/docs/2.0/getting-started/table_design.html
+++ b/docs/2.x/getting-started/table_design.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,14 +332,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Getting started &nbsp;&gt;&gt;&nbsp; Table Design</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Getting started &nbsp;&gt;&gt;&nbsp; Table Design</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Table Design</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/getting-started/table_design.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/getting-started/table_design.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <h3 id="basic-table">Basic Table</h3>
@@ -808,7 +808,7 @@ as any others to the user.</p>
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/getting-started/table_design.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/getting-started/table_design.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/index.html b/docs/2.x/index.html
similarity index 65%
rename from docs/2.0/index.html
rename to docs/2.x/index.html
index f89090e..4bed998 100644
--- a/docs/2.0/index.html
+++ b/docs/2.x/index.html
@@ -2,10 +2,10 @@
 <html lang="en-US">
   <meta charset="utf-8">
   <title>Redirecting&hellip;</title>
-  <link rel="canonical" href="https://accumulo.apache.org/docs/2.0/getting-started/design">
-  <meta http-equiv="refresh" content="0; url=https://accumulo.apache.org/docs/2.0/getting-started/design">
+  <link rel="canonical" href="https://accumulo.apache.org/docs/2.x/getting-started/design">
+  <meta http-equiv="refresh" content="0; url=https://accumulo.apache.org/docs/2.x/getting-started/design">
   <meta name="robots" content="noindex">
   <h1>Redirecting&hellip;</h1>
-  <a href="https://accumulo.apache.org/docs/2.0/getting-started/design">Click here if you are not redirected.</a>
-  <script>location="https://accumulo.apache.org/docs/2.0/getting-started/design"</script>
+  <a href="https://accumulo.apache.org/docs/2.x/getting-started/design">Click here if you are not redirected.</a>
+  <script>location="https://accumulo.apache.org/docs/2.x/getting-started/design"</script>
 </html>
diff --git a/docs/2.0/troubleshooting/advanced.html b/docs/2.x/troubleshooting/advanced.html
similarity index 93%
rename from docs/2.0/troubleshooting/advanced.html
rename to docs/2.x/troubleshooting/advanced.html
index 58be618..7f28916 100644
--- a/docs/2.0/troubleshooting/advanced.html
+++ b/docs/2.x/troubleshooting/advanced.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,14 +332,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Troubleshooting &nbsp;&gt;&gt;&nbsp; Advanced Troubleshooting</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Troubleshooting &nbsp;&gt;&gt;&nbsp; Advanced Troubleshooting</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Advanced Troubleshooting</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/troubleshooting/advanced.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/troubleshooting/advanced.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <h2 id="tablet-server-locks">Tablet server locks</h2>
@@ -477,7 +477,7 @@ lost.</p>
 <p><strong>I lost three data nodes, and I’m missing blocks in a WAL.  I don’t care about data loss, how
 can I get those tablets online?</strong></p>
 
-<p>See the <a href="/docs/2.0/troubleshooting/system-metadata-tables">system metadata table page</a> which shows a typical metadata table listing.
+<p>See the <a href="/docs/2.x/troubleshooting/system-metadata-tables">system metadata table page</a> which shows a typical metadata table listing.
 The entries with a column family of <code class="highlighter-rouge">log</code> are references to the WAL for that tablet.
 If you know what WAL is bad, you can find all the references with a grep in the shell:</p>
 
@@ -568,7 +568,7 @@ hadoop fs -mv /path/to/empty/file/empty.rf /accumulo/tables/corrupt/file/thename
 
 <p><em>Metadata File Corruption</em></p>
 
-<p>If the corrupt files are metadata files, read the <a href="/docs/2.0/troubleshooting/system-metadata-tables">system metadata tables</a>
+<p>If the corrupt files are metadata files, read the <a href="/docs/2.x/troubleshooting/system-metadata-tables">system metadata tables</a>
 (under the path <code class="highlighter-rouge">/accumulo/tables/!0</code>). Then, you will need to rebuild
 the metadata table by initializing a new instance of Accumulo and then importing
 all of the existing data into the new instance.  This is the same procedure as
@@ -722,7 +722,7 @@ is struggling to keep up with ingest vs the compaction strategy which reduces th
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/troubleshooting/advanced.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/troubleshooting/advanced.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/troubleshooting/basic.html b/docs/2.x/troubleshooting/basic.html
similarity index 91%
rename from docs/2.0/troubleshooting/basic.html
rename to docs/2.x/troubleshooting/basic.html
index 0bf8b0b..5e788b5 100644
--- a/docs/2.0/troubleshooting/basic.html
+++ b/docs/2.x/troubleshooting/basic.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,14 +332,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Troubleshooting &nbsp;&gt;&gt;&nbsp; Basic Troubleshooting</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Troubleshooting &nbsp;&gt;&gt;&nbsp; Basic Troubleshooting</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Basic Troubleshooting</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/troubleshooting/basic.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/troubleshooting/basic.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <h2 id="general">General</h2>
@@ -474,7 +474,7 @@ processes should be stable on the order of months and not require frequent resta
 
 <p><strong>What are my visibilities?</strong></p>
 
-<p>Use the <a href="/docs/2.0/troubleshooting/tools#RFileInfo">rfile-info</a> tool on a representative file to get some idea
+<p>Use the <a href="/docs/2.x/troubleshooting/tools#RFileInfo">rfile-info</a> tool on a representative file to get some idea
 of the visibilities in the underlying data.</p>
 
 <p>Note that the use of <code class="highlighter-rouge">rfile-info</code> is an administrative tool and can only
@@ -486,7 +486,7 @@ does not provide the normal access controls in Accumulo.</p>
 <p><strong>Why does my ingest rate periodically go down during heavy ingest?</strong></p>
 
 <p>Periods of zero or low ingest rates can be caused by Java garbage collection pauses in tablet servers. This problem
-can be mitigated by <a href="/docs/2.0/administration/in-depth-install#native-map">enabling native maps in tablet servers</a>.</p>
+can be mitigated by <a href="/docs/2.x/administration/in-depth-install#native-map">enabling native maps in tablet servers</a>.</p>
 
 <h2 id="hdfs">HDFS</h2>
 
@@ -578,7 +578,7 @@ Node count: 22524
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/troubleshooting/basic.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/troubleshooting/basic.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/troubleshooting/performance.html b/docs/2.x/troubleshooting/performance.html
similarity index 83%
rename from docs/2.0/troubleshooting/performance.html
rename to docs/2.x/troubleshooting/performance.html
index 1e5159b..81537b7 100644
--- a/docs/2.0/troubleshooting/performance.html
+++ b/docs/2.x/troubleshooting/performance.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,14 +332,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Troubleshooting &nbsp;&gt;&gt;&nbsp; Performance</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Troubleshooting &nbsp;&gt;&gt;&nbsp; Performance</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>Performance</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/troubleshooting/performance.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/troubleshooting/performance.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <p>Accumulo can be tuned to improve read and write performance.</p>
@@ -348,20 +348,20 @@
 
 <ol>
   <li>
-    <p>Enable <a href="/docs/2.0/administration/caching">caching</a> on tables to reduce reads to disk.</p>
+    <p>Enable <a href="/docs/2.x/administration/caching">caching</a> on tables to reduce reads to disk.</p>
   </li>
   <li>
-    <p>Enable <a href="/docs/2.0/getting-started/table_configuration#bloom-filters">bloom filters</a> on tables to limit the number of disk lookups.</p>
+    <p>Enable <a href="/docs/2.x/getting-started/table_configuration#bloom-filters">bloom filters</a> on tables to limit the number of disk lookups.</p>
   </li>
   <li>
-    <p>Decrease the <a href="/docs/2.0/getting-started/table_configuration#compaction">major compaction ratio</a> of a table to decrease the number of
+    <p>Decrease the <a href="/docs/2.x/getting-started/table_configuration#compaction">major compaction ratio</a> of a table to decrease the number of
 files per tablet. Less files reduces the latency of reads.</p>
   </li>
   <li>
-    <p>Decrease the size of <a href="/docs/2.0/getting-started/design#rfile">data blocks in RFiles</a> by lowering <a href="/docs/2.0/administration/properties#table_file_compress_blocksize">table.file.compress.blocksize</a> which can result
+    <p>Decrease the size of <a href="/docs/2.x/getting-started/design#rfile">data blocks in RFiles</a> by lowering <a href="/docs/2.x/administration/properties#table_file_compress_blocksize">table.file.compress.blocksize</a> which can result
 in better random seek performance. However, this can increase the size of indexes in the RFile. If the indexes
 are too large to fit in cache, this can hinder performance. Also, as the index size increases the depth of the
-index tree in each file may increase. Increasing <a href="/docs/2.0/administration/properties#table_file_compress_blocksize_index">table.file.compress.blocksize.index</a> can reduce the depth of
+index tree in each file may increase. Increasing <a href="/docs/2.x/administration/properties#table_file_compress_blocksize_index">table.file.compress.blocksize.index</a> can reduce the depth of
 the tree.</p>
   </li>
 </ol>
@@ -370,24 +370,24 @@ the tree.</p>
 
 <ol>
   <li>
-    <p>Enable <a href="/docs/2.0/administration/in-depth-install#native-map">native maps</a> on tablet servers to prevent Java garbage collection pauses
+    <p>Enable <a href="/docs/2.x/administration/in-depth-install#native-map">native maps</a> on tablet servers to prevent Java garbage collection pauses
 which can slow ingest.</p>
   </li>
   <li>
-    <p><a href="/docs/2.0/getting-started/table_configuration#pre-splitting-tables">Pre-split new tables</a> to distribute writes across multiple tablet servers.</p>
+    <p><a href="/docs/2.x/getting-started/table_configuration#pre-splitting-tables">Pre-split new tables</a> to distribute writes across multiple tablet servers.</p>
   </li>
   <li>
-    <p>Ingest data using <a href="/docs/2.0/development/high_speed_ingest#multiple-ingest-clients">multiple clients</a> or <a href="/docs/2.0/development/high_speed_ingest#bulk-ingest">bulk ingest</a> to increase ingest throughput.</p>
+    <p>Ingest data using <a href="/docs/2.x/development/high_speed_ingest#multiple-ingest-clients">multiple clients</a> or <a href="/docs/2.x/development/high_speed_ingest#bulk-ingest">bulk ingest</a> to increase ingest throughput.</p>
   </li>
   <li>
-    <p>Increase the <a href="/docs/2.0/getting-started/table_configuration#compaction">major compaction ratio</a> of a table to limit the number of major compactions
+    <p>Increase the <a href="/docs/2.x/getting-started/table_configuration#compaction">major compaction ratio</a> of a table to limit the number of major compactions
 which improves ingest performance.</p>
   </li>
   <li>
-    <p>On large Accumulo clusters, use <a href="/docs/2.0/administration/multivolume">multiple HDFS volumes</a> to increase write performance.</p>
+    <p>On large Accumulo clusters, use <a href="/docs/2.x/administration/multivolume">multiple HDFS volumes</a> to increase write performance.</p>
   </li>
   <li>
-    <p>Change the compression format used by <a href="/docs/2.0/getting-started/design#rfile">blocks in RFiles</a> by setting <a href="/docs/2.0/administration/properties#table_file_compress_type">table.file.compress.type</a> to
+    <p>Change the compression format used by <a href="/docs/2.x/getting-started/design#rfile">blocks in RFiles</a> by setting <a href="/docs/2.x/administration/properties#table_file_compress_type">table.file.compress.type</a> to
 <code class="highlighter-rouge">snappy</code>. This increases write speed at the expense of using more disk space.</p>
   </li>
 </ol>
@@ -396,7 +396,7 @@ which improves ingest performance.</p>
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/troubleshooting/performance.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/troubleshooting/performance.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/troubleshooting/system-metadata-tables.html b/docs/2.x/troubleshooting/system-metadata-tables.html
similarity index 90%
rename from docs/2.0/troubleshooting/system-metadata-tables.html
rename to docs/2.x/troubleshooting/system-metadata-tables.html
index af2f9d4..574c213 100644
--- a/docs/2.0/troubleshooting/system-metadata-tables.html
+++ b/docs/2.x/troubleshooting/system-metadata-tables.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/advanced">Advanced Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/tools">Troubleshooting Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/tools">Troubleshooting Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/system-metadata-tables">System Metadata Tables</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/performance">Performance</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/performance">Performance</a></div>
                 
               </div>
             </div>
@@ -332,14 +332,14 @@
   </div>
   <div class="col-md-9">
     
-    <p>Accumulo 2.0 documentation &nbsp;&gt;&gt;&nbsp; Troubleshooting &nbsp;&gt;&gt;&nbsp; System Metadata Tables</p>
+    <p>Accumulo 2.x Documentation &nbsp;&gt;&gt;&nbsp; Troubleshooting &nbsp;&gt;&gt;&nbsp; System Metadata Tables</p>
     
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="/1.9/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
 
     <div class="row">
       <div class="col-md-10"><h1>System Metadata Tables</h1></div>
-      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/troubleshooting/system-metadata-tables.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/troubleshooting/system-metadata-tables.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>
 
     <p>Accumulo tracks information about tables in metadata tables. The metadata for
@@ -478,7 +478,7 @@ shell&gt; scan -b 3; -e 3&lt;
 
     <div class="row" style="margin-top: 20px;">
       <div class="col-md-10"><strong>Find documentation for all releases in the <a href="/docs-archive">archive</strong></div>
-      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2-0/troubleshooting/system-metadata-tables.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+      <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/master/_docs-2/troubleshooting/system-metadata-tables.md" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
     </div>  
   </div>
 </div>
diff --git a/docs/2.0/troubleshooting/tools.html b/docs/2.x/troubleshooting/tools.html
similarity index 90%
rename from docs/2.0/troubleshooting/tools.html
rename to docs/2.x/troubleshooting/tools.html
index f26a8c7..f22add0 100644
--- a/docs/2.0/troubleshooting/tools.html
+++ b/docs/2.x/troubleshooting/tools.html
@@ -172,17 +172,17 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/design">Accumulo Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/design">Accumulo Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/quick-install">Quick Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/quick-install">Quick Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/clients">Accumulo Clients</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/clients">Accumulo Clients</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/shell">Accumulo Shell</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/shell">Accumulo Shell</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_design">Table Design</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_design">Table Design</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/getting-started/table_configuration">Table Configuration</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/getting-started/table_configuration">Table Configuration</a></div>
                 
               </div>
             </div>
@@ -208,23 +208,23 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/iterators">Iterators</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/iterators">Iterators</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/mapreduce">MapReduce</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/mapreduce">MapReduce</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/proxy">Proxy</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/proxy">Proxy</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/development_tools">Development Tools</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/development_tools">Development Tools</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/sampling">Sampling</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/sampling">Sampling</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/summaries">Summary Statistics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/summaries">Summary Statistics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/security">Security</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/security">Security</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/high_speed_ingest">High-Speed Ingest</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/high_speed_ingest">High-Speed Ingest</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/development/client-properties">Client Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/development/client-properties">Client Properties</a></div>
                 
               </div>
             </div>
@@ -250,33 +250,33 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/in-depth-install">In-depth Installation</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/in-depth-install">In-depth Installation</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/configuration-management">Configuration Management</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/configuration-management">Configuration Management</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/properties">Server Properties</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/properties">Server Properties</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/monitoring-metrics">Monitoring & Metrics</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/monitoring-metrics">Monitoring & Metrics</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/tracing">Tracing</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/tracing">Tracing</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/fate">FATE</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/fate">FATE</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/multivolume">Multi-Volume Installations</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/multivolume">Multi-Volume Installations</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/ssl">SSL</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/ssl">SSL</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/kerberos">Kerberos</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/kerberos">Kerberos</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/replication">Replication</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/replication">Replication</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/caching">Caching</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/caching">Caching</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/upgrading">Upgrading Accumulo</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/upgrading">Upgrading Accumulo</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/scan-executors">Scan Executors</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/scan-executors">Scan Executors</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/administration/crypto">On Disk Encryption</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/administration/crypto">On Disk Encryption</a></div>
                 
               </div>
             </div>
@@ -312,15 +312,15 @@
               <div class="panel-body">
                 
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/basic">Basic Troubleshooting</a></div>
+                <div class="row doc-sidebar-link"><a href="/docs/2.x/troubleshooting/basic">Basic Troubleshooting</a></div>
                 
-                <div class="row doc-sidebar-link"><a href="/docs/2.0/troubleshooting/advanced">Advanced Troubleshooting</a></div>
... 494 lines suppressed ...


Mime
View raw message