You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2018/10/16 19:16:18 UTC
[accumulo-website] branch master updated: Consolidate docs for 2.x and later (#119)

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
     new e955987  Consolidate docs for 2.x and later (#119)
e955987 is described below

commit e955987d7e5f758b2e200ce51ed7076dbb38f2a8
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Tue Oct 16 15:16:14 2018 -0400

    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 +--
 _config.yml                                        | 32 +++++++++++-----------
 _docs-2-0/index.md                                 |  4 ---
 {_docs-2-0 => _docs-2}/administration/caching.md   |  0
 .../administration/configuration-management.md     |  0
 {_docs-2-0 => _docs-2}/administration/crypto.md    |  0
 {_docs-2-0 => _docs-2}/administration/fate.md      |  0
 .../administration/in-depth-install.md             |  0
 {_docs-2-0 => _docs-2}/administration/kerberos.md  |  0
 .../administration/monitoring-metrics.md           |  0
 .../administration/multivolume.md                  |  0
 .../administration/properties.md                   |  0
 .../administration/replication.md                  |  0
 .../administration/scan-executors.md               |  0
 {_docs-2-0 => _docs-2}/administration/ssl.md       |  0
 {_docs-2-0 => _docs-2}/administration/tracing.md   |  0
 {_docs-2-0 => _docs-2}/administration/upgrading.md |  0
 {2.x => _docs-2}/apidocs/allclasses-frame.html     |  0
 {2.x => _docs-2}/apidocs/allclasses-noframe.html   |  0
 {2.x => _docs-2}/apidocs/constant-values.html      |  0
 {2.x => _docs-2}/apidocs/deprecated-list.html      |  0
 {2.x => _docs-2}/apidocs/help-doc.html             |  0
 {2.x => _docs-2}/apidocs/index-all.html            |  0
 {2.x => _docs-2}/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}/apidocs/overview-frame.html       |  0
 {2.x => _docs-2}/apidocs/overview-summary.html     |  0
 {2.x => _docs-2}/apidocs/overview-tree.html        |  0
 {2.x => _docs-2}/apidocs/package-list              |  0
 {2.x => _docs-2}/apidocs/script.js                 |  0
 {2.x => _docs-2}/apidocs/serialized-form.html      |  0
 {2.x => _docs-2}/apidocs/stylesheet.css            |  0
 .../development/client-properties.md               |  0
 .../development/development_tools.md               |  0
 .../development/high_speed_ingest.md               |  0
 {_docs-2-0 => _docs-2}/development/iterators.md    |  0
 {_docs-2-0 => _docs-2}/development/mapreduce.md    |  0
 {_docs-2-0 => _docs-2}/development/proxy.md        |  0
 {_docs-2-0 => _docs-2}/development/sampling.md     |  0
 {_docs-2-0 => _docs-2}/development/security.md     |  0
 {_docs-2-0 => _docs-2}/development/summaries.md    |  0
 {_docs-2-0 => _docs-2}/getting-started/clients.md  |  0
 {_docs-2-0 => _docs-2}/getting-started/design.md   |  0
 .../getting-started/quick-install.md               |  0
 {_docs-2-0 => _docs-2}/getting-started/shell.md    |  0
 .../getting-started/table_configuration.md         |  0
 .../getting-started/table_design.md                |  0
 _docs-2/index.md                                   |  4 +++
 {_docs-2-0 => _docs-2}/troubleshooting/advanced.md |  0
 {_docs-2-0 => _docs-2}/troubleshooting/basic.md    |  0
 .../troubleshooting/performance.md                 |  0
 .../troubleshooting/system-metadata-tables.md      |  0
 {_docs-2-0 => _docs-2}/troubleshooting/tools.md    |  0
 _layouts/{default.hml => default.html}             |  0
 _layouts/{docs-2.0.html => docs-2.html}            |  4 +--
 contributor/making-release.md                      | 24 ++++++++--------
 latest/accumulo_user_manual/index.md               |  2 +-
 latest/apidocs/index.md                            |  4 +--
 latest/examples/index.md                           |  2 +-
 pages/downloads.md                                 | 12 ++++----
 search_data.json                                   |  2 +-
 549 files changed, 47 insertions(+), 47 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/_config.yml b/_config.yml
index 63d5ef2..6d8c1b9 100644
--- a/_config.yml
+++ b/_config.yml
@@ -19,16 +19,16 @@ latest_release: 2.0.0-alpha-1
 javadoc_version: 1.9.2
 num_home_posts: 5
 javadoc_base: "https://static.javadoc.io/org.apache.accumulo"
-docs_baseurl: "/docs/2.0"
+docs_baseurl: "/docs/2.x"
 
 # Build settings
 markdown: kramdown
 
 # Collection names cannot contain periods
 collections: 
-  docs-2-0:
+  docs-2:
     output: true
-    permalink: "/docs/2.0/:path"
+    permalink: "/docs/2.x/:path"
 
 defaults:
   -
@@ -39,6 +39,13 @@ defaults:
       layout: "default"
   -
     scope:
+      path: "tour"
+      type: "pages"
+    values:
+      layout: "tour"
+      permalink: "/tour/:basename/"
+  -
+    scope:
       path: "_posts/blog"
       type: "posts"
     values:
@@ -54,22 +61,15 @@ defaults:
       permalink: "/:categories/:title/"
   -
     scope:
-      path: "tour"
-      type: "pages"
-    values:
-      layout: "tour"
-      permalink: "/tour/:basename/"
-  -
-    scope:
       path: ""
-      type: "docs-2-0"
+      type: "docs-2"
     values:
-      layout: "docs-2.0"
+      layout: "docs-2"
       title_prefix: "Accumulo Documentation - "
-      version: "2.0"
-      latest_release: "2.0.0"
-      javadoc_version: "1.9.2"
-      docs_baseurl: "/docs/2.0"
+      version: "2.x"
+      latest_release: "2.0.0-alpha-1"
+      javadoc_version: "2.0.0-alpha-1"
+      docs_baseurl: "/docs/2.x"
       javadoc_base: "https://static.javadoc.io/org.apache.accumulo"
       skiph1fortitle: "true"
 
diff --git a/_docs-2-0/index.md b/_docs-2-0/index.md
deleted file mode 100644
index d42fc30..0000000
--- a/_docs-2-0/index.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Apache Accumulo documentation
-redirect_to: /docs/2.0/getting-started/design
----
diff --git a/_docs-2-0/administration/caching.md b/_docs-2/administration/caching.md
similarity index 100%
rename from _docs-2-0/administration/caching.md
rename to _docs-2/administration/caching.md
diff --git a/_docs-2-0/administration/configuration-management.md b/_docs-2/administration/configuration-management.md
similarity index 100%
rename from _docs-2-0/administration/configuration-management.md
rename to _docs-2/administration/configuration-management.md
diff --git a/_docs-2-0/administration/crypto.md b/_docs-2/administration/crypto.md
similarity index 100%
rename from _docs-2-0/administration/crypto.md
rename to _docs-2/administration/crypto.md
diff --git a/_docs-2-0/administration/fate.md b/_docs-2/administration/fate.md
similarity index 100%
rename from _docs-2-0/administration/fate.md
rename to _docs-2/administration/fate.md
diff --git a/_docs-2-0/administration/in-depth-install.md b/_docs-2/administration/in-depth-install.md
similarity index 100%
rename from _docs-2-0/administration/in-depth-install.md
rename to _docs-2/administration/in-depth-install.md
diff --git a/_docs-2-0/administration/kerberos.md b/_docs-2/administration/kerberos.md
similarity index 100%
rename from _docs-2-0/administration/kerberos.md
rename to _docs-2/administration/kerberos.md
diff --git a/_docs-2-0/administration/monitoring-metrics.md b/_docs-2/administration/monitoring-metrics.md
similarity index 100%
rename from _docs-2-0/administration/monitoring-metrics.md
rename to _docs-2/administration/monitoring-metrics.md
diff --git a/_docs-2-0/administration/multivolume.md b/_docs-2/administration/multivolume.md
similarity index 100%
rename from _docs-2-0/administration/multivolume.md
rename to _docs-2/administration/multivolume.md
diff --git a/_docs-2-0/administration/properties.md b/_docs-2/administration/properties.md
similarity index 100%
rename from _docs-2-0/administration/properties.md
rename to _docs-2/administration/properties.md
diff --git a/_docs-2-0/administration/replication.md b/_docs-2/administration/replication.md
similarity index 100%
rename from _docs-2-0/administration/replication.md
rename to _docs-2/administration/replication.md
diff --git a/_docs-2-0/administration/scan-executors.md b/_docs-2/administration/scan-executors.md
similarity index 100%
rename from _docs-2-0/administration/scan-executors.md
rename to _docs-2/administration/scan-executors.md
diff --git a/_docs-2-0/administration/ssl.md b/_docs-2/administration/ssl.md
similarity index 100%
rename from _docs-2-0/administration/ssl.md
rename to _docs-2/administration/ssl.md
diff --git a/_docs-2-0/administration/tracing.md b/_docs-2/administration/tracing.md
similarity index 100%
rename from _docs-2-0/administration/tracing.md
rename to _docs-2/administration/tracing.md
diff --git a/_docs-2-0/administration/upgrading.md b/_docs-2/administration/upgrading.md
similarity index 100%
rename from _docs-2-0/administration/upgrading.md
rename to _docs-2/administration/upgrading.md
diff --git a/2.x/apidocs/allclasses-frame.html b/_docs-2/apidocs/allclasses-frame.html
similarity index 100%
rename from 2.x/apidocs/allclasses-frame.html
rename to _docs-2/apidocs/allclasses-frame.html
diff --git a/2.x/apidocs/allclasses-noframe.html b/_docs-2/apidocs/allclasses-noframe.html
similarity index 100%
rename from 2.x/apidocs/allclasses-noframe.html
rename to _docs-2/apidocs/allclasses-noframe.html
diff --git a/2.x/apidocs/constant-values.html b/_docs-2/apidocs/constant-values.html
similarity index 100%
rename from 2.x/apidocs/constant-values.html
rename to _docs-2/apidocs/constant-values.html
diff --git a/2.x/apidocs/deprecated-list.html b/_docs-2/apidocs/deprecated-list.html
similarity index 100%
rename from 2.x/apidocs/deprecated-list.html
rename to _docs-2/apidocs/deprecated-list.html
diff --git a/2.x/apidocs/help-doc.html b/_docs-2/apidocs/help-doc.html
similarity index 100%
rename from 2.x/apidocs/help-doc.html
rename to _docs-2/apidocs/help-doc.html
diff --git a/2.x/apidocs/index-all.html b/_docs-2/apidocs/index-all.html
similarity index 100%
rename from 2.x/apidocs/index-all.html
rename to _docs-2/apidocs/index-all.html
diff --git a/2.x/apidocs/index.html b/_docs-2/apidocs/index.html
similarity index 100%
rename from 2.x/apidocs/index.html
rename to _docs-2/apidocs/index.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/Accumulo.html b/_docs-2/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/apidocs/org/apache/accumulo/core/client/AccumuloClient.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/AccumuloException.html b/_docs-2/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/apidocs/org/apache/accumulo/core/client/AccumuloException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/AccumuloSecurityException.html b/_docs-2/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/apidocs/org/apache/accumulo/core/client/AccumuloSecurityException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/BatchDeleter.html b/_docs-2/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/apidocs/org/apache/accumulo/core/client/BatchDeleter.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/BatchScanner.html b/_docs-2/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/apidocs/org/apache/accumulo/core/client/BatchScanner.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/BatchWriter.html b/_docs-2/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/apidocs/org/apache/accumulo/core/client/BatchWriter.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/BatchWriterConfig.html b/_docs-2/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/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/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/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/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/apidocs/org/apache/accumulo/core/client/ClientConfiguration.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/ClientInfo.html b/_docs-2/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/apidocs/org/apache/accumulo/core/client/ClientInfo.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/ClientSideIteratorScanner.html b/_docs-2/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/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/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/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/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/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/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/apidocs/org/apache/accumulo/core/client/ConditionalWriter.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/ConditionalWriterConfig.html b/_docs-2/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/apidocs/org/apache/accumulo/core/client/ConditionalWriterConfig.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/Connector.html b/_docs-2/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/apidocs/org/apache/accumulo/core/client/Connector.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/Durability.html b/_docs-2/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/apidocs/org/apache/accumulo/core/client/Durability.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/Instance.html b/_docs-2/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/apidocs/org/apache/accumulo/core/client/IteratorSetting.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/MultiTableBatchWriter.html b/_docs-2/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/apidocs/org/apache/accumulo/core/client/MultiTableBatchWriter.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/MutationsRejectedException.html b/_docs-2/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/apidocs/org/apache/accumulo/core/client/MutationsRejectedException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/NamespaceExistsException.html b/_docs-2/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/apidocs/org/apache/accumulo/core/client/NamespaceExistsException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/NamespaceNotEmptyException.html b/_docs-2/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/apidocs/org/apache/accumulo/core/client/NamespaceNotEmptyException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/NamespaceNotFoundException.html b/_docs-2/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/apidocs/org/apache/accumulo/core/client/NamespaceNotFoundException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/RowIterator.html b/_docs-2/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/apidocs/org/apache/accumulo/core/client/RowIterator.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/SampleNotPresentException.html b/_docs-2/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/apidocs/org/apache/accumulo/core/client/SampleNotPresentException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/Scanner.html b/_docs-2/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/apidocs/org/apache/accumulo/core/client/Scanner.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/ScannerBase.html b/_docs-2/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/apidocs/org/apache/accumulo/core/client/ScannerBase.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/TableDeletedException.html b/_docs-2/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/apidocs/org/apache/accumulo/core/client/TableDeletedException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/TableExistsException.html b/_docs-2/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/apidocs/org/apache/accumulo/core/client/TableExistsException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/TableNotFoundException.html b/_docs-2/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/apidocs/org/apache/accumulo/core/client/TableNotFoundException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/TableOfflineException.html b/_docs-2/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/apidocs/org/apache/accumulo/core/client/TableOfflineException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/TimedOutException.html b/_docs-2/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/apidocs/org/apache/accumulo/core/client/TimedOutException.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/client/ZooKeeperInstance.html b/_docs-2/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/apidocs/org/apache/accumulo/core/data/ArrayByteSequence.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/ByteSequence.html b/_docs-2/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/apidocs/org/apache/accumulo/core/data/ByteSequence.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/Column.html b/_docs-2/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/apidocs/org/apache/accumulo/core/data/Column.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/ColumnUpdate.html b/_docs-2/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/apidocs/org/apache/accumulo/core/data/ColumnUpdate.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/Condition.html b/_docs-2/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/apidocs/org/apache/accumulo/core/data/Condition.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/ConditionalMutation.html b/_docs-2/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/apidocs/org/apache/accumulo/core/data/ConditionalMutation.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/ConstraintViolationSummary.html b/_docs-2/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/apidocs/org/apache/accumulo/core/data/ConstraintViolationSummary.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/Key.html b/_docs-2/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/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/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/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/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/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/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/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/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/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/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/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/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/apidocs/org/apache/accumulo/core/data/KeyBuilder.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/KeyValue.html b/_docs-2/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/apidocs/org/apache/accumulo/core/data/Mutation.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/PartialKey.html b/_docs-2/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/apidocs/org/apache/accumulo/core/data/PartialKey.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/Range.html b/_docs-2/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/apidocs/org/apache/accumulo/core/data/Range.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/data/TabletId.html b/_docs-2/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/apidocs/org/apache/accumulo/core/security/AuthorizationContainer.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/Authorizations.html b/_docs-2/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/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/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/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/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/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/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/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/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/apidocs/org/apache/accumulo/core/security/ColumnVisibility.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/NamespacePermission.html b/_docs-2/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/apidocs/org/apache/accumulo/core/security/NamespacePermission.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/SystemPermission.html b/_docs-2/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/apidocs/org/apache/accumulo/core/security/SystemPermission.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/TablePermission.html b/_docs-2/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/apidocs/org/apache/accumulo/core/security/TablePermission.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/VisibilityEvaluator.html b/_docs-2/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/apidocs/org/apache/accumulo/core/security/VisibilityEvaluator.html
diff --git a/2.x/apidocs/org/apache/accumulo/core/security/VisibilityParseException.html b/_docs-2/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/apidocs/org/apache/accumulo/core/security/package-use.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/MemoryUnit.html b/_docs-2/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/apidocs/org/apache/accumulo/minicluster/MemoryUnit.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloCluster.html b/_docs-2/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/apidocs/org/apache/accumulo/minicluster/MiniAccumuloCluster.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloConfig.html b/_docs-2/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/apidocs/org/apache/accumulo/minicluster/MiniAccumuloConfig.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloInstance.html b/_docs-2/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/apidocs/org/apache/accumulo/minicluster/MiniAccumuloInstance.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloRunner.Opts.html b/_docs-2/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/apidocs/org/apache/accumulo/minicluster/MiniAccumuloRunner.Opts.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloRunner.PropertiesConverter.html b/_docs-2/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/apidocs/org/apache/accumulo/minicluster/MiniAccumuloRunner.PropertiesConverter.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/MiniAccumuloRunner.html b/_docs-2/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/apidocs/org/apache/accumulo/minicluster/MiniAccumuloRunner.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/ServerType.html b/_docs-2/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/apidocs/org/apache/accumulo/minicluster/ServerType.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/class-use/MemoryUnit.html b/_docs-2/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/apidocs/org/apache/accumulo/minicluster/package-frame.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/package-summary.html b/_docs-2/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/apidocs/org/apache/accumulo/minicluster/package-summary.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/package-tree.html b/_docs-2/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/apidocs/org/apache/accumulo/minicluster/package-tree.html
diff --git a/2.x/apidocs/org/apache/accumulo/minicluster/package-use.html b/_docs-2/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/apidocs/org/apache/accumulo/minicluster/package-use.html
diff --git a/2.x/apidocs/overview-frame.html b/_docs-2/apidocs/overview-frame.html
similarity index 100%
rename from 2.x/apidocs/overview-frame.html
rename to _docs-2/apidocs/overview-frame.html
diff --git a/2.x/apidocs/overview-summary.html b/_docs-2/apidocs/overview-summary.html
similarity index 100%
rename from 2.x/apidocs/overview-summary.html
rename to _docs-2/apidocs/overview-summary.html
diff --git a/2.x/apidocs/overview-tree.html b/_docs-2/apidocs/overview-tree.html
similarity index 100%
rename from 2.x/apidocs/overview-tree.html
rename to _docs-2/apidocs/overview-tree.html
diff --git a/2.x/apidocs/package-list b/_docs-2/apidocs/package-list
similarity index 100%
rename from 2.x/apidocs/package-list
rename to _docs-2/apidocs/package-list
diff --git a/2.x/apidocs/script.js b/_docs-2/apidocs/script.js
similarity index 100%
rename from 2.x/apidocs/script.js
rename to _docs-2/apidocs/script.js
diff --git a/2.x/apidocs/serialized-form.html b/_docs-2/apidocs/serialized-form.html
similarity index 100%
rename from 2.x/apidocs/serialized-form.html
rename to _docs-2/apidocs/serialized-form.html
diff --git a/2.x/apidocs/stylesheet.css b/_docs-2/apidocs/stylesheet.css
similarity index 100%
rename from 2.x/apidocs/stylesheet.css
rename to _docs-2/apidocs/stylesheet.css
diff --git a/_docs-2-0/development/client-properties.md b/_docs-2/development/client-properties.md
similarity index 100%
rename from _docs-2-0/development/client-properties.md
rename to _docs-2/development/client-properties.md
diff --git a/_docs-2-0/development/development_tools.md b/_docs-2/development/development_tools.md
similarity index 100%
rename from _docs-2-0/development/development_tools.md
rename to _docs-2/development/development_tools.md
diff --git a/_docs-2-0/development/high_speed_ingest.md b/_docs-2/development/high_speed_ingest.md
similarity index 100%
rename from _docs-2-0/development/high_speed_ingest.md
rename to _docs-2/development/high_speed_ingest.md
diff --git a/_docs-2-0/development/iterators.md b/_docs-2/development/iterators.md
similarity index 100%
rename from _docs-2-0/development/iterators.md
rename to _docs-2/development/iterators.md
diff --git a/_docs-2-0/development/mapreduce.md b/_docs-2/development/mapreduce.md
similarity index 100%
rename from _docs-2-0/development/mapreduce.md
rename to _docs-2/development/mapreduce.md
diff --git a/_docs-2-0/development/proxy.md b/_docs-2/development/proxy.md
similarity index 100%
rename from _docs-2-0/development/proxy.md
rename to _docs-2/development/proxy.md
diff --git a/_docs-2-0/development/sampling.md b/_docs-2/development/sampling.md
similarity index 100%
rename from _docs-2-0/development/sampling.md
rename to _docs-2/development/sampling.md
diff --git a/_docs-2-0/development/security.md b/_docs-2/development/security.md
similarity index 100%
rename from _docs-2-0/development/security.md
rename to _docs-2/development/security.md
diff --git a/_docs-2-0/development/summaries.md b/_docs-2/development/summaries.md
similarity index 100%
rename from _docs-2-0/development/summaries.md
rename to _docs-2/development/summaries.md
diff --git a/_docs-2-0/getting-started/clients.md b/_docs-2/getting-started/clients.md
similarity index 100%
rename from _docs-2-0/getting-started/clients.md
rename to _docs-2/getting-started/clients.md
diff --git a/_docs-2-0/getting-started/design.md b/_docs-2/getting-started/design.md
similarity index 100%
rename from _docs-2-0/getting-started/design.md
rename to _docs-2/getting-started/design.md
diff --git a/_docs-2-0/getting-started/quick-install.md b/_docs-2/getting-started/quick-install.md
similarity index 100%
rename from _docs-2-0/getting-started/quick-install.md
rename to _docs-2/getting-started/quick-install.md
diff --git a/_docs-2-0/getting-started/shell.md b/_docs-2/getting-started/shell.md
similarity index 100%
rename from _docs-2-0/getting-started/shell.md
rename to _docs-2/getting-started/shell.md
diff --git a/_docs-2-0/getting-started/table_configuration.md b/_docs-2/getting-started/table_configuration.md
similarity index 100%
rename from _docs-2-0/getting-started/table_configuration.md
rename to _docs-2/getting-started/table_configuration.md
diff --git a/_docs-2-0/getting-started/table_design.md b/_docs-2/getting-started/table_design.md
similarity index 100%
rename from _docs-2-0/getting-started/table_design.md
rename to _docs-2/getting-started/table_design.md
diff --git a/_docs-2/index.md b/_docs-2/index.md
new file mode 100644
index 0000000..51de7fa
--- /dev/null
+++ b/_docs-2/index.md
@@ -0,0 +1,4 @@
+---
+title: Apache Accumulo Documentation
+redirect_to: /docs/2.x/getting-started/design
+---
diff --git a/_docs-2-0/troubleshooting/advanced.md b/_docs-2/troubleshooting/advanced.md
similarity index 100%
rename from _docs-2-0/troubleshooting/advanced.md
rename to _docs-2/troubleshooting/advanced.md
diff --git a/_docs-2-0/troubleshooting/basic.md b/_docs-2/troubleshooting/basic.md
similarity index 100%
rename from _docs-2-0/troubleshooting/basic.md
rename to _docs-2/troubleshooting/basic.md
diff --git a/_docs-2-0/troubleshooting/performance.md b/_docs-2/troubleshooting/performance.md
similarity index 100%
rename from _docs-2-0/troubleshooting/performance.md
rename to _docs-2/troubleshooting/performance.md
diff --git a/_docs-2-0/troubleshooting/system-metadata-tables.md b/_docs-2/troubleshooting/system-metadata-tables.md
similarity index 100%
rename from _docs-2-0/troubleshooting/system-metadata-tables.md
rename to _docs-2/troubleshooting/system-metadata-tables.md
diff --git a/_docs-2-0/troubleshooting/tools.md b/_docs-2/troubleshooting/tools.md
similarity index 100%
rename from _docs-2-0/troubleshooting/tools.md
rename to _docs-2/troubleshooting/tools.md
diff --git a/_layouts/default.hml b/_layouts/default.html
similarity index 100%
rename from _layouts/default.hml
rename to _layouts/default.html
diff --git a/_layouts/docs-2.0.html b/_layouts/docs-2.html
similarity index 95%
rename from _layouts/docs-2.0.html
rename to _layouts/docs-2.html
index 490806a..026d0b7 100644
--- a/_layouts/docs-2.0.html
+++ b/_layouts/docs-2.html
@@ -7,7 +7,7 @@ skiph1fortitle: true
   <div class="col-md-3">
     <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true" data-spy="affix">
       <div class="panel panel-default">
-      {% assign mydocs = site.docs-2-0 | group_by: 'category' %}
+      {% assign mydocs = site.docs-2 | group_by: 'category' %}
       {% assign categories = "getting-started,development,administration,troubleshooting" | split: "," %}
       {% for pcat in categories %}
         {% for dcat in mydocs %}
@@ -35,7 +35,7 @@ skiph1fortitle: true
   </div>
   <div class="col-md-9">
     {% if page.category %}
-    <p>Accumulo {{ page.version }} documentation &nbsp;&gt;&gt;&nbsp; {{ page.category | capitalize | replace: "-", " " }} &nbsp;&gt;&gt;&nbsp; {{ page.title }}</p>
+    <p>Accumulo {{ page.version }} Documentation &nbsp;&gt;&gt;&nbsp; {{ page.category | capitalize | replace: "-", " " }} &nbsp;&gt;&gt;&nbsp; {{ page.title }}</p>
     {% endif %}
 
     <div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">This documentation is for a future release of Accumulo! <a href="{{ site.baseurl }}/{{ site.latest_minor_release }}/accumulo_user_manual.html">View documentation for the latest release</a>.</div>
diff --git a/contributor/making-release.md b/contributor/making-release.md
index 63e5bb9..7a354c7 100644
--- a/contributor/making-release.md
+++ b/contributor/making-release.md
@@ -131,34 +131,34 @@ After a successful vote, [this website][website-repo] needs to be updated with t
 Starting with 2.0.0, the source code for the Accumulo documentation was moved to the [accumulo-website repo][website-repo] except
 for two markdown files that should be changed in the Accumulo repo and copied/mirrored to the website repo for releases.
 
-1. `INSTALL.md` is mirrored from Accumulo repo using a tool like `meld`.
+1. `INSTALL.md` is mirrored from Accumulo repo using a diff tool like `meld` or `vimdiff`.
 
         meld /path/to/accumulo/INSTALL.md /path/to/accumulo-website/_docs-2-x/getting-started/quick-install.md
 
-2. `properties.md` is copied after it is generated by the Accumulo build.
+2. `properties.md` and `client-properties.md` should be copied after it is generated by the Accumulo build.
 
-        cp /path/to/accumulo/core/target/generated-docs/properties.md /path/to/accumulo-website/_docs-2-x/administration/properties.md
+        cp /path/to/accumulo/core/target/generated-docs/{,client-}properties.md /path/to/accumulo-website/_docs-2-x/administration/properties.md
 
-**For 2.x minor releases,** follow the steps below to create docs for next release:
+**For major releases,** follow the steps below to create docs for next release:
 
-1. Create a new documentation collection for the new minor release (i.e `2.0`) using the collection of the last release. Avoid using a dot `.` in
+1. Create a new documentation collection for the new major release (i.e `3.x`) using the collection of the last release. Avoid using a dot `.` in
    the directory name:
 
-        cp -r _docs-2-0 _docs-2-1
+        cp -r _docs-2 _docs-3
 
-2. Create a new doc layout using the previous layout. Update the reference to `site.docs-2-0` to `site.docs-2-1` (if creating 2.1 docs):
+2. Create a new doc layout using the previous layout. Update the reference to `site.docs-2` to `site.docs-3` (if creating 3.x docs):
 
-        cp _layouts/docs-2.0.html _layouts/docs-2.1.html
-        vim _layouts/docs-2.1.html
+        cp _layouts/docs-3.html _layouts/docs-3.html
+        vim _layouts/docs-3.html
 
 3. Point Jekyll to the new documentation collection by modifying `collections` and `defaults` in `_config.yml`. Follow what was done for previous
    releases.
 
-4. Copy `properties.md` and mirror `INSTALL.md`.
+4. Copy `properties.md` and `client-properties.md`, and mirror `INSTALL.md`.
 
-Once a collection is created for a 2.x minor release, developers can make documentation updates like normal website updates.
+Once a collection is created for a major release, developers can make documentation updates like normal website updates.
 
-**For 2.x bugfix releases,** copy `properties.md` and mirror `INSTALL.md`.
+**For 2.x minor & bugfix releases,** copy `properties.md` and `client-properties.md`, and mirror `INSTALL.md`.
 
 **For 1.x minor & bugfix releases,** copy `accumulo_user_manual.html` generated for release to the `1.x/` directory in the [accumulo-website repo][website-repo].
 
diff --git a/latest/accumulo_user_manual/index.md b/latest/accumulo_user_manual/index.md
index 8905745..b261465 100644
--- a/latest/accumulo_user_manual/index.md
+++ b/latest/accumulo_user_manual/index.md
@@ -1,6 +1,6 @@
 ---
 title: Latest User Manual
-redirect_to: /1.9/accumulo_user_manual
+redirect_to: /docs/2.x/
 ---
 
 This page redirects to the latest Accumulo User Manual
diff --git a/latest/apidocs/index.md b/latest/apidocs/index.md
index 1d01107..afa214d 100644
--- a/latest/apidocs/index.md
+++ b/latest/apidocs/index.md
@@ -1,6 +1,6 @@
 ---
-title: Latest User Manual
-redirect_to: /1.9/apidocs/
+title: Latest Java API
+redirect_to: /docs/2.x/apidocs/
 ---
 
 This page redirects to the latest Accumulo apidocs
diff --git a/latest/examples/index.md b/latest/examples/index.md
index 5f740f0..81cbcdf 100644
--- a/latest/examples/index.md
+++ b/latest/examples/index.md
@@ -1,6 +1,6 @@
 ---
 title: Latest Accumulo Examples
-redirect_to: /1.9/examples
+redirect_to: https://github.com/apache/accumulo-examples
 ---
 
 This page redirects to the latest Accumulo Examples
diff --git a/pages/downloads.md b/pages/downloads.md
index 74bd8d3..ffab43e 100644
--- a/pages/downloads.md
+++ b/pages/downloads.md
@@ -105,8 +105,8 @@ and should be used for feedback and testing purposes only. See the
 
 #### 2.0 Documentation
 * [README][README_20]
-* [Online User Manual][MANUAL_20]
-* [Javadoc][JAVADOC_20]
+* [Online Documentation][MANUAL_20]
+* [Java API][JAVADOC_20]
 
 ### 1.9.2 **latest**{: .label .label-primary }
 
@@ -120,7 +120,7 @@ The most recent stable Apache Accumulo&reg; release is version 1.9.2. See the [r
 * [README][README_19]
 * [User Manual][MANUAL_19]
 * [Examples][EXAMPLES_19]
-* [Javadoc][JAVADOC_19]
+* [Java API][JAVADOC_19]
 
 ## Older releases
 
@@ -155,12 +155,12 @@ downloaded from the [download archive][ARCHIVE_DOWN].
 [README_19]: https://github.com/apache/accumulo/blob/rel/1.9.2/README.md
 {: .download_external id="/1.9/README" }
 
-[JAVADOC_20]: {{ site.baseurl }}/2.x/apidocs/
-{: .download_external id="/2.x/apidocs/" }
+[JAVADOC_20]: {{ site.baseurl }}/docs/2.x/apidocs/
+{: .download_external id="/docs/2.x/apidocs/" }
 [JAVADOC_19]: {{ site.baseurl }}/1.9/apidocs/
 {: .download_external id="/1.9/apidocs/" }
 
-[MANUAL_20]: {{ site.baseurl }}/docs/2.0 "2.0 online manual"
+[MANUAL_20]: {{ site.baseurl }}/docs/2.x "2.x online manual"
 [MANUAL_19]: {{ site.baseurl }}/1.9/accumulo_user_manual "1.9 user manual"
 
 [EXAMPLES_19]: {{ site.baseurl }}/1.9/examples "1.9 examples"
diff --git a/search_data.json b/search_data.json
index 91b0b62..e880a11 100644
--- a/search_data.json
+++ b/search_data.json
@@ -2,7 +2,7 @@
 layout: null
 ---
 {
-  {% for post in site.docs-2-0 %}
+  {% for post in site.docs-2 %}
     "{{ post.url | slugify }}": {
       "title": "{{ post.title | xml_escape }}",
       "content"	 : "{{post.content | strip_html | strip_newlines | remove:  "	" | escape | remove: "\"}}",