accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [accumulo-website] 02/02: Jekyll build from master:26f88f7
Date Fri, 12 Jul 2019 20:37:19 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit 3bec47a3840248b8f742a4fdd582e996382b5e70
Author: Christopher Tubbs <ctubbsii@apache.org>
AuthorDate: Fri Jul 12 16:32:41 2019 -0400

    Jekyll build from master:26f88f7
    
    Update gems (bundle update)
---
 1.3/user_manual/examples/filter.html              | 32 +++++-----
 1.4/examples/combiner.html                        | 18 +++---
 1.4/examples/filter.html                          | 16 ++---
 1.4/examples/mapred.html                          | 14 ++---
 1.4/user_manual/Table_Configuration.html          |  8 +--
 1.5/examples/combiner.html                        | 18 +++---
 1.5/examples/filter.html                          | 16 ++---
 1.5/examples/mapred.html                          | 14 ++---
 1.6/examples/combiner.html                        | 18 +++---
 1.6/examples/filter.html                          | 16 ++---
 1.6/examples/mapred.html                          | 14 ++---
 1.7/examples/combiner.html                        | 18 +++---
 1.7/examples/filter.html                          | 16 ++---
 1.7/examples/mapred.html                          | 14 ++---
 1.9/examples/combiner.html                        | 18 +++---
 1.9/examples/filter.html                          | 16 ++---
 1.9/examples/mapred.html                          | 14 ++---
 blog/2017/04/21/introducing-uno-and-muchos.html   |  2 +-
 contributor/testing-release.html                  |  4 +-
 docs/2.x/configuration/files.html                 |  2 +-
 docs/2.x/development/development_tools.html       | 42 ++++++-------
 docs/2.x/development/iterators.html               | 40 ++++++------
 docs/2.x/development/mapreduce.html               | 76 +++++++++++------------
 docs/2.x/development/proxy.html                   | 22 +++----
 docs/2.x/development/spark.html                   | 38 ++++++------
 docs/2.x/getting-started/clients.html             | 50 +++++++--------
 docs/2.x/getting-started/table_configuration.html | 24 +++----
 docs/2.x/getting-started/table_design.html        | 60 +++++++++---------
 docs/2.x/security/authentication.html             |  6 +-
 docs/2.x/security/authorizations.html             |  8 +--
 docs/2.x/security/kerberos.html                   | 12 ++--
 docs/2.x/security/on-disk-encryption.html         | 10 +--
 docs/2.x/security/permissions.html                |  4 +-
 docs/2.x/troubleshooting/tracing.html             | 32 +++++-----
 feed.xml                                          |  6 +-
 tour/authorizations-code/index.html               | 32 +++++-----
 tour/authorizations/index.html                    | 10 +--
 tour/basic-read-write/index.html                  | 16 ++---
 tour/batch-scanner-code/index.html                | 30 ++++-----
 tour/batch-scanner/index.html                     | 10 +--
 tour/conditional-writer-code/index.html           | 12 ++--
 tour/conditional-writer/index.html                | 42 ++++++-------
 tour/data-model-code/index.html                   | 20 +++---
 tour/data-model/index.html                        |  2 +-
 tour/getting-started/index.html                   |  4 +-
 tour/ranges-splits/index.html                     |  8 +--
 46 files changed, 452 insertions(+), 452 deletions(-)

diff --git a/1.3/user_manual/examples/filter.html b/1.3/user_manual/examples/filter.html
index d353be0..d8a7132 100644
--- a/1.3/user_manual/examples/filter.html
+++ b/1.3/user_manual/examples/filter.html
@@ -145,22 +145,22 @@ ones).  Filters implement the org.apache.accumulo.core.iterators.iterators.filte
 contains a method accept(Key k, Value v).  This method returns true if the key, 
 value pair are to be delivered and false if they are to be ignored.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>username@instance&gt; createtable filtertest
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">username@instance&gt; createtable filtertest
 username@instance filtertest&gt; setiter -t filtertest -scan -p 10 -n myfilter -filter
 FilteringIterator uses Filters to accept or reject key/value pairs
-<span class="gd">----------&gt; entering options: &lt;filterPriorityNumber&gt; &lt;ageoff|regex|filterClass&gt;
+</span><span class="gd">----------&gt; entering options: &lt;filterPriorityNumber&gt; &lt;ageoff|regex|filterClass&gt;
 ----------&gt; set org.apache.accumulo.core.iterators.FilteringIterator option (&lt;name&gt; &lt;value&gt;, hit enter to skip): 0 ageoff
 ----------&gt; set org.apache.accumulo.core.iterators.FilteringIterator option (&lt;name&gt; &lt;value&gt;, hit enter to skip): 
-</span>AgeOffFilter removes entries with timestamps more than &lt;ttl&gt; milliseconds old
-<span class="gd">----------&gt; set org.apache.accumulo.core.iterators.filter.AgeOffFilter parameter currentTime, if set, use the given value as the absolute time in milliseconds as the current time of day: 
+</span><span class="p">AgeOffFilter removes entries with timestamps more than &lt;ttl&gt; milliseconds old
+</span><span class="gd">----------&gt; set org.apache.accumulo.core.iterators.filter.AgeOffFilter parameter currentTime, if set, use the given value as the absolute time in milliseconds as the current time of day: 
 ----------&gt; set org.apache.accumulo.core.iterators.filter.AgeOffFilter parameter ttl, time to live (milliseconds): 30000
-</span>username@instance filtertest&gt; 
-
+</span><span class="p">username@instance filtertest&gt; 
+</span>
 username@instance filtertest&gt; scan
-username@instance filtertest&gt; insert foo a b c
+<span class="p">username@instance filtertest&gt; insert foo a b c
 username@instance filtertest&gt; scan
 foo a:b []    c
-</code></pre></div></div>
+</span></code></pre></div></div>
 
 <p>… wait 30 seconds …</p>
 
@@ -179,22 +179,22 @@ on the “minc” and “majc” scopes you can flush and compact your table. Th
 happen automatically as a background operation on any table that is being 
 actively written to, but these are the commands to force compaction:</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>username@instance filtertest&gt; setiter -t filtertest -scan -minc -majc -p 10 -n myfilter -filter
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">username@instance filtertest&gt; setiter -t filtertest -scan -minc -majc -p 10 -n myfilter -filter
 FilteringIterator uses Filters to accept or reject key/value pairs
-<span class="gd">----------&gt; entering options: &lt;filterPriorityNumber&gt; &lt;ageoff|regex|filterClass&gt;
+</span><span class="gd">----------&gt; entering options: &lt;filterPriorityNumber&gt; &lt;ageoff|regex|filterClass&gt;
 ----------&gt; set org.apache.accumulo.core.iterators.FilteringIterator option (&lt;name&gt; &lt;value&gt;, hit enter to skip): 0 ageoff
 ----------&gt; set org.apache.accumulo.core.iterators.FilteringIterator option (&lt;name&gt; &lt;value&gt;, hit enter to skip): 
-</span>AgeOffFilter removes entries with timestamps more than &lt;ttl&gt; milliseconds old
-<span class="gd">----------&gt; set org.apache.accumulo.core.iterators.filter.AgeOffFilter parameter currentTime, if set, use the given value as the absolute time in milliseconds as the current time of day: 
+</span><span class="p">AgeOffFilter removes entries with timestamps more than &lt;ttl&gt; milliseconds old
+</span><span class="gd">----------&gt; set org.apache.accumulo.core.iterators.filter.AgeOffFilter parameter currentTime, if set, use the given value as the absolute time in milliseconds as the current time of day: 
 ----------&gt; set org.apache.accumulo.core.iterators.filter.AgeOffFilter parameter ttl, time to live (milliseconds): 30000
-</span>username@instance filtertest&gt; 
-
+</span><span class="p">username@instance filtertest&gt; 
+</span>
 username@instance filtertest&gt; flush -t filtertest
-08 11:13:55,745 [shell.Shell] INFO : Flush of table filtertest initiated...
+<span class="p">08 11:13:55,745 [shell.Shell] INFO : Flush of table filtertest initiated...
 username@instance filtertest&gt; compact -t filtertest
 08 11:14:10,800 [shell.Shell] INFO : Compaction of table filtertest scheduled for 20110208111410EST
 username@instance filtertest&gt; 
-</code></pre></div></div>
+</span></code></pre></div></div>
 
 <p>After the compaction runs, the newly created files will not contain any data that should be aged off, and the
 Accumulo garbage collector will remove the old files.</p>
diff --git a/1.4/examples/combiner.html b/1.4/examples/combiner.html
index c4a432e..4395152 100644
--- a/1.4/examples/combiner.html
+++ b/1.4/examples/combiner.html
@@ -148,9 +148,9 @@
 copy the produced jar into the accumulo lib dir.  This is already done in the
 tar distribution.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ bin/accumulo shell -u username
-Enter current password for 'username'@'instance': ***
-
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="err">$</span> bin/accumulo shell -u username
+<span class="p">Enter current password for 'username'@'instance': ***
+</span>
 Shell - Apache Accumulo Interactive Shell
 <span class="gd">- 
 - version: 1.4.x
@@ -159,18 +159,18 @@ Shell - Apache Accumulo Interactive Shell
 - 
 - type 'help' for a list of available commands
 - 
-</span>username@instance&gt; createtable runners
+</span><span class="p">username@instance&gt; createtable runners
 username@instance runners&gt; setiter -t runners -p 10 -scan -minc -majc -n decStats -class org.apache.accumulo.examples.simple.combiner.StatsCombiner
 Combiner that keeps track of min, max, sum, and count
-<span class="gd">----------&gt; set StatsCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.: 
+</span><span class="gd">----------&gt; set StatsCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.: 
 ----------&gt; set StatsCombiner parameter columns, &lt;col fam&gt;[:&lt;col qual&gt;]{,&lt;col fam&gt;[:&lt;col qual&gt;]} escape non aplhanum chars using %&lt;hex&gt;.: stat
 ----------&gt; set StatsCombiner parameter radix, radix/base of the numbers: 10
-</span>username@instance runners&gt; setiter -t runners -p 11 -scan -minc -majc -n hexStats -class org.apache.accumulo.examples.simple.combiner.StatsCombiner
+</span><span class="p">username@instance runners&gt; setiter -t runners -p 11 -scan -minc -majc -n hexStats -class org.apache.accumulo.examples.simple.combiner.StatsCombiner
 Combiner that keeps track of min, max, sum, and count
-<span class="gd">----------&gt; set StatsCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.: 
+</span><span class="gd">----------&gt; set StatsCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.: 
 ----------&gt; set StatsCombiner parameter columns, &lt;col fam&gt;[:&lt;col qual&gt;]{,&lt;col fam&gt;[:&lt;col qual&gt;]} escape non aplhanum chars using %&lt;hex&gt;.: hstat
 ----------&gt; set StatsCombiner parameter radix, radix/base of the numbers: 16
-</span>username@instance runners&gt; insert 123456 name first Joe
+</span><span class="p">username@instance runners&gt; insert 123456 name first Joe
 username@instance runners&gt; insert 123456 stat marathon 240
 username@instance runners&gt; scan
 123456 name:first []    Joe
@@ -186,7 +186,7 @@ username@instance runners&gt; scan
 123456 hstat:virtualMarathon []    6a,6b,d5,2
 123456 name:first []    Joe
 123456 stat:marathon []    220,240,690,3
-</code></pre></div></div>
+</span></code></pre></div></div>
 
 <p>In this example a table is created and the example stats combiner is applied to
 the column family stat and hstat.  The stats combiner computes min,max,sum, and
diff --git a/1.4/examples/filter.html b/1.4/examples/filter.html
index f94ab48..2a7f081 100644
--- a/1.4/examples/filter.html
+++ b/1.4/examples/filter.html
@@ -148,18 +148,18 @@ Filter takes a “negate” parameter which defaults to false.  If set to true,
 return value of the accept method is negated, so that key/value pairs accepted
 by the method are omitted by the Filter.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>username@instance&gt; createtable filtertest
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">username@instance&gt; createtable filtertest
 username@instance filtertest&gt; setiter -t filtertest -scan -p 10 -n myfilter -ageoff
 AgeOffFilter removes entries with timestamps more than &lt;ttl&gt; milliseconds old
-<span class="gd">----------&gt; set AgeOffFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method: 
+</span><span class="gd">----------&gt; set AgeOffFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method: 
 ----------&gt; set AgeOffFilter parameter ttl, time to live (milliseconds): 30000
 ----------&gt; set AgeOffFilter parameter currentTime, if set, use the given value as the absolute time in milliseconds as the current time of day: 
-</span>username@instance filtertest&gt; scan
+</span><span class="p">username@instance filtertest&gt; scan
 username@instance filtertest&gt; insert foo a b c
 username@instance filtertest&gt; scan
 foo a:b []    c
 username@instance filtertest&gt; 
-</code></pre></div></div>
+</span></code></pre></div></div>
 
 <p>… wait 30 seconds …</p>
 
@@ -183,12 +183,12 @@ AgeOffFilter, but any Filter can be configured by using the -class flag.  The
 following commands show how to enable the AgeOffFilter for the minc and majc
 scopes using the -class flag, then flush and compact the table.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>username@instance filtertest&gt; setiter -t filtertest -minc -majc -p 10 -n myfilter -class org.apache.accumulo.core.iterators.user.AgeOffFilter
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">username@instance filtertest&gt; setiter -t filtertest -minc -majc -p 10 -n myfilter -class org.apache.accumulo.core.iterators.user.AgeOffFilter
 AgeOffFilter removes entries with timestamps more than &lt;ttl&gt; milliseconds old
-<span class="gd">----------&gt; set AgeOffFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method: 
+</span><span class="gd">----------&gt; set AgeOffFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method: 
 ----------&gt; set AgeOffFilter parameter ttl, time to live (milliseconds): 30000
 ----------&gt; set AgeOffFilter parameter currentTime, if set, use the given value as the absolute time in milliseconds as the current time of day: 
-</span>username@instance filtertest&gt; flush
+</span><span class="p">username@instance filtertest&gt; flush
 06 10:42:24,806 [shell.Shell] INFO : Flush of table filtertest initiated...
 username@instance filtertest&gt; compact
 06 10:42:36,781 [shell.Shell] INFO : Compaction of table filtertest started for given range
@@ -198,7 +198,7 @@ username@instance filtertest&gt; compact -t filtertest -w
 06 10:43:00,632 [shell.Shell] INFO : Compacting table ...
 06 10:43:01,307 [shell.Shell] INFO : Compaction of table filtertest completed for given range
 username@instance filtertest&gt;
-</code></pre></div></div>
+</span></code></pre></div></div>
 
 <p>By default, flush and compact execute in the background, but with the -w flag
 they will wait to return until the operation has completed.  Both are 
diff --git a/1.4/examples/mapred.html b/1.4/examples/mapred.html
index 6007b30..4af1f5a 100644
--- a/1.4/examples/mapred.html
+++ b/1.4/examples/mapred.html
@@ -154,23 +154,23 @@ Found 1 items
 <p>The first part of running this example is to create a table with a combiner
 for the column family count.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ ./bin/accumulo shell -u username -p password
-Shell - Apache Accumulo Interactive Shell
-<span class="gd">- version: 1.4.x
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="err">$</span> ./bin/accumulo shell -u username -p password
+<span class="p">Shell - Apache Accumulo Interactive Shell
+</span><span class="gd">- version: 1.4.x
 - instance name: instance
 - instance id: 00000000-0000-0000-0000-000000000000
 - 
 - type 'help' for a list of available commands
 - 
-</span>username@instance&gt; createtable wordCount
+</span><span class="p">username@instance&gt; createtable wordCount
 username@instance wordCount&gt; setiter -class org.apache.accumulo.core.iterators.user.SummingCombiner -p 10 -t wordCount -majc -minc -scan
 SummingCombiner interprets Values as Longs and adds them together.  A variety of encodings (variable length, fixed length, or string) are available
-<span class="gd">----------&gt; set SummingCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.: false
+</span><span class="gd">----------&gt; set SummingCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.: false
 ----------&gt; set SummingCombiner parameter columns, &lt;col fam&gt;[:&lt;col qual&gt;]{,&lt;col fam&gt;[:&lt;col qual&gt;]} escape non-alphanum chars using %&lt;hex&gt;.: count
 ----------&gt; set SummingCombiner parameter lossy, if true, failed decodes are ignored. Otherwise combiner will error on failed decodes (default false): &lt;TRUE|FALSE&gt;: false 
 ----------&gt; set SummingCombiner parameter type, &lt;VARLEN|FIXEDLEN|STRING|fullClassName&gt;: STRING
-</span>username@instance wordCount&gt; quit
-</code></pre></div></div>
+</span><span class="p">username@instance wordCount&gt; quit
+</span></code></pre></div></div>
 
 <p>After creating the table, run the word count map reduce job.</p>
 
diff --git a/1.4/user_manual/Table_Configuration.html b/1.4/user_manual/Table_Configuration.html
index 72daeb3..f387eaa 100644
--- a/1.4/user_manual/Table_Configuration.html
+++ b/1.4/user_manual/Table_Configuration.html
@@ -314,13 +314,13 @@ org.apache.accumulo.core.iterators.Filter class.</p>
 
 <p>The AgeOff filter can be configured to remove data older than a certain date or a fixed amount of time from the present. The following example sets a table to delete everything inserted over 30 seconds ago:</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>user@myinstance&gt; createtable filtertest
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">user@myinstance&gt; createtable filtertest
 user@myinstance filtertest&gt; setiter -t filtertest -scan -minc -majc -p 10 -n myfilter -ageoff
 AgeOffFilter removes entries with timestamps more than &lt;ttl&gt; milliseconds old
-<span class="gd">----------&gt; set org.apache.accumulo.core.iterators.user.AgeOffFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method: 
+</span><span class="gd">----------&gt; set org.apache.accumulo.core.iterators.user.AgeOffFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method: 
 ----------&gt; set org.apache.accumulo.core.iterators.user.AgeOffFilter parameter ttl, time to live (milliseconds): 3000
 ----------&gt; set org.apache.accumulo.core.iterators.user.AgeOffFilter parameter currentTime, if set, use the given value as the absolute time in milliseconds as the current time of day: 
-</span>user@myinstance filtertest&gt; 
+</span><span class="p">user@myinstance filtertest&gt; 
 user@myinstance filtertest&gt; scan
 user@myinstance filtertest&gt; insert foo a b c
 user@myinstance filtertest&gt; scan
@@ -328,7 +328,7 @@ foo a:b [] c
 user@myinstance filtertest&gt; sleep 4
 user@myinstance filtertest&gt; scan
 user@myinstance filtertest&gt;
-</code></pre></div></div>
+</span></code></pre></div></div>
 
 <p>To see the iterator settings for a table, use:</p>
 
diff --git a/1.5/examples/combiner.html b/1.5/examples/combiner.html
index 93493a8..2287f77 100644
--- a/1.5/examples/combiner.html
+++ b/1.5/examples/combiner.html
@@ -148,9 +148,9 @@
 copy the produced jar into the accumulo lib dir.  This is already done in the
 tar distribution.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ bin/accumulo shell -u username
-Enter current password for 'username'@'instance': ***
-
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="err">$</span> bin/accumulo shell -u username
+<span class="p">Enter current password for 'username'@'instance': ***
+</span>
 Shell - Apache Accumulo Interactive Shell
 <span class="gd">- 
 - version: 1.5.0
@@ -159,18 +159,18 @@ Shell - Apache Accumulo Interactive Shell
 - 
 - type 'help' for a list of available commands
 - 
-</span>username@instance&gt; createtable runners
+</span><span class="p">username@instance&gt; createtable runners
 username@instance runners&gt; setiter -t runners -p 10 -scan -minc -majc -n decStats -class org.apache.accumulo.examples.simple.combiner.StatsCombiner
 Combiner that keeps track of min, max, sum, and count
-<span class="gd">----------&gt; set StatsCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.: 
+</span><span class="gd">----------&gt; set StatsCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.: 
 ----------&gt; set StatsCombiner parameter columns, &lt;col fam&gt;[:&lt;col qual&gt;]{,&lt;col fam&gt;[:&lt;col qual&gt;]} escape non aplhanum chars using %&lt;hex&gt;.: stat
 ----------&gt; set StatsCombiner parameter radix, radix/base of the numbers: 10
-</span>username@instance runners&gt; setiter -t runners -p 11 -scan -minc -majc -n hexStats -class org.apache.accumulo.examples.simple.combiner.StatsCombiner
+</span><span class="p">username@instance runners&gt; setiter -t runners -p 11 -scan -minc -majc -n hexStats -class org.apache.accumulo.examples.simple.combiner.StatsCombiner
 Combiner that keeps track of min, max, sum, and count
-<span class="gd">----------&gt; set StatsCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.: 
+</span><span class="gd">----------&gt; set StatsCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.: 
 ----------&gt; set StatsCombiner parameter columns, &lt;col fam&gt;[:&lt;col qual&gt;]{,&lt;col fam&gt;[:&lt;col qual&gt;]} escape non aplhanum chars using %&lt;hex&gt;.: hstat
 ----------&gt; set StatsCombiner parameter radix, radix/base of the numbers: 16
-</span>username@instance runners&gt; insert 123456 name first Joe
+</span><span class="p">username@instance runners&gt; insert 123456 name first Joe
 username@instance runners&gt; insert 123456 stat marathon 240
 username@instance runners&gt; scan
 123456 name:first []    Joe
@@ -186,7 +186,7 @@ username@instance runners&gt; scan
 123456 hstat:virtualMarathon []    6a,6b,d5,2
 123456 name:first []    Joe
 123456 stat:marathon []    220,240,690,3
-</code></pre></div></div>
+</span></code></pre></div></div>
 
 <p>In this example a table is created and the example stats combiner is applied to
 the column family stat and hstat.  The stats combiner computes min,max,sum, and
diff --git a/1.5/examples/filter.html b/1.5/examples/filter.html
index f94ab48..2a7f081 100644
--- a/1.5/examples/filter.html
+++ b/1.5/examples/filter.html
@@ -148,18 +148,18 @@ Filter takes a “negate” parameter which defaults to false.  If set to true,
 return value of the accept method is negated, so that key/value pairs accepted
 by the method are omitted by the Filter.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>username@instance&gt; createtable filtertest
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">username@instance&gt; createtable filtertest
 username@instance filtertest&gt; setiter -t filtertest -scan -p 10 -n myfilter -ageoff
 AgeOffFilter removes entries with timestamps more than &lt;ttl&gt; milliseconds old
-<span class="gd">----------&gt; set AgeOffFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method: 
+</span><span class="gd">----------&gt; set AgeOffFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method: 
 ----------&gt; set AgeOffFilter parameter ttl, time to live (milliseconds): 30000
 ----------&gt; set AgeOffFilter parameter currentTime, if set, use the given value as the absolute time in milliseconds as the current time of day: 
-</span>username@instance filtertest&gt; scan
+</span><span class="p">username@instance filtertest&gt; scan
 username@instance filtertest&gt; insert foo a b c
 username@instance filtertest&gt; scan
 foo a:b []    c
 username@instance filtertest&gt; 
-</code></pre></div></div>
+</span></code></pre></div></div>
 
 <p>… wait 30 seconds …</p>
 
@@ -183,12 +183,12 @@ AgeOffFilter, but any Filter can be configured by using the -class flag.  The
 following commands show how to enable the AgeOffFilter for the minc and majc
 scopes using the -class flag, then flush and compact the table.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>username@instance filtertest&gt; setiter -t filtertest -minc -majc -p 10 -n myfilter -class org.apache.accumulo.core.iterators.user.AgeOffFilter
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">username@instance filtertest&gt; setiter -t filtertest -minc -majc -p 10 -n myfilter -class org.apache.accumulo.core.iterators.user.AgeOffFilter
 AgeOffFilter removes entries with timestamps more than &lt;ttl&gt; milliseconds old
-<span class="gd">----------&gt; set AgeOffFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method: 
+</span><span class="gd">----------&gt; set AgeOffFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method: 
 ----------&gt; set AgeOffFilter parameter ttl, time to live (milliseconds): 30000
 ----------&gt; set AgeOffFilter parameter currentTime, if set, use the given value as the absolute time in milliseconds as the current time of day: 
-</span>username@instance filtertest&gt; flush
+</span><span class="p">username@instance filtertest&gt; flush
 06 10:42:24,806 [shell.Shell] INFO : Flush of table filtertest initiated...
 username@instance filtertest&gt; compact
 06 10:42:36,781 [shell.Shell] INFO : Compaction of table filtertest started for given range
@@ -198,7 +198,7 @@ username@instance filtertest&gt; compact -t filtertest -w
 06 10:43:00,632 [shell.Shell] INFO : Compacting table ...
 06 10:43:01,307 [shell.Shell] INFO : Compaction of table filtertest completed for given range
 username@instance filtertest&gt;
-</code></pre></div></div>
+</span></code></pre></div></div>
 
 <p>By default, flush and compact execute in the background, but with the -w flag
 they will wait to return until the operation has completed.  Both are 
diff --git a/1.5/examples/mapred.html b/1.5/examples/mapred.html
index a1e8dd8..3b36ff8 100644
--- a/1.5/examples/mapred.html
+++ b/1.5/examples/mapred.html
@@ -154,23 +154,23 @@ Found 1 items
 <p>The first part of running this example is to create a table with a combiner
 for the column family count.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ ./bin/accumulo shell -u username -p password
-Shell - Apache Accumulo Interactive Shell
-<span class="gd">- version: 1.5.0
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="err">$</span> ./bin/accumulo shell -u username -p password
+<span class="p">Shell - Apache Accumulo Interactive Shell
+</span><span class="gd">- version: 1.5.0
 - instance name: instance
 - instance id: 00000000-0000-0000-0000-000000000000
 - 
 - type 'help' for a list of available commands
 - 
-</span>username@instance&gt; createtable wordCount
+</span><span class="p">username@instance&gt; createtable wordCount
 username@instance wordCount&gt; setiter -class org.apache.accumulo.core.iterators.user.SummingCombiner -p 10 -t wordCount -majc -minc -scan
 SummingCombiner interprets Values as Longs and adds them together.  A variety of encodings (variable length, fixed length, or string) are available
-<span class="gd">----------&gt; set SummingCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.: false
+</span><span class="gd">----------&gt; set SummingCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.: false
 ----------&gt; set SummingCombiner parameter columns, &lt;col fam&gt;[:&lt;col qual&gt;]{,&lt;col fam&gt;[:&lt;col qual&gt;]} escape non-alphanum chars using %&lt;hex&gt;.: count
 ----------&gt; set SummingCombiner parameter lossy, if true, failed decodes are ignored. Otherwise combiner will error on failed decodes (default false): &lt;TRUE|FALSE&gt;: false 
 ----------&gt; set SummingCombiner parameter type, &lt;VARLEN|FIXEDLEN|STRING|fullClassName&gt;: STRING
-</span>username@instance wordCount&gt; quit
-</code></pre></div></div>
+</span><span class="p">username@instance wordCount&gt; quit
+</span></code></pre></div></div>
 
 <p>After creating the table, run the word count map reduce job.</p>
 
diff --git a/1.6/examples/combiner.html b/1.6/examples/combiner.html
index f93e2d2..c0c8c3d 100644
--- a/1.6/examples/combiner.html
+++ b/1.6/examples/combiner.html
@@ -148,9 +148,9 @@
 copy the produced jar into the accumulo lib dir. This is already done in the
 tar distribution.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ bin/accumulo shell -u username
-Enter current password for 'username'@'instance': ***
-
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="err">$</span> bin/accumulo shell -u username
+<span class="p">Enter current password for 'username'@'instance': ***
+</span>
 Shell - Apache Accumulo Interactive Shell
 <span class="gd">-
 - version: 1.6.0
@@ -159,18 +159,18 @@ Shell - Apache Accumulo Interactive Shell
 -
 - type 'help' for a list of available commands
 -
-</span>username@instance&gt; createtable runners
+</span><span class="p">username@instance&gt; createtable runners
 username@instance runners&gt; setiter -t runners -p 10 -scan -minc -majc -n decStats -class org.apache.accumulo.examples.simple.combiner.StatsCombiner
 Combiner that keeps track of min, max, sum, and count
-<span class="gd">----------&gt; set StatsCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.:
+</span><span class="gd">----------&gt; set StatsCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.:
 ----------&gt; set StatsCombiner parameter columns, &lt;col fam&gt;[:&lt;col qual&gt;]{,&lt;col fam&gt;[:&lt;col qual&gt;]} escape non aplhanum chars using %&lt;hex&gt;.: stat
 ----------&gt; set StatsCombiner parameter radix, radix/base of the numbers: 10
-</span>username@instance runners&gt; setiter -t runners -p 11 -scan -minc -majc -n hexStats -class org.apache.accumulo.examples.simple.combiner.StatsCombiner
+</span><span class="p">username@instance runners&gt; setiter -t runners -p 11 -scan -minc -majc -n hexStats -class org.apache.accumulo.examples.simple.combiner.StatsCombiner
 Combiner that keeps track of min, max, sum, and count
-<span class="gd">----------&gt; set StatsCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.:
+</span><span class="gd">----------&gt; set StatsCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.:
 ----------&gt; set StatsCombiner parameter columns, &lt;col fam&gt;[:&lt;col qual&gt;]{,&lt;col fam&gt;[:&lt;col qual&gt;]} escape non aplhanum chars using %&lt;hex&gt;.: hstat
 ----------&gt; set StatsCombiner parameter radix, radix/base of the numbers: 16
-</span>username@instance runners&gt; insert 123456 name first Joe
+</span><span class="p">username@instance runners&gt; insert 123456 name first Joe
 username@instance runners&gt; insert 123456 stat marathon 240
 username@instance runners&gt; scan
 123456 name:first []    Joe
@@ -186,7 +186,7 @@ username@instance runners&gt; scan
 123456 hstat:virtualMarathon []    6a,6b,d5,2
 123456 name:first []    Joe
 123456 stat:marathon []    220,240,690,3
-</code></pre></div></div>
+</span></code></pre></div></div>
 
 <p>In this example a table is created and the example stats combiner is applied to
 the column family stat and hstat. The stats combiner computes min,max,sum, and
diff --git a/1.6/examples/filter.html b/1.6/examples/filter.html
index 26555d2..1ee32ab 100644
--- a/1.6/examples/filter.html
+++ b/1.6/examples/filter.html
@@ -148,18 +148,18 @@ Filter takes a “negate” parameter which defaults to false. If set to true, t
 return value of the accept method is negated, so that key/value pairs accepted
 by the method are omitted by the Filter.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>username@instance&gt; createtable filtertest
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">username@instance&gt; createtable filtertest
 username@instance filtertest&gt; setiter -t filtertest -scan -p 10 -n myfilter -ageoff
 AgeOffFilter removes entries with timestamps more than &lt;ttl&gt; milliseconds old
-<span class="gd">----------&gt; set AgeOffFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method:
+</span><span class="gd">----------&gt; set AgeOffFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method:
 ----------&gt; set AgeOffFilter parameter ttl, time to live (milliseconds): 30000
 ----------&gt; set AgeOffFilter parameter currentTime, if set, use the given value as the absolute time in milliseconds as the current time of day:
-</span>username@instance filtertest&gt; scan
+</span><span class="p">username@instance filtertest&gt; scan
 username@instance filtertest&gt; insert foo a b c
 username@instance filtertest&gt; scan
 foo a:b []    c
 username@instance filtertest&gt;
-</code></pre></div></div>
+</span></code></pre></div></div>
 
 <p>… wait 30 seconds …</p>
 
@@ -183,12 +183,12 @@ AgeOffFilter, but any Filter can be configured by using the -class flag. The
 following commands show how to enable the AgeOffFilter for the minc and majc
 scopes using the -class flag, then flush and compact the table.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>username@instance filtertest&gt; setiter -t filtertest -minc -majc -p 10 -n myfilter -class org.apache.accumulo.core.iterators.user.AgeOffFilter
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">username@instance filtertest&gt; setiter -t filtertest -minc -majc -p 10 -n myfilter -class org.apache.accumulo.core.iterators.user.AgeOffFilter
 AgeOffFilter removes entries with timestamps more than &lt;ttl&gt; milliseconds old
-<span class="gd">----------&gt; set AgeOffFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method:
+</span><span class="gd">----------&gt; set AgeOffFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method:
 ----------&gt; set AgeOffFilter parameter ttl, time to live (milliseconds): 30000
 ----------&gt; set AgeOffFilter parameter currentTime, if set, use the given value as the absolute time in milliseconds as the current time of day:
-</span>username@instance filtertest&gt; flush
+</span><span class="p">username@instance filtertest&gt; flush
 06 10:42:24,806 [shell.Shell] INFO : Flush of table filtertest initiated...
 username@instance filtertest&gt; compact
 06 10:42:36,781 [shell.Shell] INFO : Compaction of table filtertest started for given range
@@ -198,7 +198,7 @@ username@instance filtertest&gt; compact -t filtertest -w
 06 10:43:00,632 [shell.Shell] INFO : Compacting table ...
 06 10:43:01,307 [shell.Shell] INFO : Compaction of table filtertest completed for given range
 username@instance filtertest&gt;
-</code></pre></div></div>
+</span></code></pre></div></div>
 
 <p>By default, flush and compact execute in the background, but with the -w flag
 they will wait to return until the operation has completed. Both are
diff --git a/1.6/examples/mapred.html b/1.6/examples/mapred.html
index 3b5e27c..29727c9 100644
--- a/1.6/examples/mapred.html
+++ b/1.6/examples/mapred.html
@@ -154,23 +154,23 @@ Found 1 items
 <p>The first part of running this example is to create a table with a combiner
 for the column family count.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ ./bin/accumulo shell -u username -p password
-Shell - Apache Accumulo Interactive Shell
-<span class="gd">- version: 1.6.0
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="err">$</span> ./bin/accumulo shell -u username -p password
+<span class="p">Shell - Apache Accumulo Interactive Shell
+</span><span class="gd">- version: 1.6.0
 - instance name: instance
 - instance id: 00000000-0000-0000-0000-000000000000
 -
 - type 'help' for a list of available commands
 -
-</span>username@instance&gt; createtable wordCount
+</span><span class="p">username@instance&gt; createtable wordCount
 username@instance wordCount&gt; setiter -class org.apache.accumulo.core.iterators.user.SummingCombiner -p 10 -t wordCount -majc -minc -scan
 SummingCombiner interprets Values as Longs and adds them together. A variety of encodings (variable length, fixed length, or string) are available
-<span class="gd">----------&gt; set SummingCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.: false
+</span><span class="gd">----------&gt; set SummingCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.: false
 ----------&gt; set SummingCombiner parameter columns, &lt;col fam&gt;[:&lt;col qual&gt;]{,&lt;col fam&gt;[:&lt;col qual&gt;]} escape non-alphanum chars using %&lt;hex&gt;.: count
 ----------&gt; set SummingCombiner parameter lossy, if true, failed decodes are ignored. Otherwise combiner will error on failed decodes (default false): &lt;TRUE|FALSE&gt;: false
 ----------&gt; set SummingCombiner parameter type, &lt;VARLEN|FIXEDLEN|STRING|fullClassName&gt;: STRING
-</span>username@instance wordCount&gt; quit
-</code></pre></div></div>
+</span><span class="p">username@instance wordCount&gt; quit
+</span></code></pre></div></div>
 
 <p>After creating the table, run the word count map reduce job.</p>
 
diff --git a/1.7/examples/combiner.html b/1.7/examples/combiner.html
index cab8991..6fd5196 100644
--- a/1.7/examples/combiner.html
+++ b/1.7/examples/combiner.html
@@ -148,9 +148,9 @@
 copy the produced jar into the accumulo lib dir. This is already done in the
 tar distribution.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ bin/accumulo shell -u username
-Enter current password for 'username'@'instance': ***
-
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="err">$</span> bin/accumulo shell -u username
+<span class="p">Enter current password for 'username'@'instance': ***
+</span>
 Shell - Apache Accumulo Interactive Shell
 <span class="gd">-
 - version: 1.7.4
@@ -159,18 +159,18 @@ Shell - Apache Accumulo Interactive Shell
 -
 - type 'help' for a list of available commands
 -
-</span>username@instance&gt; createtable runners
+</span><span class="p">username@instance&gt; createtable runners
 username@instance runners&gt; setiter -t runners -p 10 -scan -minc -majc -n decStats -class org.apache.accumulo.examples.simple.combiner.StatsCombiner
 Combiner that keeps track of min, max, sum, and count
-<span class="gd">----------&gt; set StatsCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.:
+</span><span class="gd">----------&gt; set StatsCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.:
 ----------&gt; set StatsCombiner parameter columns, &lt;col fam&gt;[:&lt;col qual&gt;]{,&lt;col fam&gt;[:&lt;col qual&gt;]} escape non aplhanum chars using %&lt;hex&gt;.: stat
 ----------&gt; set StatsCombiner parameter radix, radix/base of the numbers: 10
-</span>username@instance runners&gt; setiter -t runners -p 11 -scan -minc -majc -n hexStats -class org.apache.accumulo.examples.simple.combiner.StatsCombiner
+</span><span class="p">username@instance runners&gt; setiter -t runners -p 11 -scan -minc -majc -n hexStats -class org.apache.accumulo.examples.simple.combiner.StatsCombiner
 Combiner that keeps track of min, max, sum, and count
-<span class="gd">----------&gt; set StatsCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.:
+</span><span class="gd">----------&gt; set StatsCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.:
 ----------&gt; set StatsCombiner parameter columns, &lt;col fam&gt;[:&lt;col qual&gt;]{,&lt;col fam&gt;[:&lt;col qual&gt;]} escape non aplhanum chars using %&lt;hex&gt;.: hstat
 ----------&gt; set StatsCombiner parameter radix, radix/base of the numbers: 16
-</span>username@instance runners&gt; insert 123456 name first Joe
+</span><span class="p">username@instance runners&gt; insert 123456 name first Joe
 username@instance runners&gt; insert 123456 stat marathon 240
 username@instance runners&gt; scan
 123456 name:first []    Joe
@@ -186,7 +186,7 @@ username@instance runners&gt; scan
 123456 hstat:virtualMarathon []    6a,6b,d5,2
 123456 name:first []    Joe
 123456 stat:marathon []    220,240,690,3
-</code></pre></div></div>
+</span></code></pre></div></div>
 
 <p>In this example a table is created and the example stats combiner is applied to
 the column family stat and hstat. The stats combiner computes min,max,sum, and
diff --git a/1.7/examples/filter.html b/1.7/examples/filter.html
index 26555d2..1ee32ab 100644
--- a/1.7/examples/filter.html
+++ b/1.7/examples/filter.html
@@ -148,18 +148,18 @@ Filter takes a “negate” parameter which defaults to false. If set to true, t
 return value of the accept method is negated, so that key/value pairs accepted
 by the method are omitted by the Filter.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>username@instance&gt; createtable filtertest
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">username@instance&gt; createtable filtertest
 username@instance filtertest&gt; setiter -t filtertest -scan -p 10 -n myfilter -ageoff
 AgeOffFilter removes entries with timestamps more than &lt;ttl&gt; milliseconds old
-<span class="gd">----------&gt; set AgeOffFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method:
+</span><span class="gd">----------&gt; set AgeOffFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method:
 ----------&gt; set AgeOffFilter parameter ttl, time to live (milliseconds): 30000
 ----------&gt; set AgeOffFilter parameter currentTime, if set, use the given value as the absolute time in milliseconds as the current time of day:
-</span>username@instance filtertest&gt; scan
+</span><span class="p">username@instance filtertest&gt; scan
 username@instance filtertest&gt; insert foo a b c
 username@instance filtertest&gt; scan
 foo a:b []    c
 username@instance filtertest&gt;
-</code></pre></div></div>
+</span></code></pre></div></div>
 
 <p>… wait 30 seconds …</p>
 
@@ -183,12 +183,12 @@ AgeOffFilter, but any Filter can be configured by using the -class flag. The
 following commands show how to enable the AgeOffFilter for the minc and majc
 scopes using the -class flag, then flush and compact the table.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>username@instance filtertest&gt; setiter -t filtertest -minc -majc -p 10 -n myfilter -class org.apache.accumulo.core.iterators.user.AgeOffFilter
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">username@instance filtertest&gt; setiter -t filtertest -minc -majc -p 10 -n myfilter -class org.apache.accumulo.core.iterators.user.AgeOffFilter
 AgeOffFilter removes entries with timestamps more than &lt;ttl&gt; milliseconds old
-<span class="gd">----------&gt; set AgeOffFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method:
+</span><span class="gd">----------&gt; set AgeOffFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method:
 ----------&gt; set AgeOffFilter parameter ttl, time to live (milliseconds): 30000
 ----------&gt; set AgeOffFilter parameter currentTime, if set, use the given value as the absolute time in milliseconds as the current time of day:
-</span>username@instance filtertest&gt; flush
+</span><span class="p">username@instance filtertest&gt; flush
 06 10:42:24,806 [shell.Shell] INFO : Flush of table filtertest initiated...
 username@instance filtertest&gt; compact
 06 10:42:36,781 [shell.Shell] INFO : Compaction of table filtertest started for given range
@@ -198,7 +198,7 @@ username@instance filtertest&gt; compact -t filtertest -w
 06 10:43:00,632 [shell.Shell] INFO : Compacting table ...
 06 10:43:01,307 [shell.Shell] INFO : Compaction of table filtertest completed for given range
 username@instance filtertest&gt;
-</code></pre></div></div>
+</span></code></pre></div></div>
 
 <p>By default, flush and compact execute in the background, but with the -w flag
 they will wait to return until the operation has completed. Both are
diff --git a/1.7/examples/mapred.html b/1.7/examples/mapred.html
index 0f682ff..09f43d4 100644
--- a/1.7/examples/mapred.html
+++ b/1.7/examples/mapred.html
@@ -154,23 +154,23 @@ Found 1 items
 <p>The first part of running this example is to create a table with a combiner
 for the column family count.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ ./bin/accumulo shell -u username -p password
-Shell - Apache Accumulo Interactive Shell
-<span class="gd">- version: 1.7.4
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="err">$</span> ./bin/accumulo shell -u username -p password
+<span class="p">Shell - Apache Accumulo Interactive Shell
+</span><span class="gd">- version: 1.7.4
 - instance name: instance
 - instance id: 00000000-0000-0000-0000-000000000000
 -
 - type 'help' for a list of available commands
 -
-</span>username@instance&gt; createtable wordCount
+</span><span class="p">username@instance&gt; createtable wordCount
 username@instance wordCount&gt; setiter -class org.apache.accumulo.core.iterators.user.SummingCombiner -p 10 -t wordCount -majc -minc -scan
 SummingCombiner interprets Values as Longs and adds them together. A variety of encodings (variable length, fixed length, or string) are available
-<span class="gd">----------&gt; set SummingCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.: false
+</span><span class="gd">----------&gt; set SummingCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.: false
 ----------&gt; set SummingCombiner parameter columns, &lt;col fam&gt;[:&lt;col qual&gt;]{,&lt;col fam&gt;[:&lt;col qual&gt;]} escape non-alphanum chars using %&lt;hex&gt;.: count
 ----------&gt; set SummingCombiner parameter lossy, if true, failed decodes are ignored. Otherwise combiner will error on failed decodes (default false): &lt;TRUE|FALSE&gt;: false
 ----------&gt; set SummingCombiner parameter type, &lt;VARLEN|FIXEDLEN|STRING|fullClassName&gt;: STRING
-</span>username@instance wordCount&gt; quit
-</code></pre></div></div>
+</span><span class="p">username@instance wordCount&gt; quit
+</span></code></pre></div></div>
 
 <p>After creating the table, run the word count map reduce job.</p>
 
diff --git a/1.9/examples/combiner.html b/1.9/examples/combiner.html
index 044dd96..9a20091 100644
--- a/1.9/examples/combiner.html
+++ b/1.9/examples/combiner.html
@@ -148,9 +148,9 @@
 copy the produced jar into the accumulo lib dir. This is already done in the
 tar distribution.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ bin/accumulo shell -u username
-Enter current password for 'username'@'instance': ***
-
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="err">$</span> bin/accumulo shell -u username
+<span class="p">Enter current password for 'username'@'instance': ***
+</span>
 Shell - Apache Accumulo Interactive Shell
 <span class="gd">-
 - version: 1.5.0
@@ -159,18 +159,18 @@ Shell - Apache Accumulo Interactive Shell
 -
 - type 'help' for a list of available commands
 -
-</span>username@instance&gt; createtable runners
+</span><span class="p">username@instance&gt; createtable runners
 username@instance runners&gt; setiter -t runners -p 10 -scan -minc -majc -n decStats -class org.apache.accumulo.examples.simple.combiner.StatsCombiner
 Combiner that keeps track of min, max, sum, and count
-<span class="gd">----------&gt; set StatsCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.:
+</span><span class="gd">----------&gt; set StatsCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.:
 ----------&gt; set StatsCombiner parameter columns, &lt;col fam&gt;[:&lt;col qual&gt;]{,&lt;col fam&gt;[:&lt;col qual&gt;]} escape non aplhanum chars using %&lt;hex&gt;.: stat
 ----------&gt; set StatsCombiner parameter radix, radix/base of the numbers: 10
-</span>username@instance runners&gt; setiter -t runners -p 11 -scan -minc -majc -n hexStats -class org.apache.accumulo.examples.simple.combiner.StatsCombiner
+</span><span class="p">username@instance runners&gt; setiter -t runners -p 11 -scan -minc -majc -n hexStats -class org.apache.accumulo.examples.simple.combiner.StatsCombiner
 Combiner that keeps track of min, max, sum, and count
-<span class="gd">----------&gt; set StatsCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.:
+</span><span class="gd">----------&gt; set StatsCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.:
 ----------&gt; set StatsCombiner parameter columns, &lt;col fam&gt;[:&lt;col qual&gt;]{,&lt;col fam&gt;[:&lt;col qual&gt;]} escape non aplhanum chars using %&lt;hex&gt;.: hstat
 ----------&gt; set StatsCombiner parameter radix, radix/base of the numbers: 16
-</span>username@instance runners&gt; insert 123456 name first Joe
+</span><span class="p">username@instance runners&gt; insert 123456 name first Joe
 username@instance runners&gt; insert 123456 stat marathon 240
 username@instance runners&gt; scan
 123456 name:first []    Joe
@@ -186,7 +186,7 @@ username@instance runners&gt; scan
 123456 hstat:virtualMarathon []    6a,6b,d5,2
 123456 name:first []    Joe
 123456 stat:marathon []    220,240,690,3
-</code></pre></div></div>
+</span></code></pre></div></div>
 
 <p>In this example a table is created and the example stats combiner is applied to
 the column family stat and hstat. The stats combiner computes min,max,sum, and
diff --git a/1.9/examples/filter.html b/1.9/examples/filter.html
index 4eef7fd..f3e7d9e 100644
--- a/1.9/examples/filter.html
+++ b/1.9/examples/filter.html
@@ -148,18 +148,18 @@ Filter takes a “negate” parameter which defaults to false. If set to true, t
 return value of the accept method is negated, so that key/value pairs accepted
 by the method are omitted by the Filter.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>username@instance&gt; createtable filtertest
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">username@instance&gt; createtable filtertest
 username@instance filtertest&gt; setiter -t filtertest -scan -p 10 -n myfilter -ageoff
 AgeOffFilter removes entries with timestamps more than &lt;ttl&gt; milliseconds old
-<span class="gd">----------&gt; set AgeOffFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method:
+</span><span class="gd">----------&gt; set AgeOffFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method:
 ----------&gt; set AgeOffFilter parameter ttl, time to live (milliseconds): 30000
 ----------&gt; set AgeOffFilter parameter currentTime, if set, use the given value as the absolute time in milliseconds as the current time of day:
-</span>username@instance filtertest&gt; scan
+</span><span class="p">username@instance filtertest&gt; scan
 username@instance filtertest&gt; insert foo a b c
 username@instance filtertest&gt; scan
 foo a:b []    c
 username@instance filtertest&gt;
-</code></pre></div></div>
+</span></code></pre></div></div>
 
 <p>… wait 30 seconds …</p>
 
@@ -183,12 +183,12 @@ AgeOffFilter, but any Filter can be configured by using the -class flag. The
 following commands show how to enable the AgeOffFilter for the minc and majc
 scopes using the -class flag, then flush and compact the table.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>username@instance filtertest&gt; setiter -t filtertest -minc -majc -p 10 -n myfilter -class org.apache.accumulo.core.iterators.user.AgeOffFilter
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">username@instance filtertest&gt; setiter -t filtertest -minc -majc -p 10 -n myfilter -class org.apache.accumulo.core.iterators.user.AgeOffFilter
 AgeOffFilter removes entries with timestamps more than &lt;ttl&gt; milliseconds old
-<span class="gd">----------&gt; set AgeOffFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method:
+</span><span class="gd">----------&gt; set AgeOffFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method:
 ----------&gt; set AgeOffFilter parameter ttl, time to live (milliseconds): 30000
 ----------&gt; set AgeOffFilter parameter currentTime, if set, use the given value as the absolute time in milliseconds as the current time of day:
-</span>username@instance filtertest&gt; flush
+</span><span class="p">username@instance filtertest&gt; flush
 06 10:42:24,806 [shell.Shell] INFO : Flush of table filtertest initiated...
 username@instance filtertest&gt; compact
 06 10:42:36,781 [shell.Shell] INFO : Compaction of table filtertest started for given range
@@ -198,7 +198,7 @@ username@instance filtertest&gt; compact -t filtertest -w
 06 10:43:00,632 [shell.Shell] INFO : Compacting table ...
 06 10:43:01,307 [shell.Shell] INFO : Compaction of table filtertest completed for given range
 username@instance filtertest&gt;
-</code></pre></div></div>
+</span></code></pre></div></div>
 
 <p>By default, flush and compact execute in the background, but with the -w flag
 they will wait to return until the operation has completed. Both are
diff --git a/1.9/examples/mapred.html b/1.9/examples/mapred.html
index 097cdef..352688b 100644
--- a/1.9/examples/mapred.html
+++ b/1.9/examples/mapred.html
@@ -154,23 +154,23 @@ Found 1 items
 <p>The first part of running this example is to create a table with a combiner
 for the column family count.</p>
 
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ ./bin/accumulo shell -u username -p password
-Shell - Apache Accumulo Interactive Shell
-<span class="gd">- version: 1.5.0
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="err">$</span> ./bin/accumulo shell -u username -p password
+<span class="p">Shell - Apache Accumulo Interactive Shell
+</span><span class="gd">- version: 1.5.0
 - instance name: instance
 - instance id: 00000000-0000-0000-0000-000000000000
 -
 - type 'help' for a list of available commands
 -
-</span>username@instance&gt; createtable wordCount
+</span><span class="p">username@instance&gt; createtable wordCount
 username@instance wordCount&gt; setiter -class org.apache.accumulo.core.iterators.user.SummingCombiner -p 10 -t wordCount -majc -minc -scan
 SummingCombiner interprets Values as Longs and adds them together. A variety of encodings (variable length, fixed length, or string) are available
-<span class="gd">----------&gt; set SummingCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.: false
+</span><span class="gd">----------&gt; set SummingCombiner parameter all, set to true to apply Combiner to every column, otherwise leave blank. if true, columns option will be ignored.: false
 ----------&gt; set SummingCombiner parameter columns, &lt;col fam&gt;[:&lt;col qual&gt;]{,&lt;col fam&gt;[:&lt;col qual&gt;]} escape non-alphanum chars using %&lt;hex&gt;.: count
 ----------&gt; set SummingCombiner parameter lossy, if true, failed decodes are ignored. Otherwise combiner will error on failed decodes (default false): &lt;TRUE|FALSE&gt;: false
 ----------&gt; set SummingCombiner parameter type, &lt;VARLEN|FIXEDLEN|STRING|fullClassName&gt;: STRING
-</span>username@instance wordCount&gt; quit
-</code></pre></div></div>
+</span><span class="p">username@instance wordCount&gt; quit
+</span></code></pre></div></div>
 
 <p>After creating the table, run the word count map reduce job.</p>
 
diff --git a/blog/2017/04/21/introducing-uno-and-muchos.html b/blog/2017/04/21/introducing-uno-and-muchos.html
index 305c4fb..6ec80f3 100644
--- a/blog/2017/04/21/introducing-uno-and-muchos.html
+++ b/blog/2017/04/21/introducing-uno-and-muchos.html
@@ -186,7 +186,7 @@ to build an Accumulo tarball from a local git repo when <code class="highlighter
 <p>Accumulo, Hadoop, &amp; Zookeeper are now ready to use. You can view the Accumulo monitor at
 <a href="http://localhost:9995">http://localhost:9995</a>. You can configure your shell using the command below:</p>
 
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nb">eval</span> <span class="s2">"</span><span class="k">$(</span>./bin/uno <span class="nb">env</span><span class="k">)</span><span class="s2">"</span>
+<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nb">eval</span> <span class="s2">"</span><span class="si">$(</span>./bin/uno <span class="nb">env</span><span class="si">)</span><span class="s2">"</span>
 </code></pre></div></div>
 
 <p>Run <code class="highlighter-rouge">uno stop accumulo</code> to cleanly stop your cluster and <code class="highlighter-rouge">uno start accumulo</code> to start it again.</p>
diff --git a/contributor/testing-release.html b/contributor/testing-release.html
index 3ca36e7..d36d113 100644
--- a/contributor/testing-release.html
+++ b/contributor/testing-release.html
@@ -156,14 +156,14 @@
         &lt;repository&gt;
           &lt;id&gt;accumulorc&lt;/id&gt;
           &lt;name&gt;accumulorc&lt;/name&gt;
-          &lt;url&gt;https://repository.apache.org/content/repositories/orgapacheaccumulo-\</span><span class="k">${</span><span class="nv">env</span><span class="p">.RC_STAGING</span><span class="k">}</span><span class="sh">/&lt;/url&gt;
+          &lt;url&gt;https://repository.apache.org/content/repositories/orgapacheaccumulo-</span><span class="se">\$</span><span class="sh">{env.RC_STAGING}/&lt;/url&gt;
         &lt;/repository&gt;
       &lt;/repositories&gt;
       &lt;pluginRepositories&gt;
         &lt;pluginRepository&gt;
           &lt;id&gt;accumulorcp&lt;/id&gt;
           &lt;name&gt;accumulorcp&lt;/name&gt;
-          &lt;url&gt;https://repository.apache.org/content/repositories/orgapacheaccumulo-\</span><span class="k">${</span><span class="nv">env</span><span class="p">.RC_STAGING</span><span class="k">}</span><span class="sh">/&lt;/url&gt;
+          &lt;url&gt;https://repository.apache.org/content/repositories/orgapacheaccumulo-</span><span class="se">\$</span><span class="sh">{env.RC_STAGING}/&lt;/url&gt;
         &lt;/pluginRepository&gt;
       &lt;/pluginRepositories&gt;
     &lt;/profile&gt;
diff --git a/docs/2.x/configuration/files.html b/docs/2.x/configuration/files.html
index b7e475b..955ee41 100644
--- a/docs/2.x/configuration/files.html
+++ b/docs/2.x/configuration/files.html
@@ -439,7 +439,7 @@ configuring this file.</p>
 the Accumulo connection information in this file will be used. This file can be used to create an AccumuloClient
 in Java using the following code:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">()</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="nc">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">()</span>
                            <span class="o">.</span><span class="na">from</span><span class="o">(</span><span class="s">"/path/to/accumulo-client.properties"</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
 </code></pre></div></div>
 
diff --git a/docs/2.x/development/development_tools.html b/docs/2.x/development/development_tools.html
index fc12b17..30768af 100644
--- a/docs/2.x/development/development_tools.html
+++ b/docs/2.x/development/development_tools.html
@@ -443,14 +443,14 @@ as a test dependency:</p>
 
 <p>To start it up, you will need to supply an empty directory and a root password as arguments:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">File</span> <span class="n">tempDirectory</span> <span class="o">=</span> <span class="c1">// JUnit and Guava supply mechanisms for creating temp directories</span>
-<span class="n">MiniAccumuloCluster</span> <span class="n">mac</span> <span class="o">=</span> <span class="k">new</span> <span class="n">MiniAccumuloCluster</span><span class="o">(</span><span class="n">tempDirectory</span><span class="o">,</span> <span class="s">"password"</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">File</span> <span class="n">tempDirectory</span> <span class="o">=</span> <span class="c1">// JUnit and Guava supply mechanisms for creating temp directories</span>
+<span class="nc">MiniAccumuloCluster</span> <span class="n">mac</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">MiniAccumuloCluster</span><span class="o">(</span><span class="n">tempDirectory</span><span class="o">,</span> <span class="s">"password"</span><span class="o">);</span>
 <span class="n">mac</span><span class="o">.</span><span class="na">start</span><span class="o">();</span>
 </code></pre></div></div>
 
 <p>Once we have our mini cluster running, we will want to interact with the Accumulo client API:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">mac</span><span class="o">.</span><span class="na">getAccumuloClient</span><span class="o">(</span><span class="s">"root"</span><span class="o">,</span> <span class="k">new</span> <span class="n">PasswordToken</span><span class="o">(</span><span class="s">"password"</span><span class=" [...]
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">mac</span><span class="o">.</span><span class="na">getAccumuloClient</span><span class="o">(</span><span class="s">"root"</span><span class="o">,</span> <span class="k">new</span> <span class="nc">PasswordToken</span><span class="o">(</span><span class="s">"password"</span><span class [...]
 </code></pre></div></div>
 
 <p>Upon completion of our development code, we will want to shutdown our MiniAccumuloCluster:</p>
@@ -512,44 +512,44 @@ output dataset for the iterator being tested.</p>
 <span class="kn">import</span> <span class="nn">org.apache.accumulo.iteratortest.testcases.IteratorTestCase</span><span class="o">;</span>
 <span class="kn">import</span> <span class="nn">org.junit.runners.Parameterized.Parameters</span><span class="o">;</span>
 
-<span class="kd">public</span> <span class="kd">class</span> <span class="nc">MyIteratorTest</span> <span class="kd">extends</span> <span class="n">BaseJUnit4IteratorTest</span> <span class="o">{</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">MyIteratorTest</span> <span class="kd">extends</span> <span class="nc">BaseJUnit4IteratorTest</span> <span class="o">{</span>
 
   <span class="nd">@Parameters</span>
-  <span class="kd">public</span> <span class="kd">static</span> <span class="n">Object</span><span class="o">[][]</span> <span class="nf">parameters</span><span class="o">()</span> <span class="o">{</span>
-    <span class="kd">final</span> <span class="n">IteratorTestInput</span> <span class="n">input</span> <span class="o">=</span> <span class="n">createIteratorInput</span><span class="o">();</span>
-    <span class="kd">final</span> <span class="n">IteratorTestOutput</span> <span class="n">output</span> <span class="o">=</span> <span class="n">createIteratorOutput</span><span class="o">();</span>
-    <span class="kd">final</span> <span class="n">List</span><span class="o">&lt;</span><span class="n">IteratorTestCase</span><span class="o">&gt;</span> <span class="n">testCases</span> <span class="o">=</span> <span class="n">IteratorTestCaseFinder</span><span class="o">.</span><span class="na">findAllTestCases</span><span class="o">();</span>
-    <span class="k">return</span> <span class="n">BaseJUnit4IteratorTest</span><span class="o">.</span><span class="na">createParameters</span><span class="o">(</span><span class="n">input</span><span class="o">,</span> <span class="n">output</span><span class="o">,</span> <span class="n">tests</span><span class="o">);</span>
+  <span class="kd">public</span> <span class="kd">static</span> <span class="nc">Object</span><span class="o">[][]</span> <span class="nf">parameters</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">final</span> <span class="nc">IteratorTestInput</span> <span class="n">input</span> <span class="o">=</span> <span class="n">createIteratorInput</span><span class="o">();</span>
+    <span class="kd">final</span> <span class="nc">IteratorTestOutput</span> <span class="n">output</span> <span class="o">=</span> <span class="n">createIteratorOutput</span><span class="o">();</span>
+    <span class="kd">final</span> <span class="nc">List</span><span class="o">&lt;</span><span class="nc">IteratorTestCase</span><span class="o">&gt;</span> <span class="n">testCases</span> <span class="o">=</span> <span class="nc">IteratorTestCaseFinder</span><span class="o">.</span><span class="na">findAllTestCases</span><span class="o">();</span>
+    <span class="k">return</span> <span class="nc">BaseJUnit4IteratorTest</span><span class="o">.</span><span class="na">createParameters</span><span class="o">(</span><span class="n">input</span><span class="o">,</span> <span class="n">output</span><span class="o">,</span> <span class="n">tests</span><span class="o">);</span>
   <span class="o">}</span>
 
-  <span class="kd">private</span> <span class="kd">static</span> <span class="n">SortedMap</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span><span class="n">Value</span><span class="o">&gt;</span> <span class="n">INPUT_DATA</span> <span class="o">=</span> <span class="n">createInputData</span><span class="o">();</span>
-  <span class="kd">private</span> <span class="kd">static</span> <span class="n">SortedMap</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span><span class="n">Value</span><span class="o">&gt;</span> <span class="n">OUTPUT_DATA</span> <span class="o">=</span> <span class="n">createOutputData</span><span class="o">();</span>
+  <span class="kd">private</span> <span class="kd">static</span> <span class="nc">SortedMap</span><span class="o">&lt;</span><span class="nc">Key</span><span class="o">,</span><span class="nc">Value</span><span class="o">&gt;</span> <span class="no">INPUT_DATA</span> <span class="o">=</span> <span class="n">createInputData</span><span class="o">();</span>
+  <span class="kd">private</span> <span class="kd">static</span> <span class="nc">SortedMap</span><span class="o">&lt;</span><span class="nc">Key</span><span class="o">,</span><span class="nc">Value</span><span class="o">&gt;</span> <span class="no">OUTPUT_DATA</span> <span class="o">=</span> <span class="n">createOutputData</span><span class="o">();</span>
 
-  <span class="kd">private</span> <span class="kd">static</span> <span class="n">SortedMap</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span><span class="n">Value</span><span class="o">&gt;</span> <span class="nf">createInputData</span><span class="o">()</span> <span class="o">{</span>
+  <span class="kd">private</span> <span class="kd">static</span> <span class="nc">SortedMap</span><span class="o">&lt;</span><span class="nc">Key</span><span class="o">,</span><span class="nc">Value</span><span class="o">&gt;</span> <span class="nf">createInputData</span><span class="o">()</span> <span class="o">{</span>
     <span class="c1">// TODO -- implement this method</span>
   <span class="o">}</span>
 
-  <span class="kd">private</span> <span class="kd">static</span> <span class="n">SortedMap</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span><span class="n">Value</span><span class="o">&gt;</span> <span class="nf">createOutputData</span><span class="o">()</span> <span class="o">{</span>
+  <span class="kd">private</span> <span class="kd">static</span> <span class="nc">SortedMap</span><span class="o">&lt;</span><span class="nc">Key</span><span class="o">,</span><span class="nc">Value</span><span class="o">&gt;</span> <span class="nf">createOutputData</span><span class="o">()</span> <span class="o">{</span>
     <span class="c1">// TODO -- implement this method</span>
   <span class="o">}</span>
 
-  <span class="kd">private</span> <span class="kd">static</span> <span class="n">IteratorTestInput</span> <span class="nf">createIteratorInput</span><span class="o">()</span> <span class="o">{</span>
-    <span class="kd">final</span> <span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">options</span> <span class="o">=</span> <span class="n">createIteratorOptions</span><span class="o">();</span> 
-    <span class="kd">final</span> <span class="n">Range</span> <span class="n">range</span> <span class="o">=</span> <span class="n">createRange</span><span class="o">();</span>
-    <span class="k">return</span> <span class="k">new</span> <span class="nf">IteratorTestInput</span><span class="o">(</span><span class="n">MyIterator</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">options</span><span class="o">,</span> <span class="n">range</span><span class="o">,</span> <span class="n">INPUT_DATA</span><span class="o">);</span>
+  <span class="kd">private</span> <span class="kd">static</span> <span class="nc">IteratorTestInput</span> <span class="nf">createIteratorInput</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">final</span> <span class="nc">Map</span><span class="o">&lt;</span><span class="nc">String</span><span class="o">,</span><span class="nc">String</span><span class="o">&gt;</span> <span class="n">options</span> <span class="o">=</span> <span class="n">createIteratorOptions</span><span class="o">();</span> 
+    <span class="kd">final</span> <span class="nc">Range</span> <span class="n">range</span> <span class="o">=</span> <span class="n">createRange</span><span class="o">();</span>
+    <span class="k">return</span> <span class="k">new</span> <span class="nf">IteratorTestInput</span><span class="o">(</span><span class="nc">MyIterator</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">options</span><span class="o">,</span> <span class="n">range</span><span class="o">,</span> <span class="no">INPUT_DATA</span><span class="o">);</span>
   <span class="o">}</span>
 
-  <span class="kd">private</span> <span class="kd">static</span> <span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span><span class="n">String</span><span class="o">&gt;</span> <span class="nf">createIteratorOptions</span><span class="o">()</span> <span class="o">{</span>
+  <span class="kd">private</span> <span class="kd">static</span> <span class="nc">Map</span><span class="o">&lt;</span><span class="nc">String</span><span class="o">,</span><span class="nc">String</span><span class="o">&gt;</span> <span class="nf">createIteratorOptions</span><span class="o">()</span> <span class="o">{</span>
     <span class="c1">// TODO -- implement this method</span>
     <span class="c1">// Tip: Use INPUT_DATA if helpful in generating output</span>
   <span class="o">}</span>
 
-  <span class="kd">private</span> <span class="kd">static</span> <span class="n">Range</span> <span class="nf">createRange</span><span class="o">()</span> <span class="o">{</span>
+  <span class="kd">private</span> <span class="kd">static</span> <span class="nc">Range</span> <span class="nf">createRange</span><span class="o">()</span> <span class="o">{</span>
     <span class="c1">// TODO -- implement this method</span>
   <span class="o">}</span>
 
-  <span class="kd">private</span> <span class="kd">static</span> <span class="n">IteratorTestOutput</span> <span class="nf">createIteratorOutput</span><span class="o">()</span> <span class="o">{</span>
-    <span class="k">return</span> <span class="k">new</span> <span class="nf">IteratorTestOutput</span><span class="o">(</span><span class="n">OUTPUT_DATA</span><span class="o">);</span>
+  <span class="kd">private</span> <span class="kd">static</span> <span class="nc">IteratorTestOutput</span> <span class="nf">createIteratorOutput</span><span class="o">()</span> <span class="o">{</span>
+    <span class="k">return</span> <span class="k">new</span> <span class="nf">IteratorTestOutput</span><span class="o">(</span><span class="no">OUTPUT_DATA</span><span class="o">);</span>
   <span class="o">}</span>
 <span class="o">}</span>
 </code></pre></div></div>
diff --git a/docs/2.x/development/iterators.html b/docs/2.x/development/iterators.html
index 81d4bbe..84043d0 100644
--- a/docs/2.x/development/iterators.html
+++ b/docs/2.x/development/iterators.html
@@ -455,19 +455,19 @@ Iterators must have a public no-args constructor.</p>
 
 <p>A normal implementation of the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/iterators/SortedKeyValueIterator.html">SortedKeyValueIterator</a> defines functionality for the following methods:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kt">void</span> <span class="nf">init</span><span class="o">(</span><span class="n">SortedKeyValueIterator</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span><span class="n">Value</span><span class="o">&gt;</span> <span class="n">source</span><span class="o">,</span> <span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span> [...]
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kt">void</span> <span class="nf">init</span><span class="o">(</span><span class="nc">SortedKeyValueIterator</span><span class="o">&lt;</span><span class="nc">Key</span><span class="o">,</span><span class="nc">Value</span><span class="o">&gt;</span> <span class="n">source</span><span class="o">,</span> <span class="nc">Map</span><span class="o">&lt;</span><span class="nc">String</ [...]
 
 <span class="kt">boolean</span> <span class="nf">hasTop</span><span class="o">();</span>
 
-<span class="kt">void</span> <span class="nf">next</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">IOException</span><span class="o">;</span>
+<span class="kt">void</span> <span class="nf">next</span><span class="o">()</span> <span class="kd">throws</span> <span class="nc">IOException</span><span class="o">;</span>
 
-<span class="kt">void</span> <span class="nf">seek</span><span class="o">(</span><span class="n">Range</span> <span class="n">range</span><span class="o">,</span> <span class="n">Collection</span><span class="o">&lt;</span><span class="n">ByteSequence</span><span class="o">&gt;</span> <span class="n">columnFamilies</span><span class="o">,</span> <span class="kt">boolean</span> <span class="n">inclusive</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">IOExcept [...]
+<span class="kt">void</span> <span class="nf">seek</span><span class="o">(</span><span class="nc">Range</span> <span class="n">range</span><span class="o">,</span> <span class="nc">Collection</span><span class="o">&lt;</span><span class="nc">ByteSequence</span><span class="o">&gt;</span> <span class="n">columnFamilies</span><span class="o">,</span> <span class="kt">boolean</span> <span class="n">inclusive</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">IOEx [...]
 
-<span class="n">Key</span> <span class="nf">getTopKey</span><span class="o">();</span>
+<span class="nc">Key</span> <span class="nf">getTopKey</span><span class="o">();</span>
 
-<span class="n">Value</span> <span class="nf">getTopValue</span><span class="o">();</span>
+<span class="nc">Value</span> <span class="nf">getTopValue</span><span class="o">();</span>
 
-<span class="n">SortedKeyValueIterator</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span><span class="n">Value</span><span class="o">&gt;</span> <span class="nf">deepCopy</span><span class="o">(</span><span class="n">IteratorEnvironment</span> <span class="n">env</span><span class="o">);</span>
+<span class="nc">SortedKeyValueIterator</span><span class="o">&lt;</span><span class="nc">Key</span><span class="o">,</span><span class="nc">Value</span><span class="o">&gt;</span> <span class="nf">deepCopy</span><span class="o">(</span><span class="nc">IteratorEnvironment</span> <span class="n">env</span><span class="o">);</span>
 </code></pre></div></div>
 
 <h3 id="init">init</h3>
@@ -593,7 +593,7 @@ then returns itself.</p>
 resulting in starving out other scans within the same thread pool, try implementing the
 optional YieldingKeyValueIterator interface which SortedKeyValueIterator extends.</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="k">default</span> <span class="kt">void</span> <span class="nf">enableYielding</span><span class="o">(</span><span class="n">YieldCallback</span> <span class="n">callback</span><span class="o">)</span> <span class="o">{</span> <span class="o">}</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="k">default</span> <span class="kt">void</span> <span class="nf">enableYielding</span><span class="o">(</span><span class="nc">YieldCallback</span> <span class="n">callback</span><span class="o">)</span> <span class="o">{</span> <span class="o">}</span>
 </code></pre></div></div>
 
 <h3 id="enableyielding">enableYielding</h3>
@@ -609,23 +609,23 @@ the enableYielding method will not be called in isolation mode.</p>
 
 <p>The following code is a general outline for how TabletServers invoke Iterators.</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">List</span><span class="o">&lt;</span><span class="n">KeyValue</span><span class="o">&gt;</span> <span class="n">batch</span><span class="o">;</span>
-<span class="n">Range</span> <span class="n">range</span> <span class="o">=</span> <span class="n">getRangeFromClient</span><span class="o">();</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">List</span><span class="o">&lt;</span><span class="nc">KeyValue</span><span class="o">&gt;</span> <span class="n">batch</span><span class="o">;</span>
+<span class="nc">Range</span> <span class="n">range</span> <span class="o">=</span> <span class="n">getRangeFromClient</span><span class="o">();</span>
 <span class="k">while</span> <span class="o">(!</span><span class="n">overSizeLimit</span><span class="o">(</span><span class="n">batch</span><span class="o">))</span> <span class="o">{</span>
-    <span class="n">SortedKeyValueIterator</span> <span class="n">source</span> <span class="o">=</span> <span class="n">getSystemIterator</span><span class="o">();</span>
+    <span class="nc">SortedKeyValueIterator</span> <span class="n">source</span> <span class="o">=</span> <span class="n">getSystemIterator</span><span class="o">();</span>
 
-    <span class="k">for</span> <span class="o">(</span><span class="n">String</span> <span class="n">clzName</span> <span class="o">:</span> <span class="n">getUserIterators</span><span class="o">())</span> <span class="o">{</span>
-        <span class="n">Class</span><span class="o">&lt;?&gt;</span> <span class="n">clz</span> <span class="o">=</span> <span class="n">Class</span><span class="o">.</span><span class="na">forName</span><span class="o">(</span><span class="n">clzName</span><span class="o">);</span>
-        <span class="n">SortedKeyValueIterator</span> <span class="n">iter</span> <span class="o">=</span> <span class="o">(</span><span class="n">SortedKeyValueIterator</span><span class="o">)</span> <span class="n">clz</span><span class="o">.</span><span class="na">newInstance</span><span class="o">();</span>
+    <span class="k">for</span> <span class="o">(</span><span class="nc">String</span> <span class="n">clzName</span> <span class="o">:</span> <span class="n">getUserIterators</span><span class="o">())</span> <span class="o">{</span>
+        <span class="nc">Class</span><span class="o">&lt;?&gt;</span> <span class="n">clz</span> <span class="o">=</span> <span class="nc">Class</span><span class="o">.</span><span class="na">forName</span><span class="o">(</span><span class="n">clzName</span><span class="o">);</span>
+        <span class="nc">SortedKeyValueIterator</span> <span class="n">iter</span> <span class="o">=</span> <span class="o">(</span><span class="nc">SortedKeyValueIterator</span><span class="o">)</span> <span class="n">clz</span><span class="o">.</span><span class="na">newInstance</span><span class="o">();</span>
         <span class="n">iter</span><span class="o">.</span><span class="na">init</span><span class="o">(</span><span class="n">source</span><span class="o">,</span> <span class="n">opts</span><span class="o">,</span> <span class="n">env</span><span class="o">);</span>
         <span class="n">source</span> <span class="o">=</span> <span class="n">iter</span><span class="o">;</span>
     <span class="o">}</span>
 
     <span class="c1">// read a batch of data to return to client from</span>
     <span class="c1">// the last iterator, the "top"</span>
-    <span class="n">SortedKeyValueIterator</span> <span class="n">topIter</span> <span class="o">=</span> <span class="n">source</span><span class="o">;</span>
+    <span class="nc">SortedKeyValueIterator</span> <span class="n">topIter</span> <span class="o">=</span> <span class="n">source</span><span class="o">;</span>
 
-    <span class="n">YieldCallback</span> <span class="n">cb</span> <span class="o">=</span> <span class="k">new</span> <span class="n">YieldCallback</span><span class="o">();</span>
+    <span class="nc">YieldCallback</span> <span class="n">cb</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">YieldCallback</span><span class="o">();</span>
     <span class="n">topIter</span><span class="o">.</span><span class="na">enableYielding</span><span class="o">(</span><span class="n">cb</span><span class="o">)</span>
 
     <span class="n">topIter</span><span class="o">.</span><span class="na">seek</span><span class="o">(</span><span class="n">range</span><span class="o">,</span> <span class="o">...)</span>
@@ -633,13 +633,13 @@ the enableYielding method will not be called in isolation mode.</p>
     <span class="k">while</span> <span class="o">(</span><span class="n">topIter</span><span class="o">.</span><span class="na">hasTop</span><span class="o">()</span> <span class="o">&amp;&amp;</span> <span class="o">!</span><span class="n">overSizeLimit</span><span class="o">(</span><span class="n">batch</span><span class="o">))</span> <span class="o">{</span>
         <span class="n">key</span> <span class="o">=</span> <span class="n">topIter</span><span class="o">.</span><span class="na">getTopKey</span><span class="o">()</span>
         <span class="n">val</span> <span class="o">=</span> <span class="n">topIter</span><span class="o">.</span><span class="na">getTopValue</span><span class="o">()</span>
-        <span class="n">batch</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="n">KeyValue</span><span class="o">(</span><span class="n">key</span><span class="o">,</span> <span class="n">val</span><span class="o">)</span>
+        <span class="n">batch</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="nc">KeyValue</span><span class="o">(</span><span class="n">key</span><span class="o">,</span> <span class="n">val</span><span class="o">)</span>
         <span class="c1">// remember the last key returned</span>
         <span class="n">setLastKeyReturned</span><span class="o">(</span><span class="n">key</span><span class="o">);</span>
         <span class="k">if</span> <span class="o">(</span><span class="n">systemDataSourcesChanged</span><span class="o">())</span> <span class="o">{</span>
             <span class="c1">// code does not show isolation case, which will</span>
             <span class="c1">// keep using same data sources until a row boundary is hit</span>
-            <span class="n">range</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Range</span><span class="o">(</span><span class="n">key</span><span class="o">,</span> <span class="kc">false</span><span class="o">,</span> <span class="n">range</span><span class="o">.</span><span class="na">endKey</span><span class="o">(),</span> <span class="n">range</span><span class="o">.</span><span class="na">endKeyInclusive</span><span class="o">());</span>
+            <span class="n">range</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Range</span><span class="o">(</span><span class="n">key</span><span class="o">,</span> <span class="kc">false</span><span class="o">,</span> <span class="n">range</span><span class="o">.</span><span class="na">endKey</span><span class="o">(),</span> <span class="n">range</span><span class="o">.</span><span class="na">endKeyInclusive</span><span class="o">());</span>
             <span class="k">break</span><span class="o">;</span>
         <span class="o">}</span>
         <span class="n">topIter</span><span class="o">.</span><span class="na">next</span><span class="o">()</span>
@@ -657,14 +657,14 @@ the enableYielding method will not be called in isolation mode.</p>
 <p>Additionally, the obtuse “re-seek” case can be outlined as the following:</p>
 
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c1">// Given the above</span>
-<span class="n">List</span><span class="o">&lt;</span><span class="n">KeyValue</span><span class="o">&gt;</span> <span class="n">batch</span> <span class="o">=</span> <span class="n">getNextBatch</span><span class="o">();</span>
+<span class="nc">List</span><span class="o">&lt;</span><span class="nc">KeyValue</span><span class="o">&gt;</span> <span class="n">batch</span> <span class="o">=</span> <span class="n">getNextBatch</span><span class="o">();</span>
 
 <span class="c1">// thread goes away (client stops asking for the next batch).</span>
 
 <span class="c1">// Eventually client comes back</span>
 <span class="c1">// Setup as before...</span>
-<span class="n">Range</span> <span class="n">userRange</span> <span class="o">=</span> <span class="n">getRangeFromClient</span><span class="o">();</span>
-<span class="n">Range</span> <span class="n">actualRange</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Range</span><span class="o">(</span><span class="n">getLastKeyReturned</span><span class="o">(),</span> <span class="kc">false</span><span class="o">,</span> <span class="n">userRange</span><span class="o">.</span><span class="na">getEndKey</span><span class="o">(),</span> <span class="n">userRange</span><span class="o">.</span><span class="na">isEndKeyInclu [...]
+<span class="nc">Range</span> <span class="n">userRange</span> <span class="o">=</span> <span class="n">getRangeFromClient</span><span class="o">();</span>
+<span class="nc">Range</span> <span class="n">actualRange</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Range</span><span class="o">(</span><span class="n">getLastKeyReturned</span><span class="o">(),</span> <span class="kc">false</span><span class="o">,</span> <span class="n">userRange</span><span class="o">.</span><span class="na">getEndKey</span><span class="o">(),</span> <span class="n">userRange</span><span class="o">.</span><span class="na">isEndKeyInc [...]
 
 <span class="c1">// Use the actualRange, not the user provided one</span>
 <span class="n">topIter</span><span class="o">.</span><span class="na">seek</span><span class="o">(</span><span class="n">actualRange</span><span class="o">);</span>
diff --git a/docs/2.x/development/mapreduce.html b/docs/2.x/development/mapreduce.html
index 9003e4b..5f6859d 100644
--- a/docs/2.x/development/mapreduce.html
+++ b/docs/2.x/development/mapreduce.html
@@ -488,8 +488,8 @@ your job with <code class="highlighter-rouge">yarn</code> command.</p>
   <li>
     <p>Create a Mapper with the following class parameterization.</p>
 
-    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">class</span> <span class="nc">MyMapper</span> <span class="kd">extends</span> <span class="n">Mapper</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span><span class="n">Value</span><span class="o">,</span><span class="n">WritableComparable</span><span class="o">,</span><span class="n">Writable</span><span class="o">&gt;</span> <span class=" [...]
-     <span class="kd">public</span> <span class="kt">void</span> <span class="nf">map</span><span class="o">(</span><span class="n">Key</span> <span class="n">k</span><span class="o">,</span> <span class="n">Value</span> <span class="n">v</span><span class="o">,</span> <span class="n">Context</span> <span class="n">c</span><span class="o">)</span> <span class="o">{</span>
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">class</span> <span class="nc">MyMapper</span> <span class="kd">extends</span> <span class="nc">Mapper</span><span class="o">&lt;</span><span class="nc">Key</span><span class="o">,</span><span class="nc">Value</span><span class="o">,</span><span class="nc">WritableComparable</span><span class="o">,</span><span class="nc">Writable</span><span class="o">&gt;</span> <span cl [...]
+     <span class="kd">public</span> <span class="kt">void</span> <span class="nf">map</span><span class="o">(</span><span class="nc">Key</span> <span class="n">k</span><span class="o">,</span> <span class="nc">Value</span> <span class="n">v</span><span class="o">,</span> <span class="nc">Context</span> <span class="n">c</span><span class="o">)</span> <span class="o">{</span>
          <span class="c1">// transform key and value data here</span>
      <span class="o">}</span>
  <span class="o">}</span>
@@ -498,41 +498,41 @@ your job with <code class="highlighter-rouge">yarn</code> command.</p>
   <li>
     <p>Configure your MapReduce job to use <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-hadoop-mapreduce/2.0.0-alpha-2/org/apache/accumulo/hadoop/mapreduce/AccumuloInputFormat.html">AccumuloInputFormat</a>.</p>
 
-    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">Job</span> <span class="n">job</span> <span class="o">=</span> <span class="n">Job</span><span class="o">.</span><span class="na">getInstance</span><span class="o">();</span>
- <span class="n">job</span><span class="o">.</span><span class="na">setInputFormatClass</span><span class="o">(</span><span class="n">AccumuloInputFormat</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
- <span class="n">Properties</span> <span class="n">props</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClientProperties</span><span class="o">().</span><span class="na">to</span><span class="o">(</span><span class="s">"myinstance"</span><span class="o">,</span><span class="s">"zoo1,zoo2"</span><span class="o">)</span>
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">Job</span> <span class="n">job</span> <span class="o">=</span> <span class="nc">Job</span><span class="o">.</span><span class="na">getInstance</span><span class="o">();</span>
+ <span class="n">job</span><span class="o">.</span><span class="na">setInputFormatClass</span><span class="o">(</span><span class="nc">AccumuloInputFormat</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+ <span class="nc">Properties</span> <span class="n">props</span> <span class="o">=</span> <span class="nc">Accumulo</span><span class="o">.</span><span class="na">newClientProperties</span><span class="o">().</span><span class="na">to</span><span class="o">(</span><span class="s">"myinstance"</span><span class="o">,</span><span class="s">"zoo1,zoo2"</span><span class="o">)</span>
                          <span class="o">.</span><span class="na">as</span><span class="o">(</span><span class="s">"user"</span><span class="o">,</span> <span class="s">"passwd"</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
- <span class="n">AccumuloInputFormat</span><span class="o">.</span><span class="na">configure</span><span class="o">().</span><span class="na">clientProperties</span><span class="o">(</span><span class="n">props</span><span class="o">).</span><span class="na">table</span><span class="o">(</span><span class="n">table</span><span class="o">).</span><span class="na">store</span><span class="o">(</span><span class="n">job</span><span class="o">);</span>
+ <span class="nc">AccumuloInputFormat</span><span class="o">.</span><span class="na">configure</span><span class="o">().</span><span class="na">clientProperties</span><span class="o">(</span><span class="n">props</span><span class="o">).</span><span class="na">table</span><span class="o">(</span><span class="n">table</span><span class="o">).</span><span class="na">store</span><span class="o">(</span><span class="n">job</span><span class="o">);</span>
 </code></pre></div>    </div>
     <p><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-hadoop-mapreduce/2.0.0-alpha-2/org/apache/accumulo/hadoop/mapreduce/AccumuloInputFormat.html">AccumuloInputFormat</a> has optional settings.</p>
-    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">List</span><span class="o">&lt;</span><span class="n">Range</span><span class="o">&gt;</span> <span class="n">ranges</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ArrayList</span><span class="o">&lt;</span><span class="n">Range</span><span class="o">&gt;();</span>
- <span class="n">Collection</span><span class="o">&lt;</span><span class="n">IteratorSetting</span><span class="o">.</span><span class="na">Column</span><span class="o">&gt;</span> <span class="n">columns</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ArrayList</span><span class="o">&lt;</span><span class="n">IteratorSetting</span><span class="o">.</span><span class="na">Column</span><span class="o">&gt;();</span>
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">List</span><span class="o">&lt;</span><span class="nc">Range</span><span class="o">&gt;</span> <span class="n">ranges</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">ArrayList</span><span class="o">&lt;</span><span class="nc">Range</span><span class="o">&gt;();</span>
+ <span class="nc">Collection</span><span class="o">&lt;</span><span class="nc">IteratorSetting</span><span class="o">.</span><span class="na">Column</span><span class="o">&gt;</span> <span class="n">columns</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">ArrayList</span><span class="o">&lt;</span><span class="nc">IteratorSetting</span><span class="o">.</span><span class="na">Column</span><span class="o">&gt;();</span>
  <span class="c1">// populate ranges &amp; columns</span>
- <span class="n">IteratorSetting</span> <span class="n">is</span> <span class="o">=</span> <span class="k">new</span> <span class="n">IteratorSetting</span><span class="o">(</span><span class="mi">30</span><span class="o">,</span> <span class="n">RexExFilter</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
- <span class="n">RegExFilter</span><span class="o">.</span><span class="na">setRegexs</span><span class="o">(</span><span class="n">is</span><span class="o">,</span> <span class="s">".*suffix"</span><span class="o">,</span> <span class="kc">null</span><span class="o">,</span> <span class="kc">null</span><span class="o">,</span> <span class="kc">null</span><span class="o">,</span> <span class="kc">true</span><span class="o">);</span>
+ <span class="nc">IteratorSetting</span> <span class="n">is</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">IteratorSetting</span><span class="o">(</span><span class="mi">30</span><span class="o">,</span> <span class="nc">RexExFilter</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+ <span class="nc">RegExFilter</span><span class="o">.</span><span class="na">setRegexs</span><span class="o">(</span><span class="n">is</span><span class="o">,</span> <span class="s">".*suffix"</span><span class="o">,</span> <span class="kc">null</span><span class="o">,</span> <span class="kc">null</span><span class="o">,</span> <span class="kc">null</span><span class="o">,</span> <span class="kc">true</span><span class="o">);</span>
 
- <span class="n">AccumuloInputFormat</span><span class="o">.</span><span class="na">configure</span><span class="o">().</span><span class="na">clientProperties</span><span class="o">(</span><span class="n">props</span><span class="o">).</span><span class="na">table</span><span class="o">(</span><span class="n">table</span><span class="o">)</span>
-     <span class="o">.</span><span class="na">auths</span><span class="o">(</span><span class="n">Authorizations</span><span class="o">.</span><span class="na">EMPTY</span><span class="o">)</span> <span class="c1">// optional: default to user's auths if not set</span>
+ <span class="nc">AccumuloInputFormat</span><span class="o">.</span><span class="na">configure</span><span class="o">().</span><span class="na">clientProperties</span><span class="o">(</span><span class="n">props</span><span class="o">).</span><span class="na">table</span><span class="o">(</span><span class="n">table</span><span class="o">)</span>
+     <span class="o">.</span><span class="na">auths</span><span class="o">(</span><span class="nc">Authorizations</span><span class="o">.</span><span class="na">EMPTY</span><span class="o">)</span> <span class="c1">// optional: default to user's auths if not set</span>
      <span class="o">.</span><span class="na">ranges</span><span class="o">(</span><span class="n">ranges</span><span class="o">)</span>              <span class="c1">// optional: only read specified ranges</span>
      <span class="o">.</span><span class="na">fetchColumns</span><span class="o">(</span><span class="n">columns</span><span class="o">)</span>       <span class="c1">// optional: only read specified columns</span>
      <span class="o">.</span><span class="na">addIterator</span><span class="o">(</span><span class="n">is</span><span class="o">)</span>             <span class="c1">// optional: add iterator that matches row IDs</span>
      <span class="o">.</span><span class="na">store</span><span class="o">(</span><span class="n">job</span><span class="o">);</span>
 </code></pre></div>    </div>
     <p><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-hadoop-mapreduce/2.0.0-alpha-2/org/apache/accumulo/hadoop/mapreduce/AccumuloInputFormat.html">AccumuloInputFormat</a> can also be configured to read from multiple Accumulo tables.</p>
-    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">Job</span> <span class="n">job</span> <span class="o">=</span> <span class="n">Job</span><span class="o">.</span><span class="na">getInstance</span><span class="o">();</span>
- <span class="n">job</span><span class="o">.</span><span class="na">setInputFormatClass</span><span class="o">(</span><span class="n">AccumuloInputFormat</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
- <span class="n">Properties</span> <span class="n">props</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClientProperties</span><span class="o">().</span><span class="na">to</span><span class="o">(</span><span class="s">"myinstance"</span><span class="o">,</span><span class="s">"zoo1,zoo2"</span><span class="o">)</span>
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">Job</span> <span class="n">job</span> <span class="o">=</span> <span class="nc">Job</span><span class="o">.</span><span class="na">getInstance</span><span class="o">();</span>
+ <span class="n">job</span><span class="o">.</span><span class="na">setInputFormatClass</span><span class="o">(</span><span class="nc">AccumuloInputFormat</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+ <span class="nc">Properties</span> <span class="n">props</span> <span class="o">=</span> <span class="nc">Accumulo</span><span class="o">.</span><span class="na">newClientProperties</span><span class="o">().</span><span class="na">to</span><span class="o">(</span><span class="s">"myinstance"</span><span class="o">,</span><span class="s">"zoo1,zoo2"</span><span class="o">)</span>
                          <span class="o">.</span><span class="na">as</span><span class="o">(</span><span class="s">"user"</span><span class="o">,</span> <span class="s">"passwd"</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
- <span class="n">AccumuloInputFormat</span><span class="o">.</span><span class="na">configure</span><span class="o">().</span><span class="na">clientProperties</span><span class="o">(</span><span class="n">props</span><span class="o">)</span>
-     <span class="o">.</span><span class="na">table</span><span class="o">(</span><span class="s">"table1"</span><span class="o">).</span><span class="na">auths</span><span class="o">(</span><span class="n">Authorizations</span><span class="o">.</span><span class="na">EMPTY</span><span class="o">).</span><span class="na">ranges</span><span class="o">(</span><span class="n">tableOneRanges</span><span class="o">)</span>
-     <span class="o">.</span><span class="na">table</span><span class="o">(</span><span class="s">"table2"</span><span class="o">).</span><span class="na">auths</span><span class="o">(</span><span class="n">Authorizations</span><span class="o">.</span><span class="na">EMPTY</span><span class="o">).</span><span class="na">ranges</span><span class="o">(</span><span class="n">tableTwoRanges</span><span class="o">)</span>
+ <span class="nc">AccumuloInputFormat</span><span class="o">.</span><span class="na">configure</span><span class="o">().</span><span class="na">clientProperties</span><span class="o">(</span><span class="n">props</span><span class="o">)</span>
+     <span class="o">.</span><span class="na">table</span><span class="o">(</span><span class="s">"table1"</span><span class="o">).</span><span class="na">auths</span><span class="o">(</span><span class="nc">Authorizations</span><span class="o">.</span><span class="na">EMPTY</span><span class="o">).</span><span class="na">ranges</span><span class="o">(</span><span class="n">tableOneRanges</span><span class="o">)</span>
+     <span class="o">.</span><span class="na">table</span><span class="o">(</span><span class="s">"table2"</span><span class="o">).</span><span class="na">auths</span><span class="o">(</span><span class="nc">Authorizations</span><span class="o">.</span><span class="na">EMPTY</span><span class="o">).</span><span class="na">ranges</span><span class="o">(</span><span class="n">tableTwoRanges</span><span class="o">)</span>
      <span class="o">.</span><span class="na">store</span><span class="o">(</span><span class="n">job</span><span class="o">);</span>
 </code></pre></div>    </div>
     <p>If reading from multiple tables, the table name can be retrieved from the input split:</p>
-    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">class</span> <span class="nc">MyMapper</span> <span class="kd">extends</span> <span class="n">Mapper</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span><span class="n">Value</span><span class="o">,</span><span class="n">WritableComparable</span><span class="o">,</span><span class="n">Writable</span><span class="o">&gt;</span> <span class=" [...]
-     <span class="kd">public</span> <span class="kt">void</span> <span class="nf">map</span><span class="o">(</span><span class="n">Key</span> <span class="n">k</span><span class="o">,</span> <span class="n">Value</span> <span class="n">v</span><span class="o">,</span> <span class="n">Context</span> <span class="n">c</span><span class="o">)</span> <span class="o">{</span>
-         <span class="n">RangeInputSplit</span> <span class="n">split</span> <span class="o">=</span> <span class="o">(</span><span class="n">RangeInputSplit</span><span class="o">)</span><span class="n">c</span><span class="o">.</span><span class="na">getInputSplit</span><span class="o">();</span>
-         <span class="n">String</span> <span class="n">tableName</span> <span class="o">=</span> <span class="n">split</span><span class="o">.</span><span class="na">getTableName</span><span class="o">();</span>
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">class</span> <span class="nc">MyMapper</span> <span class="kd">extends</span> <span class="nc">Mapper</span><span class="o">&lt;</span><span class="nc">Key</span><span class="o">,</span><span class="nc">Value</span><span class="o">,</span><span class="nc">WritableComparable</span><span class="o">,</span><span class="nc">Writable</span><span class="o">&gt;</span> <span cl [...]
+     <span class="kd">public</span> <span class="kt">void</span> <span class="nf">map</span><span class="o">(</span><span class="nc">Key</span> <span class="n">k</span><span class="o">,</span> <span class="nc">Value</span> <span class="n">v</span><span class="o">,</span> <span class="nc">Context</span> <span class="n">c</span><span class="o">)</span> <span class="o">{</span>
+         <span class="nc">RangeInputSplit</span> <span class="n">split</span> <span class="o">=</span> <span class="o">(</span><span class="nc">RangeInputSplit</span><span class="o">)</span><span class="n">c</span><span class="o">.</span><span class="na">getInputSplit</span><span class="o">();</span>
+         <span class="nc">String</span> <span class="n">tableName</span> <span class="o">=</span> <span class="n">split</span><span class="o">.</span><span class="na">getTableName</span><span class="o">();</span>
          <span class="c1">// do something with table name</span>
      <span class="o">}</span>
  <span class="o">}</span>
@@ -550,11 +550,11 @@ your job with <code class="highlighter-rouge">yarn</code> command.</p>
  Reducer to write to more than one table if desired. A default table can be configured
  using the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-hadoop-mapreduce/2.0.0-alpha-2/org/apache/accumulo/hadoop/mapreduce/AccumuloOutputFormat.html">AccumuloOutputFormat</a>, in which case the output table name does not have to
  be passed to the Context object within the Reducer.
-    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">class</span> <span class="nc">MyReducer</span> <span class="kd">extends</span> <span class="n">Reducer</span><span class="o">&lt;</span><span class="n">WritableComparable</span><span class="o">,</span> <span class="n">Writable</span><span class="o">,</span> <span class="n">Text</span><span class="o">,</span> <span class="n">Mutation</span><span class="o">&gt;</span> <spa [...]
-     <span class="kd">public</span> <span class="kt">void</span> <span class="nf">reduce</span><span class="o">(</span><span class="n">WritableComparable</span> <span class="n">key</span><span class="o">,</span> <span class="n">Iterable</span><span class="o">&lt;</span><span class="n">Text</span><span class="o">&gt;</span> <span class="n">values</span><span class="o">,</span> <span class="n">Context</span> <span class="n">c</span><span class="o">)</span> <span class="o">{</span>
-         <span class="n">Mutation</span> <span class="n">m</span><span class="o">;</span>
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">class</span> <span class="nc">MyReducer</span> <span class="kd">extends</span> <span class="nc">Reducer</span><span class="o">&lt;</span><span class="nc">WritableComparable</span><span class="o">,</span> <span class="nc">Writable</span><span class="o">,</span> <span class="nc">Text</span><span class="o">,</span> <span class="nc">Mutation</span><span class="o">&gt;</span> [...]
+     <span class="kd">public</span> <span class="kt">void</span> <span class="nf">reduce</span><span class="o">(</span><span class="nc">WritableComparable</span> <span class="n">key</span><span class="o">,</span> <span class="nc">Iterable</span><span class="o">&lt;</span><span class="nc">Text</span><span class="o">&gt;</span> <span class="n">values</span><span class="o">,</span> <span class="nc">Context</span> <span class="n">c</span><span class="o">)</span> <span class="o">{</span>
+         <span class="nc">Mutation</span> <span class="n">m</span><span class="o">;</span>
          <span class="c1">// create the mutation based on input key and value</span>
-         <span class="n">c</span><span class="o">.</span><span class="na">write</span><span class="o">(</span><span class="k">new</span> <span class="n">Text</span><span class="o">(</span><span class="s">"output-table"</span><span class="o">),</span> <span class="n">m</span><span class="o">);</span>
+         <span class="n">c</span><span class="o">.</span><span class="na">write</span><span class="o">(</span><span class="k">new</span> <span class="nc">Text</span><span class="o">(</span><span class="s">"output-table"</span><span class="o">),</span> <span class="n">m</span><span class="o">);</span>
      <span class="o">}</span>
  <span class="o">}</span>
 </code></pre></div>    </div>
@@ -564,11 +564,11 @@ your job with <code class="highlighter-rouge">yarn</code> command.</p>
  options.</p>
   </li>
   <li>Configure your MapReduce job to use <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-hadoop-mapreduce/2.0.0-alpha-2/org/apache/accumulo/hadoop/mapreduce/AccumuloOutputFormat.html">AccumuloOutputFormat</a>.
-    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">Job</span> <span class="n">job</span> <span class="o">=</span> <span class="n">Job</span><span class="o">.</span><span class="na">getInstance</span><span class="o">();</span>
- <span class="n">job</span><span class="o">.</span><span class="na">setOutputFormatClass</span><span class="o">(</span><span class="n">AccumuloOutputFormat</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
- <span class="n">Properties</span> <span class="n">props</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClientProperties</span><span class="o">().</span><span class="na">to</span><span class="o">(</span><span class="s">"myinstance"</span><span class="o">,</span><span class="s">"zoo1,zoo2"</span><span class="o">)</span>
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">Job</span> <span class="n">job</span> <span class="o">=</span> <span class="nc">Job</span><span class="o">.</span><span class="na">getInstance</span><span class="o">();</span>
+ <span class="n">job</span><span class="o">.</span><span class="na">setOutputFormatClass</span><span class="o">(</span><span class="nc">AccumuloOutputFormat</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+ <span class="nc">Properties</span> <span class="n">props</span> <span class="o">=</span> <span class="nc">Accumulo</span><span class="o">.</span><span class="na">newClientProperties</span><span class="o">().</span><span class="na">to</span><span class="o">(</span><span class="s">"myinstance"</span><span class="o">,</span><span class="s">"zoo1,zoo2"</span><span class="o">)</span>
                          <span class="o">.</span><span class="na">as</span><span class="o">(</span><span class="s">"user"</span><span class="o">,</span> <span class="s">"passwd"</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
- <span class="n">AccumuloOutputFormat</span><span class="o">.</span><span class="na">configure</span><span class="o">().</span><span class="na">clientProperties</span><span class="o">(</span><span class="n">props</span><span class="o">)</span>
+ <span class="nc">AccumuloOutputFormat</span><span class="o">.</span><span class="na">configure</span><span class="o">().</span><span class="na">clientProperties</span><span class="o">(</span><span class="n">props</span><span class="o">)</span>
      <span class="o">.</span><span class="na">defaultTable</span><span class="o">(</span><span class="s">"mytable"</span><span class="o">).</span><span class="na">store</span><span class="o">(</span><span class="n">job</span><span class="o">);</span>
 </code></pre></div>    </div>
   </li>
@@ -581,10 +581,10 @@ can then be bulk imported into Accumulo:</p>
 
 <ol>
   <li>Create a Mapper or Reducer with <code class="highlighter-rouge">Key</code> &amp; <code class="highlighter-rouge">Value</code> as output parameters.
-    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">class</span> <span class="nc">MyReducer</span> <span class="kd">extends</span> <span class="n">Reducer</span><span class="o">&lt;</span><span class="n">WritableComparable</span><span class="o">,</span> <span class="n">Writable</span><span class="o">,</span> <span class="n">Key</span><span class="o">,</span> <span class="n">Value</span><span class="o">&gt;</span> <span cl [...]
-     <span class="kd">public</span> <span class="kt">void</span> <span class="nf">reduce</span><span class="o">(</span><span class="n">WritableComparable</span> <span class="n">key</span><span class="o">,</span> <span class="n">Iterable</span><span class="o">&lt;</span><span class="n">Text</span><span class="o">&gt;</span> <span class="n">values</span><span class="o">,</span> <span class="n">Context</span> <span class="n">c</span><span class="o">)</span> <span class="o">{</span>
-         <span class="n">Key</span> <span class="n">key</span><span class="o">;</span>
-         <span class="n">Value</span> <span class="n">value</span><span class="o">;</span>
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">class</span> <span class="nc">MyReducer</span> <span class="kd">extends</span> <span class="nc">Reducer</span><span class="o">&lt;</span><span class="nc">WritableComparable</span><span class="o">,</span> <span class="nc">Writable</span><span class="o">,</span> <span class="nc">Key</span><span class="o">,</span> <span class="nc">Value</span><span class="o">&gt;</span> <sp [...]
+     <span class="kd">public</span> <span class="kt">void</span> <span class="nf">reduce</span><span class="o">(</span><span class="nc">WritableComparable</span> <span class="n">key</span><span class="o">,</span> <span class="nc">Iterable</span><span class="o">&lt;</span><span class="nc">Text</span><span class="o">&gt;</span> <span class="n">values</span><span class="o">,</span> <span class="nc">Context</span> <span class="n">c</span><span class="o">)</span> <span class="o">{</span>
+         <span class="nc">Key</span> <span class="n">key</span><span class="o">;</span>
+         <span class="nc">Value</span> <span class="n">value</span><span class="o">;</span>
          <span class="c1">// create Key &amp; Value based on input</span>
          <span class="n">c</span><span class="o">.</span><span class="na">write</span><span class="o">(</span><span class="n">key</span><span class="o">,</span> <span class="n">value</span><span class="o">);</span>
      <span class="o">}</span>
@@ -592,10 +592,10 @@ can then be bulk imported into Accumulo:</p>
 </code></pre></div>    </div>
   </li>
   <li>Configure your MapReduce job to use <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-hadoop-mapreduce/2.0.0-alpha-2/org/apache/accumulo/hadoop/mapreduce/AccumuloFileOutputFormat.html">AccumuloFileOutputFormat</a>.
-    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">Job</span> <span class="n">job</span> <span class="o">=</span> <span class="n">Job</span><span class="o">.</span><span class="na">getInstance</span><span class="o">();</span>
- <span class="n">job</span><span class="o">.</span><span class="na">setOutputFormatClass</span><span class="o">(</span><span class="n">AccumuloFileOutputFormat</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
- <span class="n">AccumuloFileOutputFormat</span><span class="o">.</span><span class="na">configure</span><span class="o">()</span>
-     <span class="o">.</span><span class="na">outputPath</span><span class="o">(</span><span class="k">new</span> <span class="n">Path</span><span class="o">(</span><span class="s">"hdfs://localhost:8020/myoutput/"</span><span class="o">)).</span><span class="na">store</span><span class="o">(</span><span class="n">job</span><span class="o">);</span>
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">Job</span> <span class="n">job</span> <span class="o">=</span> <span class="nc">Job</span><span class="o">.</span><span class="na">getInstance</span><span class="o">();</span>
+ <span class="n">job</span><span class="o">.</span><span class="na">setOutputFormatClass</span><span class="o">(</span><span class="nc">AccumuloFileOutputFormat</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+ <span class="nc">AccumuloFileOutputFormat</span><span class="o">.</span><span class="na">configure</span><span class="o">()</span>
+     <span class="o">.</span><span class="na">outputPath</span><span class="o">(</span><span class="k">new</span> <span class="nc">Path</span><span class="o">(</span><span class="s">"hdfs://localhost:8020/myoutput/"</span><span class="o">)).</span><span class="na">store</span><span class="o">(</span><span class="n">job</span><span class="o">);</span>
 </code></pre></div>    </div>
   </li>
 </ol>
diff --git a/docs/2.x/development/proxy.html b/docs/2.x/development/proxy.html
index 7cbdbd9..dce4f03 100644
--- a/docs/2.x/development/proxy.html
+++ b/docs/2.x/development/proxy.html
@@ -493,9 +493,9 @@ For example, <code class="highlighter-rouge">pip install thrift</code> will inst
 of connecting to a Thrift service), the methods on the proxy client will be available. The
 first thing to do is log in:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Map</span> <span class="n">password</span> <span class="o">=</span> <span class="k">new</span> <span class="n">HashMap</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span><span class="n">String</span><span class="o">&gt;();</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">Map</span> <span class="n">password</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">HashMap</span><span class="o">&lt;</span><span class="nc">String</span><span class="o">,</span><span class="nc">String</span><span class="o">&gt;();</span>
 <span class="n">password</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"password"</span><span class="o">,</span> <span class="s">"secret"</span><span class="o">);</span>
-<span class="n">ByteBuffer</span> <span class="n">token</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">login</span><span class="o">(</span><span class="s">"root"</span><span class="o">,</span> <span class="n">password</span><span class="o">);</span>
+<span class="nc">ByteBuffer</span> <span class="n">token</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">login</span><span class="o">(</span><span class="s">"root"</span><span class="o">,</span> <span class="n">password</span><span class="o">);</span>
 </code></pre></div></div>
 
 <p>Once logged in, the token returned will be used for most subsequent calls to the client.
@@ -503,29 +503,29 @@ Let’s create a table, add some data, scan the table, and delete it.</p>
 
 <p>First, create a table.</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">client</span><span class="o">.</span><span class="na">createTable</span><span class="o">(</span><span class="n">token</span><span class="o">,</span> <span class="s">"myTable"</span><span class="o">,</span> <span class="kc">true</span><span class="o">,</span> <span class="n">TimeType</span><span class="o">.</span><span class="na">MILLIS</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">client</span><span class="o">.</span><span class="na">createTable</span><span class="o">(</span><span class="n">token</span><span class="o">,</span> <span class="s">"myTable"</span><span class="o">,</span> <span class="kc">true</span><span class="o">,</span> <span class="nc">TimeType</span><span class="o">.</span><span class="na">MILLIS</span><span class="o">);</span>
 </code></pre></div></div>
 
 <p>Next, add some data:</p>
 
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c1">// first, create a writer on the server</span>
-<span class="n">String</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createWriter</span><span class="o">(</span><span class="n">token</span><span class="o">,</span> <span class="s">"myTable"</span><span class="o">,</span> <span class="k">new</span> <span class="n">WriterOptions</span><span class="o">());</span>
+<span class="nc">String</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createWriter</span><span class="o">(</span><span class="n">token</span><span class="o">,</span> <span class="s">"myTable"</span><span class="o">,</span> <span class="k">new</span> <span class="nc">WriterOptions</span><span class="o">());</span>
 
 <span class="c1">//rowid</span>
-<span class="n">ByteBuffer</span> <span class="n">rowid</span> <span class="o">=</span> <span class="n">ByteBuffer</span><span class="o">.</span><span class="na">wrap</span><span class="o">(</span><span class="s">"UUID"</span><span class="o">.</span><span class="na">getBytes</span><span class="o">());</span>
+<span class="nc">ByteBuffer</span> <span class="n">rowid</span> <span class="o">=</span> <span class="nc">ByteBuffer</span><span class="o">.</span><span class="na">wrap</span><span class="o">(</span><span class="s">"UUID"</span><span class="o">.</span><span class="na">getBytes</span><span class="o">());</span>
 
 <span class="c1">//mutation like class</span>
-<span class="n">ColumnUpdate</span> <span class="n">cu</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ColumnUpdate</span><span class="o">();</span>
+<span class="nc">ColumnUpdate</span> <span class="n">cu</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">ColumnUpdate</span><span class="o">();</span>
 <span class="n">cu</span><span class="o">.</span><span class="na">setColFamily</span><span class="o">(</span><span class="s">"MyFamily"</span><span class="o">.</span><span class="na">getBytes</span><span class="o">());</span>
 <span class="n">cu</span><span class="o">.</span><span class="na">setColQualifier</span><span class="o">(</span><span class="s">"MyQualifier"</span><span class="o">.</span><span class="na">getBytes</span><span class="o">());</span>
 <span class="n">cu</span><span class="o">.</span><span class="na">setColVisibility</span><span class="o">(</span><span class="s">"VisLabel"</span><span class="o">.</span><span class="na">getBytes</span><span class="o">());</span>
 <span class="n">cu</span><span class="o">.</span><span class="na">setValue</span><span class="o">(</span><span class="s">"Some Value."</span><span class="o">.</span><span class="na">getBytes</span><span class="o">());</span>
 
-<span class="n">List</span><span class="o">&lt;</span><span class="n">ColumnUpdate</span><span class="o">&gt;</span> <span class="n">updates</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ArrayList</span><span class="o">&lt;</span><span class="n">ColumnUpdate</span><span class="o">&gt;();</span>
+<span class="nc">List</span><span class="o">&lt;</span><span class="nc">ColumnUpdate</span><span class="o">&gt;</span> <span class="n">updates</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">ArrayList</span><span class="o">&lt;</span><span class="nc">ColumnUpdate</span><span class="o">&gt;();</span>
 <span class="n">updates</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="n">cu</span><span class="o">);</span>
 
 <span class="c1">// build column updates</span>
-<span class="n">Map</span><span class="o">&lt;</span><span class="n">ByteBuffer</span><span class="o">,</span> <span class="n">List</span><span class="o">&lt;</span><span class="n">ColumnUpdate</span><span class="o">&gt;&gt;</span> <span class="n">cellsToUpdate</span> <span class="o">=</span> <span class="k">new</span> <span class="n">HashMap</span><span class="o">&lt;</span><span class="n">ByteBuffer</span><span class="o">,</span> <span class="n">List</span><span class="o">&lt;</span><s [...]
+<span class="nc">Map</span><span class="o">&lt;</span><span class="nc">ByteBuffer</span><span class="o">,</span> <span class="nc">List</span><span class="o">&lt;</span><span class="nc">ColumnUpdate</span><span class="o">&gt;&gt;</span> <span class="n">cellsToUpdate</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">HashMap</span><span class="o">&lt;</span><span class="nc">ByteBuffer</span><span class="o">,</span> <span class="nc">List</span><span class="o">&lt;</ [...]
 <span class="n">cellsToUpdate</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="n">rowid</span><span class="o">,</span> <span class="n">updates</span><span class="o">);</span>
 
 <span class="c1">// send updates to the server</span>
@@ -536,10 +536,10 @@ Let’s create a table, add some data, scan the table, and delete it.</p>
 
 <p>Scan for the data and batch the return of the results on the server:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">scanner</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="n">token</span><span class="o">,</span> <span class="s">"myTable"</span><span class="o">,</span> <span class="k">new</span> <span class="n">ScanOptions</span><span class="o">());</span>
-<span class="n">ScanResult</span> <span class="n">results</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">nextK</span><span class="o">(</span><span class="n">scanner</span><span class="o">,</span> <span class="mi">100</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">String</span> <span class="n">scanner</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="n">token</span><span class="o">,</span> <span class="s">"myTable"</span><span class="o">,</span> <span class="k">new</span> <span class="nc">ScanOptions</span><span class="o">());</span>
+<span class="nc">ScanResult</span> <span class="n">results</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">nextK</span><span class="o">(</span><span class="n">scanner</span><span class="o">,</span> <span class="mi">100</span><span class="o">);</span>
 
-<span class="k">for</span><span class="o">(</span><span class="n">KeyValue</span> <span class="n">keyValue</span> <span class="o">:</span> <span class="n">results</span><span class="o">.</span><span class="na">getResultsIterator</span><span class="o">())</span> <span class="o">{</span>
+<span class="k">for</span><span class="o">(</span><span class="nc">KeyValue</span> <span class="n">keyValue</span> <span class="o">:</span> <span class="n">results</span><span class="o">.</span><span class="na">getResultsIterator</span><span class="o">())</span> <span class="o">{</span>
   <span class="c1">// do something with results</span>
 <span class="o">}</span>
 
diff --git a/docs/2.x/development/spark.html b/docs/2.x/development/spark.html
index 50bb2d3..2e08640 100644
--- a/docs/2.x/development/spark.html
+++ b/docs/2.x/development/spark.html
@@ -454,10 +454,10 @@ to your Accumulo instance.</p>
 
 <p>Apache Spark can read from an Accumulo table by using <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-hadoop-mapreduce/2.0.0-alpha-2/org/apache/accumulo/hadoop/mapreduce/AccumuloInputFormat.html">AccumuloInputFormat</a>.</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Job</span> <span class="n">job</span> <span class="o">=</span> <span class="n">Job</span><span class="o">.</span><span class="na">getInstance</span><span class="o">();</span>
-<span class="n">AccumuloInputFormat</span><span class="o">.</span><span class="na">configure</span><span class="o">().</span><span class="na">clientProperties</span><span class="o">(</span><span class="n">props</span><span class="o">).</span><span class="na">table</span><span class="o">(</span><span class="n">inputTable</span><span class="o">).</span><span class="na">store</span><span class="o">(</span><span class="n">job</span><span class="o">);</span>
-<span class="n">JavaPairRDD</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span><span class="n">Value</span><span class="o">&gt;</span> <span class="n">data</span> <span class="o">=</span> <span class="n">sc</span><span class="o">.</span><span class="na">newAPIHadoopRDD</span><span class="o">(</span><span class="n">job</span><span class="o">.</span><span class="na">getConfiguration</span><span class="o">(),</span>
-    <span class="n">AccumuloInputFormat</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">Key</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">Value</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">Job</span> <span class="n">job</span> <span class="o">=</span> <span class="nc">Job</span><span class="o">.</span><span class="na">getInstance</span><span class="o">();</span>
+<span class="nc">AccumuloInputFormat</span><span class="o">.</span><span class="na">configure</span><span class="o">().</span><span class="na">clientProperties</span><span class="o">(</span><span class="n">props</span><span class="o">).</span><span class="na">table</span><span class="o">(</span><span class="n">inputTable</span><span class="o">).</span><span class="na">store</span><span class="o">(</span><span class="n">job</span><span class="o">);</span>
+<span class="nc">JavaPairRDD</span><span class="o">&lt;</span><span class="nc">Key</span><span class="o">,</span><span class="nc">Value</span><span class="o">&gt;</span> <span class="n">data</span> <span class="o">=</span> <span class="n">sc</span><span class="o">.</span><span class="na">newAPIHadoopRDD</span><span class="o">(</span><span class="n">job</span><span class="o">.</span><span class="na">getConfiguration</span><span class="o">(),</span>
+    <span class="nc">AccumuloInputFormat</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="nc">Key</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="nc">Value</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
 </code></pre></div></div>
 
 <h2 id="writing-to-accumulo-table">Writing to Accumulo table</h2>
@@ -470,17 +470,17 @@ to your Accumulo instance.</p>
 data in the partition using a BatchWriter.</p>
 
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c1">// Spark will automatically serialize this properties object and send it to each partition</span>
-<span class="n">Properties</span> <span class="n">props</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClientProperties</span><span class="o">()</span>
+<span class="nc">Properties</span> <span class="n">props</span> <span class="o">=</span> <span class="nc">Accumulo</span><span class="o">.</span><span class="na">newClientProperties</span><span class="o">()</span>
                     <span class="o">.</span><span class="na">from</span><span class="o">(</span><span class="s">"/path/to/accumulo-client.properties"</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
-<span class="n">JavaPairRDD</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span> <span class="n">Value</span><span class="o">&gt;</span> <span class="n">dataToWrite</span> <span class="o">=</span> <span class="o">...</span> <span class="o">;</span>
+<span class="nc">JavaPairRDD</span><span class="o">&lt;</span><span class="nc">Key</span><span class="o">,</span> <span class="nc">Value</span><span class="o">&gt;</span> <span class="n">dataToWrite</span> <span class="o">=</span> <span class="o">...</span> <span class="o">;</span>
 <span class="n">dataToWrite</span><span class="o">.</span><span class="na">foreachPartition</span><span class="o">(</span><span class="n">iter</span> <span class="o">-&gt;</span> <span class="o">{</span>
   <span class="c1">// Create client inside partition so that Spark does not attempt to serialize it.</span>
-  <span class="k">try</span> <span class="o">(</span><span class="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">().</span><span class="na">from</span><span class="o">(</span><span class="n">props</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
-       <span class="n">BatchWriter</span> <span class="n">bw</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="n">outputTable</span><span class="o">))</span> <span class="o">{</span>
+  <span class="k">try</span> <span class="o">(</span><span class="nc">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="nc">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">().</span><span class="na">from</span><span class="o">(</span><span class="n">props</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
+       <span class="nc">BatchWriter</span> <span class="n">bw</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="n">outputTable</span><span class="o">))</span> <span class="o">{</span>
     <span class="n">iter</span><span class="o">.</span><span class="na">forEachRemaining</span><span class="o">(</span><span class="n">kv</span> <span class="o">-&gt;</span> <span class="o">{</span>
-      <span class="n">Key</span> <span class="n">key</span> <span class="o">=</span> <span class="n">kv</span><span class="o">.</span><span class="na">_1</span><span class="o">;</span>
-      <span class="n">Value</span> <span class="n">val</span> <span class="o">=</span> <span class="n">kv</span><span class="o">.</span><span class="na">_2</span><span class="o">;</span>
-      <span class="n">Mutation</span> <span class="n">m</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Mutation</span><span class="o">(</span><span class="n">key</span><span class="o">.</span><span class="na">getRow</span><span class="o">());</span>
+      <span class="nc">Key</span> <span class="n">key</span> <span class="o">=</span> <span class="n">kv</span><span class="o">.</span><span class="na">_1</span><span class="o">;</span>
+      <span class="nc">Value</span> <span class="n">val</span> <span class="o">=</span> <span class="n">kv</span><span class="o">.</span><span class="na">_2</span><span class="o">;</span>
+      <span class="nc">Mutation</span> <span class="n">m</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Mutation</span><span class="o">(</span><span class="n">key</span><span class="o">.</span><span class="na">getRow</span><span class="o">());</span>
       <span class="n">m</span><span class="o">.</span><span class="na">at</span><span class="o">().</span><span class="na">family</span><span class="o">(</span><span class="n">key</span><span class="o">.</span><span class="na">getColumnFamily</span><span class="o">()).</span><span class="na">qualifier</span><span class="o">(</span><span class="n">key</span><span class="o">.</span><span class="na">getColumnQualifier</span><span class="o">())</span>
           <span class="o">.</span><span class="na">visibility</span><span class="o">(</span><span class="n">key</span><span class="o">.</span><span class="na">getColumnVisibility</span><span class="o">()).</span><span class="na">timestamp</span><span class="o">(</span><span class="n">key</span><span class="o">.</span><span class="na">getTimestamp</span><span class="o">()).</span><span class="na">put</span><span class="o">(</span><span class="n">val</span><span class="o">);</span>
       <span class="n">bw</span><span class="o">.</span><span class="na">addMutation</span><span class="o">(</span><span class="n">m</span><span class="o">);</span>
@@ -496,16 +496,16 @@ Spark example can be used for partitioning data. After your data has been writte
 directory using <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-hadoop-mapreduce/2.0.0-alpha-2/org/apache/accumulo/hadoop/mapreduce/AccumuloFileOutputFormat.html">AccumuloFileOutputFormat</a> as RFiles, bulk import this directory into Accumulo.</p>
 
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c1">// Write Spark output to HDFS</span>
-<span class="n">JavaPairRDD</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span> <span class="n">Value</span><span class="o">&gt;</span> <span class="n">dataToWrite</span> <span class="o">=</span> <span class="o">...</span> <span class="o">;</span>
-<span class="n">Job</span> <span class="n">job</span> <span class="o">=</span> <span class="n">Job</span><span class="o">.</span><span class="na">getInstance</span><span class="o">();</span>
-<span class="n">AccumuloFileOutputFormat</span><span class="o">.</span><span class="na">configure</span><span class="o">().</span><span class="na">outputPath</span><span class="o">(</span><span class="n">outputDir</span><span class="o">).</span><span class="na">store</span><span class="o">(</span><span class="n">job</span><span class="o">);</span>
-<span class="n">Partitioner</span> <span class="n">partitioner</span> <span class="o">=</span> <span class="k">new</span> <span class="n">AccumuloRangePartitioner</span><span class="o">(</span><span class="s">"3"</span><span class="o">,</span> <span class="s">"7"</span><span class="o">);</span>
-<span class="n">JavaPairRDD</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span> <span class="n">Value</span><span class="o">&gt;</span> <span class="n">partData</span> <span class="o">=</span> <span class="n">dataPlus5K</span><span class="o">.</span><span class="na">repartitionAndSortWithinPartitions</span><span class="o">(</span><span class="n">partitioner</span><span class="o">);</span>
-<span class="n">partData</span><span class="o">.</span><span class="na">saveAsNewAPIHadoopFile</span><span class="o">(</span><span class="n">outputDir</span><span class="o">.</span><span class="na">toString</span><span class="o">(),</span> <span class="n">Key</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">Value</span><span class="o">.</span><span class="na">class</span><span class="o">,</span>
-    <span class="n">AccumuloFileOutputFormat</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+<span class="nc">JavaPairRDD</span><span class="o">&lt;</span><span class="nc">Key</span><span class="o">,</span> <span class="nc">Value</span><span class="o">&gt;</span> <span class="n">dataToWrite</span> <span class="o">=</span> <span class="o">...</span> <span class="o">;</span>
+<span class="nc">Job</span> <span class="n">job</span> <span class="o">=</span> <span class="nc">Job</span><span class="o">.</span><span class="na">getInstance</span><span class="o">();</span>
+<span class="nc">AccumuloFileOutputFormat</span><span class="o">.</span><span class="na">configure</span><span class="o">().</span><span class="na">outputPath</span><span class="o">(</span><span class="n">outputDir</span><span class="o">).</span><span class="na">store</span><span class="o">(</span><span class="n">job</span><span class="o">);</span>
+<span class="nc">Partitioner</span> <span class="n">partitioner</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">AccumuloRangePartitioner</span><span class="o">(</span><span class="s">"3"</span><span class="o">,</span> <span class="s">"7"</span><span class="o">);</span>
+<span class="nc">JavaPairRDD</span><span class="o">&lt;</span><span class="nc">Key</span><span class="o">,</span> <span class="nc">Value</span><span class="o">&gt;</span> <span class="n">partData</span> <span class="o">=</span> <span class="n">dataPlus5K</span><span class="o">.</span><span class="na">repartitionAndSortWithinPartitions</span><span class="o">(</span><span class="n">partitioner</span><span class="o">);</span>
+<span class="n">partData</span><span class="o">.</span><span class="na">saveAsNewAPIHadoopFile</span><span class="o">(</span><span class="n">outputDir</span><span class="o">.</span><span class="na">toString</span><span class="o">(),</span> <span class="nc">Key</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="nc">Value</span><span class="o">.</span><span class="na">class</span><span class="o">,</span>
+    <span class="nc">AccumuloFileOutputFormat</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
 
 <span class="c1">// Bulk import RFiles in HDFS into Accumulo</span>
-<span class="k">try</span> <span class="o">(</span><span class="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">().</span><span class="na">from</span><span class="o">(</span><span class="n">props</span><span class="o">).</span><span class="na">build</span><span class="o">())</span> <span class="o">{</span>
+<span class="k">try</span> <span class="o">(</span><span class="nc">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="nc">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">().</span><span class="na">from</span><span class="o">(</span><span class="n">props</span><span class="o">).</span><span class="na">build</span><span class="o">())</span> <span class="o">{</span>
   <span class="n">client</span><span class="o">.</span><span class="na">tableOperations</span><span class="o">().</span><span class="na">importDirectory</span><span class="o">(</span><span class="n">outputDir</span><span class="o">.</span><span class="na">toString</span><span class="o">()).</span><span class="na">to</span><span class="o">(</span><span class="n">outputTable</span><span class="o">).</span><span class="na">load</span><span class="o">();</span>
 <span class="o">}</span>
 </code></pre></div></div>
diff --git a/docs/2.x/getting-started/clients.html b/docs/2.x/getting-started/clients.html
index eeca49d..5a527e7 100644
--- a/docs/2.x/getting-started/clients.html
+++ b/docs/2.x/getting-started/clients.html
@@ -451,24 +451,24 @@ of the following methods:</p>
 <ol>
   <li>Using the <a href="/docs/2.x/configuration/files#accumulo-clientproperties">accumulo-client.properties</a> file (a template can be found in the <code class="highlighter-rouge">conf/</code> directory
 of the tarball distribution):
-    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">()</span>
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="nc">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">()</span>
                            <span class="o">.</span><span class="na">from</span><span class="o">(</span><span class="s">"/path/to/accumulo-client.properties"</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
 </code></pre></div>    </div>
   </li>
   <li>Using the builder methods of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a>:
-    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">()</span>
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="nc">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">()</span>
                            <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="s">"myinstance"</span><span class="o">,</span> <span class="s">"zookeeper1,zookeeper2"</span><span class="o">)</span>
                            <span class="o">.</span><span class="na">as</span><span class="o">(</span><span class="s">"myuser"</span><span class="o">,</span> <span class="s">"mypassword"</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
 </code></pre></div>    </div>
   </li>
   <li>Using a Java Properties object.
-    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">Properties</span> <span class="n">props</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="o">()</span>
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">Properties</span> <span class="n">props</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Properties</span><span class="o">()</span>
  <span class="n">props</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"instance.name"</span><span class="o">,</span> <span class="s">"myinstance"</span><span class="o">)</span>
  <span class="n">props</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"instance.zookeepers"</span><span class="o">,</span> <span class="s">"zookeeper1,zookeeper2"</span><span class="o">)</span>
  <span class="n">props</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"auth.type"</span><span class="o">,</span> <span class="s">"password"</span><span class="o">)</span>
  <span class="n">props</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"auth.principal"</span><span class="o">,</span> <span class="s">"myuser"</span><span class="o">)</span>
  <span class="n">props</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"auth.token"</span><span class="o">,</span> <span class="s">"mypassword"</span><span class="o">)</span>
- <span class="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">().</span><span class="na">from</span><span class="o">(</span><span class="n">props</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
+ <span class="nc">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="nc">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">().</span><span class="na">from</span><span class="o">(</span><span class="n">props</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
 </code></pre></div>    </div>
   </li>
 </ol>
@@ -538,8 +538,8 @@ to all nodes in the Accumulo cluster.</li>
 requires external setup and additional configuration, but provides a single point of authentication
 through HDFS, YARN and ZooKeeper and allowing for password-less authentication with Accumulo.</p>
 
-    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">KerberosToken</span> <span class="n">token</span> <span class="o">=</span> <span class="k">new</span> <span class="n">KerberosToken</span><span class="o">();</span>
- <span class="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">().</span><span class="na">to</span><span class="o">(</span><span class="s">"myinstance"</span><span class="o">,</span> <span class="s">"zookeeper1,zookeper2"</span><span class="o">)</span>
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">KerberosToken</span> <span class="n">token</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">KerberosToken</span><span class="o">();</span>
+ <span class="nc">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="nc">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">().</span><span class="na">to</span><span class="o">(</span><span class="s">"myinstance"</span><span class="o">,</span> <span class="s">"zookeeper1,zookeper2"</span><span class="o">)</span>
                            <span class="o">.</span><span class="na">as</span><span class="o">(</span><span class="n">token</span><span class="o">.</span><span class="na">getPrincipal</span><span class="o">(),</span> <span class="n">token</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
 </code></pre></div>    </div>
   </li>
@@ -550,7 +550,7 @@ through HDFS, YARN and ZooKeeper and allowing for password-less authentication w
 <p>With a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a> created, it can be used to create objects (like the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/client/BatchWriter.html">BatchWriter</a>) for
 reading and writing from Accumulo:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">BatchWriter</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="s">"table"</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">BatchWriter</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="s">"table"</span><span class="o">);</span>
 </code></pre></div></div>
 
 <p>Data is written to Accumulo by creating <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/data/Mutation.html">Mutation</a> objects that represent all the
@@ -560,7 +560,7 @@ the appropriate TabletServers.</p>
 
 <p>The code below shows how a Mutation is created.</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Mutation</span> <span class="n">mutation</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Mutation</span><span class="o">(</span><span class="s">"row1"</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">Mutation</span> <span class="n">mutation</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Mutation</span><span class="o">(</span><span class="s">"row1"</span><span class="o">);</span>
 <span class="n">mutation</span><span class="o">.</span><span class="na">at</span><span class="o">().</span><span class="na">family</span><span class="o">(</span><span class="s">"myColFam1"</span><span class="o">).</span><span class="na">qualifier</span><span class="o">(</span><span class="s">"myColQual1"</span><span class="o">).</span><span class="na">visibility</span><span class="o">(</span><span class="s">"public"</span><span class="o">).</span><span class="na">put</span><span class="o [...]
 <span class="n">mutation</span><span class="o">.</span><span class="na">at</span><span class="o">().</span><span class="na">family</span><span class="o">(</span><span class="s">"myColFam2"</span><span class="o">).</span><span class="na">qualifier</span><span class="o">(</span><span class="s">"myColQual2"</span><span class="o">).</span><span class="na">visibility</span><span class="o">(</span><span class="s">"public"</span><span class="o">).</span><span class="na">put</span><span class="o [...]
 </code></pre></div></div>
@@ -575,8 +575,8 @@ batching.</p>
 
 <p>The code below shows how a Mutation is added to a BatchWriter:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="k">try</span> <span class="o">(</span><span class="n">BatchWriter</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="s">"mytable"</span><span class="o">))</span> <span class="o">{</span>
-  <span class="n">Mutation</span> <span class="n">m</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Mutation</span><span class="o">(</span><span class="s">"row1"</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="k">try</span> <span class="o">(</span><span class="nc">BatchWriter</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="s">"mytable"</span><span class="o">))</span> <span class="o">{</span>
+  <span class="nc">Mutation</span> <span class="n">m</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Mutation</span><span class="o">(</span><span class="s">"row1"</span><span class="o">);</span>
   <span class="n">m</span><span class="o">.</span><span class="na">at</span><span class="o">().</span><span class="na">family</span><span class="o">(</span><span class="s">"myfam"</span><span class="o">).</span><span class="na">qualifier</span><span class="o">(</span><span class="s">"myqual"</span><span class="o">).</span><span class="na">visibility</span><span class="o">(</span><span class="s">"public"</span><span class="o">).</span><span class="na">put</span><span class="o">(</span><sp [...]
   <span class="n">writer</span><span class="o">.</span><span class="na">addMutation</span><span class="o">(</span><span class="n">m</span><span class="o">);</span>
 <span class="o">}</span>
@@ -644,12 +644,12 @@ or by setting <a href="/docs/2.x/configuration/client-properties#batch_writer_du
     <p>When a BatchWriter or ConditionalWriter is created, the durability settings above will be overridden
 by the <code class="highlighter-rouge">BatchWriterConfig</code> that is passed in.</p>
 
-    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">BatchWriterConfig</span> <span class="n">cfg</span> <span class="o">=</span> <span class="k">new</span> <span class="n">BatchWriterConfig</span><span class="o">();</span>
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">BatchWriterConfig</span> <span class="n">cfg</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">BatchWriterConfig</span><span class="o">();</span>
  <span class="c1">// We don't care about data loss with these writes:</span>
  <span class="c1">// This is DANGEROUS:</span>
- <span class="n">cfg</span><span class="o">.</span><span class="na">setDurability</span><span class="o">(</span><span class="n">Durability</span><span class="o">.</span><span class="na">NONE</span><span class="o">);</span>
+ <span class="n">cfg</span><span class="o">.</span><span class="na">setDurability</span><span class="o">(</span><span class="nc">Durability</span><span class="o">.</span><span class="na">NONE</span><span class="o">);</span>
 
- <span class="n">BatchWriter</span> <span class="n">bw</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="n">table</span><span class="o">,</span> <span class="n">cfg</span><span class="o">);</span>
+ <span class="nc">BatchWriter</span> <span class="n">bw</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="n">table</span><span class="o">,</span> <span class="n">cfg</span><span class="o">);</span>
 </code></pre></div>    </div>
   </li>
 </ol>
@@ -667,27 +667,27 @@ keys and values in the table.</p>
 <p>If a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/client/Scanner.html">Scanner</a> is created without <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/security/Authorizations.html">Authorizations</a>, it uses all <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/security/Authorizations.html">Authorizations</ [...]
 to the user that created the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/client/AccumuloClient.html">AccumuloClient</a>:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Scanner</span> <span class="n">s</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"table"</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">Scanner</span> <span class="n">s</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"table"</span><span class="o">);</span>
 </code></pre></div></div>
 
 <p>A scanner can also be created to only use a subset of a user’s <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/security/Authorizations.html">Authorizations</a>.</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Scanner</span> <span class="n">s</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"table"</span><span class="o">,</span> <span class="k">new</span> <span class="n">Authorizations</span><span class="o">(</span><span class="s">"public"</span><span class="o">));</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">Scanner</span> <span class="n">s</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"table"</span><span class="o">,</span> <span class="k">new</span> <span class="nc">Authorizations</span><span class="o">(</span><span class="s">"public"</span><span class="o">));</span>
 </code></pre></div></div>
 
 <p>Scanners can be configured to start and stop at particular keys, and
 to return a subset of the columns available.</p>
 
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c1">// return data with visibilities that match specified auths</span>
-<span class="n">Authorizations</span> <span class="n">auths</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Authorizations</span><span class="o">(</span><span class="s">"public"</span><span class="o">);</span>
+<span class="nc">Authorizations</span> <span class="n">auths</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Authorizations</span><span class="o">(</span><span class="s">"public"</span><span class="o">);</span>
 
-<span class="k">try</span> <span class="o">(</span><span class="n">Scanner</span> <span class="n">scan</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"table"</span><span class="o">,</span> <span class="n">auths</span><span class="o">))</span> <span class="o">{</span>
-  <span class="n">scan</span><span class="o">.</span><span class="na">setRange</span><span class="o">(</span><span class="k">new</span> <span class="n">Range</span><span class="o">(</span><span class="s">"harry"</span><span class="o">,</span><span class="s">"john"</span><span class="o">));</span>
+<span class="k">try</span> <span class="o">(</span><span class="nc">Scanner</span> <span class="n">scan</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"table"</span><span class="o">,</span> <span class="n">auths</span><span class="o">))</span> <span class="o">{</span>
+  <span class="n">scan</span><span class="o">.</span><span class="na">setRange</span><span class="o">(</span><span class="k">new</span> <span class="nc">Range</span><span class="o">(</span><span class="s">"harry"</span><span class="o">,</span><span class="s">"john"</span><span class="o">));</span>
   <span class="n">scan</span><span class="o">.</span><span class="na">fetchColumnFamily</span><span class="o">(</span><span class="s">"attributes"</span><span class="o">);</span>
 
-  <span class="k">for</span> <span class="o">(</span><span class="n">Entry</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span><span class="n">Value</span><span class="o">&gt;</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">scan</span><span class="o">)</span> <span class="o">{</span>
-    <span class="n">Text</span> <span class="n">row</span> <span class="o">=</span> <span class="n">entry</span><span class="o">.</span><span class="na">getKey</span><span class="o">().</span><span class="na">getRow</span><span class="o">();</span>
-    <span class="n">Value</span> <span class="n">value</span> <span class="o">=</span> <span class="n">entry</span><span class="o">.</span><span class="na">getValue</span><span class="o">();</span>
+  <span class="k">for</span> <span class="o">(</span><span class="nc">Entry</span><span class="o">&lt;</span><span class="nc">Key</span><span class="o">,</span><span class="nc">Value</span><span class="o">&gt;</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">scan</span><span class="o">)</span> <span class="o">{</span>
+    <span class="nc">Text</span> <span class="n">row</span> <span class="o">=</span> <span class="n">entry</span><span class="o">.</span><span class="na">getKey</span><span class="o">().</span><span class="na">getRow</span><span class="o">();</span>
+    <span class="nc">Value</span> <span class="n">value</span> <span class="o">=</span> <span class="n">entry</span><span class="o">.</span><span class="na">getValue</span><span class="o">();</span>
   <span class="o">}</span>
 <span class="o">}</span>
 </code></pre></div></div>
@@ -729,15 +729,15 @@ BatchScanners accept a set of Ranges. It is important to note that the keys retu
 by a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/client/BatchScanner.html">BatchScanner</a> are not in sorted order since the keys streamed are from multiple
 TabletServers in parallel.</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">ArrayList</span><span class="o">&lt;</span><span class="n">Range</span><span class="o">&gt;</span> <span class="n">ranges</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ArrayList</span><span class="o">&lt;</span><span class="n">Range</span><span class="o">&gt;();</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">ArrayList</span><span class="o">&lt;</span><span class="nc">Range</span><span class="o">&gt;</span> <span class="n">ranges</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">ArrayList</span><span class="o">&lt;</span><span class="nc">Range</span><span class="o">&gt;();</span>
 <span class="c1">// populate list of ranges ...</span>
 
-<span class="k">try</span> <span class="o">(</span><span class="n">BatchScanner</span> <span class="n">bscan</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchScanner</span><span class="o">(</span><span class="s">"table"</span><span class="o">,</span> <span class="n">auths</span><span class="o">,</span> <span class="mi">10</span><span class="o">))</span> <span class="o">{</span>
+<span class="k">try</span> <span class="o">(</span><span class="nc">BatchScanner</span> <span class="n">bscan</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchScanner</span><span class="o">(</span><span class="s">"table"</span><span class="o">,</span> <span class="n">auths</span><span class="o">,</span> <span class="mi">10</span><span class="o">))</span> <span class="o">{</span>
   <span class="n">bscan</span><span class="o">.</span><span class="na">setRanges</span><span class="o">(</span><span class="n">ranges</span><span class="o">);</span>
   <span class="n">bscan</span><span class="o">.</span><span class="na">fetchColumnFamily</span><span class="o">(</span><span class="s">"attributes"</span><span class="o">);</span>
 
-  <span class="k">for</span> <span class="o">(</span><span class="n">Entry</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span><span class="n">Value</span><span class="o">&gt;</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">bscan</span><span class="o">)</span> <span class="o">{</span>
-    <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="n">entry</span><span class="o">.</span><span class="na">getValue</span><span class="o">());</span>
+  <span class="k">for</span> <span class="o">(</span><span class="nc">Entry</span><span class="o">&lt;</span><span class="nc">Key</span><span class="o">,</span><span class="nc">Value</span><span class="o">&gt;</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">bscan</span><span class="o">)</span> <span class="o">{</span>
+    <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="n">entry</span><span class="o">.</span><span class="na">getValue</span><span class="o">());</span>
   <span class="o">}</span>
 <span class="o">}</span>
 </code></pre></div></div>
diff --git a/docs/2.x/getting-started/table_configuration.html b/docs/2.x/getting-started/table_configuration.html
index d8bbc78..3436627 100644
--- a/docs/2.x/getting-started/table_configuration.html
+++ b/docs/2.x/getting-started/table_configuration.html
@@ -450,18 +450,18 @@ user@myinstance mytable&gt; getgroups -t mytable
 
 <h3 id="managing-locality-groups-via-the-client-api">Managing Locality Groups via the Client API</h3>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">()</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="nc">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">()</span>
                           <span class="o">.</span><span class="na">from</span><span class="o">(</span><span class="s">"/path/to/accumulo-client.properties"</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
 
-<span class="n">HashMap</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span><span class="n">Set</span><span class="o">&lt;</span><span class="n">Text</span><span class="o">&gt;&gt;</span> <span class="n">localityGroups</span> <span class="o">=</span> <span class="k">new</span> <span class="n">HashMap</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">Set</span><span class="o">&lt;</span><span class="n"> [...]
+<span class="nc">HashMap</span><span class="o">&lt;</span><span class="nc">String</span><span class="o">,</span><span class="nc">Set</span><span class="o">&lt;</span><span class="nc">Text</span><span class="o">&gt;&gt;</span> <span class="n">localityGroups</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">HashMap</span><span class="o">&lt;</span><span class="nc">String</span><span class="o">,</span> <span class="nc">Set</span><span class="o">&lt;</span><span cla [...]
 
-<span class="n">HashSet</span><span class="o">&lt;</span><span class="n">Text</span><span class="o">&gt;</span> <span class="n">metadataColumns</span> <span class="o">=</span> <span class="k">new</span> <span class="n">HashSet</span><span class="o">&lt;</span><span class="n">Text</span><span class="o">&gt;();</span>
-<span class="n">metadataColumns</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="n">Text</span><span class="o">(</span><span class="s">"domain"</span><span class="o">));</span>
-<span class="n">metadataColumns</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="n">Text</span><span class="o">(</span><span class="s">"link"</span><span class="o">));</span>
+<span class="nc">HashSet</span><span class="o">&lt;</span><span class="nc">Text</span><span class="o">&gt;</span> <span class="n">metadataColumns</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">HashSet</span><span class="o">&lt;</span><span class="nc">Text</span><span class="o">&gt;();</span>
+<span class="n">metadataColumns</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="nc">Text</span><span class="o">(</span><span class="s">"domain"</span><span class="o">));</span>
+<span class="n">metadataColumns</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="nc">Text</span><span class="o">(</span><span class="s">"link"</span><span class="o">));</span>
 
-<span class="n">HashSet</span><span class="o">&lt;</span><span class="n">Text</span><span class="o">&gt;</span> <span class="n">contentColumns</span> <span class="o">=</span> <span class="k">new</span> <span class="n">HashSet</span><span class="o">&lt;</span><span class="n">Text</span><span class="o">&gt;();</span>
-<span class="n">contentColumns</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="n">Text</span><span class="o">(</span><span class="s">"body"</span><span class="o">));</span>
-<span class="n">contentColumns</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="n">Text</span><span class="o">(</span><span class="s">"images"</span><span class="o">));</span>
+<span class="nc">HashSet</span><span class="o">&lt;</span><span class="nc">Text</span><span class="o">&gt;</span> <span class="n">contentColumns</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">HashSet</span><span class="o">&lt;</span><span class="nc">Text</span><span class="o">&gt;();</span>
+<span class="n">contentColumns</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="nc">Text</span><span class="o">(</span><span class="s">"body"</span><span class="o">));</span>
+<span class="n">contentColumns</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="nc">Text</span><span class="o">(</span><span class="s">"images"</span><span class="o">));</span>
 
 <span class="n">localityGroups</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"metadata"</span><span class="o">,</span> <span class="n">metadataColumns</span><span class="o">);</span>
 <span class="n">localityGroups</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"content"</span><span class="o">,</span> <span class="n">contentColumns</span><span class="o">);</span>
@@ -469,7 +469,7 @@ user@myinstance mytable&gt; getgroups -t mytable
 <span class="n">client</span><span class="o">.</span><span class="na">tableOperations</span><span class="o">().</span><span class="na">setLocalityGroups</span><span class="o">(</span><span class="s">"mytable"</span><span class="o">,</span> <span class="n">localityGroups</span><span class="o">);</span>
 
 <span class="c1">// existing locality groups can be obtained as follows</span>
-<span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">Set</span><span class="o">&lt;</span><span class="n">Text</span><span class="o">&gt;&gt;</span> <span class="n">groups</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">tableOperations</span><span class="o">().</span><span class="na">getLocalityGroups</span><span class="o">(</span><span class="s">"mytable"</span><sp [...]
+<span class="nc">Map</span><span class="o">&lt;</span><span class="nc">String</span><span class="o">,</span> <span class="nc">Set</span><span class="o">&lt;</span><span class="nc">Text</span><span class="o">&gt;&gt;</span> <span class="n">groups</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">tableOperations</span><span class="o">().</span><span class="na">getLocalityGroups</span><span class="o">(</span><span class="s">"mytable"</span [...]
 </code></pre></div></div>
 
 <p>The assignment of Column Families to Locality Groups can be changed at any time. The
@@ -564,7 +564,7 @@ stack.</p>
 
 <h3 id="setting-iterators-programmatically">Setting Iterators Programmatically</h3>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">scanner</span><span class="o">.</span><span class="na">addIterator</span><span class="o">(</span><span class="k">new</span> <span class="n">IteratorSetting</span><span class="o">(</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">scanner</span><span class="o">.</span><span class="na">addIterator</span><span class="o">(</span><span class="k">new</span> <span class="nc">IteratorSetting</span><span class="o">(</span>
     <span class="mi">15</span><span class="o">,</span> <span class="c1">// priority</span>
     <span class="s">"myiter"</span><span class="o">,</span> <span class="c1">// name this iterator</span>
     <span class="s">"com.company.MyIterator"</span> <span class="c1">// class name</span>
@@ -574,7 +574,7 @@ stack.</p>
 <p>Some iterators take additional parameters from client code, as in the following
 example:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">IteratorSetting</span> <span class="n">iter</span> <span class="o">=</span> <span class="k">new</span> <span class="n">IteratorSetting</span><span class="o">(...);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">IteratorSetting</span> <span class="n">iter</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">IteratorSetting</span><span class="o">(...);</span>
 <span class="n">iter</span><span class="o">.</span><span class="na">addOption</span><span class="o">(</span><span class="s">"myoptionname"</span><span class="o">,</span> <span class="s">"myoptionvalue"</span><span class="o">);</span>
 <span class="n">scanner</span><span class="o">.</span><span class="na">addIterator</span><span class="o">(</span><span class="n">iter</span><span class="o">)</span>
 </code></pre></div></div>
@@ -611,7 +611,7 @@ VersioningIterator and keep one version. A table can be created without the
 VersioningIterator with the -ndi option in the shell. Also the Java API
 has the following method</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">client</span><span class="o">.</span><span class="na">tableOperations</span><span class="o">.</span><span class="na">create</span><span class="o">(</span><span class="n">String</span> <span class="n">tableName</span><span class="o">,</span> <span class="kt">boolean</span> <span class="n">limitVersion</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">client</span><span class="o">.</span><span class="na">tableOperations</span><span class="o">.</span><span class="na">create</span><span class="o">(</span><span class="nc">String</span> <span class="n">tableName</span><span class="o">,</span> <span class="kt">boolean</span> <span class="n">limitVersion</span><span class="o">);</span>
 </code></pre></div></div>
 
 <h4 id="logical-time">Logical Time</h4>
diff --git a/docs/2.x/getting-started/table_design.html b/docs/2.x/getting-started/table_design.html
index 7697e84..ee9d05d 100644
--- a/docs/2.x/getting-started/table_design.html
+++ b/docs/2.x/getting-started/table_design.html
@@ -436,7 +436,7 @@ if we have the following data in a comma-separated file:</p>
 <p>We might choose to store this data using the userid as the rowID, the column
 name in the column family, and a blank column qualifier:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Mutation</span> <span class="n">m</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Mutation</span><span class="o">(</span><span class="n">userid</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">Mutation</span> <span class="n">m</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Mutation</span><span class="o">(</span><span class="n">userid</span><span class="o">);</span>
 <span class="n">m</span><span class="o">.</span><span class="na">at</span><span class="o">().</span><span class="na">family</span><span class="o">(</span><span class="s">"age"</span><span class="o">).</span><span class="na">put</span><span class="o">(</span><span class="n">age</span><span class="o">);</span>
 <span class="n">m</span><span class="o">.</span><span class="na">at</span><span class="o">().</span><span class="na">family</span><span class="o">(</span><span class="s">"address"</span><span class="o">).</span><span class="na">put</span><span class="o">(</span><span class="n">address</span><span class="o">);</span>
 <span class="n">m</span><span class="o">.</span><span class="na">at</span><span class="o">().</span><span class="na">family</span><span class="o">(</span><span class="s">"balance"</span><span class="o">).</span><span class="na">put</span><span class="o">(</span><span class="n">account_balance</span><span class="o">);</span>
@@ -446,15 +446,15 @@ name in the column family, and a blank column qualifier:</p>
 <p>We could then retrieve any of the columns for a specific userid by specifying the
 userid as the range of a scanner and fetching specific columns:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">()</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="nc">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">()</span>
                           <span class="o">.</span><span class="na">from</span><span class="o">(</span><span class="s">"/path/to/accumulo-client.properties"</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
-<span class="n">Range</span> <span class="n">r</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Range</span><span class="o">(</span><span class="n">userid</span><span class="o">,</span> <span class="n">userid</span><span class="o">);</span> <span class="c1">// single row</span>
-<span class="n">Scanner</span> <span class="n">s</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"userdata"</span><span class="o">,</span> <span class="n">auths</span><span class="o">);</span>
+<span class="nc">Range</span> <span class="n">r</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Range</span><span class="o">(</span><span class="n">userid</span><span class="o">,</span> <span class="n">userid</span><span class="o">);</span> <span class="c1">// single row</span>
+<span class="nc">Scanner</span> <span class="n">s</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"userdata"</span><span class="o">,</span> <span class="n">auths</span><span class="o">);</span>
 <span class="n">s</span><span class="o">.</span><span class="na">setRange</span><span class="o">(</span><span class="n">r</span><span class="o">);</span>
 <span class="n">s</span><span class="o">.</span><span class="na">fetchColumnFamily</span><span class="o">(</span><span class="s">"age"</span><span class="o">);</span>
 
-<span class="k">for</span> <span class="o">(</span><span class="n">Entry</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span><span class="n">Value</span><span class="o">&gt;</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">s</span><span class="o">)</span> <span class="o">{</span>
-  <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="n">entry</span><span class="o">.</span><span class="na">getValue</span><span class="o">().</span><span class="na">toString</span><span class="o">());</span>
+<span class="k">for</span> <span class="o">(</span><span class="nc">Entry</span><span class="o">&lt;</span><span class="nc">Key</span><span class="o">,</span><span class="nc">Value</span><span class="o">&gt;</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">s</span><span class="o">)</span> <span class="o">{</span>
+  <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="n">entry</span><span class="o">.</span><span class="na">getValue</span><span class="o">().</span><span class="na">toString</span><span class="o">());</span>
 <span class="o">}</span>
 </code></pre></div></div>
 
@@ -509,14 +509,14 @@ be better seeked or searched in ranges.</p>
 of a lexicoder that encodes a java Date object so that it sorts lexicographically:</p>
 
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c1">// create new date lexicoder</span>
-<span class="n">DateLexicoder</span> <span class="n">dateEncoder</span> <span class="o">=</span> <span class="k">new</span> <span class="n">DateLexicoder</span><span class="o">();</span>
+<span class="nc">DateLexicoder</span> <span class="n">dateEncoder</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">DateLexicoder</span><span class="o">();</span>
 
 <span class="c1">// truncate time to hours</span>
-<span class="kt">long</span> <span class="n">epoch</span> <span class="o">=</span> <span class="n">System</span><span class="o">.</span><span class="na">currentTimeMillis</span><span class="o">();</span>
-<span class="n">Date</span> <span class="n">hour</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Date</span><span class="o">(</span><span class="n">epoch</span> <span class="o">-</span> <span class="o">(</span><span class="n">epoch</span> <span class="o">%</span> <span class="mi">3600000</span><span class="o">));</span>
+<span class="kt">long</span> <span class="n">epoch</span> <span class="o">=</span> <span class="nc">System</span><span class="o">.</span><span class="na">currentTimeMillis</span><span class="o">();</span>
+<span class="nc">Date</span> <span class="n">hour</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Date</span><span class="o">(</span><span class="n">epoch</span> <span class="o">-</span> <span class="o">(</span><span class="n">epoch</span> <span class="o">%</span> <span class="mi">3600000</span><span class="o">));</span>
 
 <span class="c1">// encode the rowId so that it is sorted lexicographically</span>
-<span class="n">Mutation</span> <span class="n">mutation</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Mutation</span><span class="o">(</span><span class="n">dateEncoder</span><span class="o">.</span><span class="na">encode</span><span class="o">(</span><span class="n">hour</span><span class="o">));</span>
+<span class="nc">Mutation</span> <span class="n">mutation</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Mutation</span><span class="o">(</span><span class="n">dateEncoder</span><span class="o">.</span><span class="na">encode</span><span class="o">(</span><span class="n">hour</span><span class="o">));</span>
 <span class="n">mutation</span><span class="o">.</span><span class="na">at</span><span class="o">().</span><span class="na">family</span><span class="o">(</span><span class="s">"colf"</span><span class="o">).</span><span class="na">qualifier</span><span class="o">(</span><span class="s">"colq"</span><span class="o">).</span><span class="na">put</span><span class="o">(</span><span class="k">new</span> <span class="kt">byte</span><span class="o">[]{});</span>
 </code></pre></div></div>
 
@@ -524,15 +524,15 @@ of a lexicoder that encodes a java Date object so that it sorts lexicographicall
 with the reverse lexicoder:</p>
 
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c1">// create new date lexicoder and reverse lexicoder</span>
-<span class="n">DateLexicoder</span> <span class="n">dateEncoder</span> <span class="o">=</span> <span class="k">new</span> <span class="n">DateLexicoder</span><span class="o">();</span>
-<span class="n">ReverseLexicoder</span> <span class="n">reverseEncoder</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ReverseLexicoder</span><span class="o">(</span><span class="n">dateEncoder</span><span class="o">);</span>
+<span class="nc">DateLexicoder</span> <span class="n">dateEncoder</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">DateLexicoder</span><span class="o">();</span>
+<span class="nc">ReverseLexicoder</span> <span class="n">reverseEncoder</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">ReverseLexicoder</span><span class="o">(</span><span class="n">dateEncoder</span><span class="o">);</span>
 
 <span class="c1">// truncate date to hours</span>
-<span class="kt">long</span> <span class="n">epoch</span> <span class="o">=</span> <span class="n">System</span><span class="o">.</span><span class="na">currentTimeMillis</span><span class="o">();</span>
-<span class="n">Date</span> <span class="n">hour</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Date</span><span class="o">(</span><span class="n">epoch</span> <span class="o">-</span> <span class="o">(</span><span class="n">epoch</span> <span class="o">%</span> <span class="mi">3600000</span><span class="o">));</span>
+<span class="kt">long</span> <span class="n">epoch</span> <span class="o">=</span> <span class="nc">System</span><span class="o">.</span><span class="na">currentTimeMillis</span><span class="o">();</span>
+<span class="nc">Date</span> <span class="n">hour</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Date</span><span class="o">(</span><span class="n">epoch</span> <span class="o">-</span> <span class="o">(</span><span class="n">epoch</span> <span class="o">%</span> <span class="mi">3600000</span><span class="o">));</span>
 
 <span class="c1">// encode the rowId so that it sorts in reverse lexicographic order</span>
-<span class="n">Mutation</span> <span class="n">mutation</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Mutation</span><span class="o">(</span><span class="n">reverseEncoder</span><span class="o">.</span><span class="na">encode</span><span class="o">(</span><span class="n">hour</span><span class="o">));</span>
+<span class="nc">Mutation</span> <span class="n">mutation</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Mutation</span><span class="o">(</span><span class="n">reverseEncoder</span><span class="o">.</span><span class="na">encode</span><span class="o">(</span><span class="n">hour</span><span class="o">));</span>
 <span class="n">mutation</span><span class="o">.</span><span class="na">at</span><span class="o">().</span><span class="na">family</span><span class="o">(</span><span class="s">"colf"</span><span class="o">).</span><span class="na">qualifier</span><span class="o">(</span><span class="s">"colq"</span><span class="o">).</span><span class="na">put</span><span class="o">(</span><span class="k">new</span> <span class="kt">byte</span><span class="o">[]{});</span>
 </code></pre></div></div>
 
@@ -581,25 +581,25 @@ BatchScanner, which performs the lookups in multiple threads to multiple servers
 and returns an Iterator over all the rows retrieved. The rows returned are NOT in
 sorted order, as is the case with the basic Scanner interface.</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">HashSet</span><span class="o">&lt;</span><span class="n">Range</span><span class="o">&gt;</span> <span class="n">matchingRows</span> <span class="o">=</span> <span class="k">new</span> <span class="n">HashSet</span><span class="o">&lt;</span><span class="n">Range</span><span class="o">&gt;();</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">HashSet</span><span class="o">&lt;</span><span class="nc">Range</span><span class="o">&gt;</span> <span class="n">matchingRows</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">HashSet</span><span class="o">&lt;</span><span class="nc">Range</span><span class="o">&gt;();</span>
 
 <span class="c1">// first we scan the index for IDs of rows matching our query</span>
-<span class="k">try</span> <span class="o">(</span><span class="n">Scanner</span> <span class="n">indexScanner</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"index"</span><span class="o">,</span> <span class="n">auths</span><span class="o">))</span> <span class="o">{</span>
-  <span class="n">indexScanner</span><span class="o">.</span><span class="na">setRange</span><span class="o">(</span><span class="n">Range</span><span class="o">.</span><span class="na">exact</span><span class="o">(</span><span class="s">"mySearchTerm"</span><span class="o">);</span>
+<span class="k">try</span> <span class="o">(</span><span class="nc">Scanner</span> <span class="n">indexScanner</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"index"</span><span class="o">,</span> <span class="n">auths</span><span class="o">))</span> <span class="o">{</span>
+  <span class="n">indexScanner</span><span class="o">.</span><span class="na">setRange</span><span class="o">(</span><span class="nc">Range</span><span class="o">.</span><span class="na">exact</span><span class="o">(</span><span class="s">"mySearchTerm"</span><span class="o">);</span>
 
   <span class="c1">// we retrieve the matching rowIDs and create a set of ranges</span>
-  <span class="k">for</span> <span class="o">(</span><span class="n">Entry</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span><span class="n">Value</span><span class="o">&gt;</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">indexScanner</span><span class="o">)</span> <span class="o">{</span>
-    <span class="n">matchingRows</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="n">Range</span><span class="o">(</span><span class="n">entry</span><span class="o">.</span><span class="na">getKey</span><span class="o">().</span><span class="na">getColumnQualifier</span><span class="o">()));</span>
+  <span class="k">for</span> <span class="o">(</span><span class="nc">Entry</span><span class="o">&lt;</span><span class="nc">Key</span><span class="o">,</span><span class="nc">Value</span><span class="o">&gt;</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">indexScanner</span><span class="o">)</span> <span class="o">{</span>
+    <span class="n">matchingRows</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="nc">Range</span><span class="o">(</span><span class="n">entry</span><span class="o">.</span><span class="na">getKey</span><span class="o">().</span><span class="na">getColumnQualifier</span><span class="o">()));</span>
   <span class="o">}</span>
 <span class="o">}</span>
 
 <span class="c1">// now we pass the set of rowIDs to the batch scanner to retrieve them</span>
-<span class="k">try</span> <span class="o">(</span><span class="n">BatchScanner</span> <span class="n">bscan</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchScanner</span><span class="o">(</span><span class="s">"table"</span><span class="o">,</span> <span class="n">auths</span><span class="o">,</span> <span class="mi">10</span><span class="o">))</span> <span class="o">{</span>
+<span class="k">try</span> <span class="o">(</span><span class="nc">BatchScanner</span> <span class="n">bscan</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchScanner</span><span class="o">(</span><span class="s">"table"</span><span class="o">,</span> <span class="n">auths</span><span class="o">,</span> <span class="mi">10</span><span class="o">))</span> <span class="o">{</span>
   <span class="n">bscan</span><span class="o">.</span><span class="na">setRanges</span><span class="o">(</span><span class="n">matchingRows</span><span class="o">);</span>
   <span class="n">bscan</span><span class="o">.</span><span class="na">fetchColumnFamily</span><span class="o">(</span><span class="s">"attributes"</span><span class="o">);</span>
 
-  <span class="k">for</span> <span class="o">(</span><span class="n">Entry</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span><span class="n">Value</span><span class="o">&gt;</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">bscan</span><span class="o">)</span> <span class="o">{</span>
-    <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="n">entry</span><span class="o">.</span><span class="na">getValue</span><span class="o">());</span>
+  <span class="k">for</span> <span class="o">(</span><span class="nc">Entry</span><span class="o">&lt;</span><span class="nc">Key</span><span class="o">,</span><span class="nc">Value</span><span class="o">&gt;</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">bscan</span><span class="o">)</span> <span class="o">{</span>
+    <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="n">entry</span><span class="o">.</span><span class="na">getValue</span><span class="o">());</span>
   <span class="o">}</span>
 <span class="o">}</span>
 </code></pre></div></div>
@@ -854,18 +854,18 @@ bins, a search of all documents must search every bin. We can use the BatchScann
 to scan all bins in parallel. The Intersecting Iterator should be enabled on a
 BatchScanner within user query code as follows:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Text</span><span class="o">[]</span> <span class="n">terms</span> <span class="o">=</span> <span class="o">{</span><span class="k">new</span> <span class="n">Text</span><span class="o">(</span><span class="s">"the"</span><span class="o">),</span> <span class="k">new</span> <span class="n">Text</span><span class="o">(</span><span class="s">"white"</span><span class="o">),</span [...]
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">Text</span><span class="o">[]</span> <span class="n">terms</span> <span class="o">=</span> <span class="o">{</span><span class="k">new</span> <span class="nc">Text</span><span class="o">(</span><span class="s">"the"</span><span class="o">),</span> <span class="k">new</span> <span class="nc">Text</span><span class="o">(</span><span class="s">"white"</span><span class="o">),</s [...]
 
-<span class="k">try</span> <span class="o">(</span><span class="n">BatchScanner</span> <span class="n">bscan</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchScanner</span><span class="o">(</span><span class="n">table</span><span class="o">,</span> <span class="n">auths</span><span class="o">,</span> <span class="mi">20</span><span class="o">))</span> <span class="o">{</span>
+<span class="k">try</span> <span class="o">(</span><span class="nc">BatchScanner</span> <span class="n">bscan</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchScanner</span><span class="o">(</span><span class="n">table</span><span class="o">,</span> <span class="n">auths</span><span class="o">,</span> <span class="mi">20</span><span class="o">))</span> <span class="o">{</span>
 
-  <span class="n">IteratorSetting</span> <span class="n">iter</span> <span class="o">=</span> <span class="k">new</span> <span class="n">IteratorSetting</span><span class="o">(</span><span class="mi">20</span><span class="o">,</span> <span class="s">"ii"</span><span class="o">,</span> <span class="n">IntersectingIterator</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-  <span class="n">IntersectingIterator</span><span class="o">.</span><span class="na">setColumnFamilies</span><span class="o">(</span><span class="n">iter</span><span class="o">,</span> <span class="n">terms</span><span class="o">);</span>
+  <span class="nc">IteratorSetting</span> <span class="n">iter</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">IteratorSetting</span><span class="o">(</span><span class="mi">20</span><span class="o">,</span> <span class="s">"ii"</span><span class="o">,</span> <span class="nc">IntersectingIterator</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+  <span class="nc">IntersectingIterator</span><span class="o">.</span><span class="na">setColumnFamilies</span><span class="o">(</span><span class="n">iter</span><span class="o">,</span> <span class="n">terms</span><span class="o">);</span>
 
   <span class="n">bscan</span><span class="o">.</span><span class="na">addScanIterator</span><span class="o">(</span><span class="n">iter</span><span class="o">);</span>
-  <span class="n">bscan</span><span class="o">.</span><span class="na">setRanges</span><span class="o">(</span><span class="n">Collections</span><span class="o">.</span><span class="na">singleton</span><span class="o">(</span><span class="k">new</span> <span class="n">Range</span><span class="o">()));</span>
+  <span class="n">bscan</span><span class="o">.</span><span class="na">setRanges</span><span class="o">(</span><span class="nc">Collections</span><span class="o">.</span><span class="na">singleton</span><span class="o">(</span><span class="k">new</span> <span class="nc">Range</span><span class="o">()));</span>
 
-  <span class="k">for</span> <span class="o">(</span><span class="n">Entry</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span><span class="n">Value</span><span class="o">&gt;</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">bscan</span><span class="o">)</span> <span class="o">{</span>
-    <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">" "</span> <span class="o">+</span> <span class="n">entry</span><span class="o">.</span><span class="na">getKey</span><span class="o">().</span><span class="na">getColumnQualifier</span><span class="o">());</span>
+  <span class="k">for</span> <span class="o">(</span><span class="nc">Entry</span><span class="o">&lt;</span><span class="nc">Key</span><span class="o">,</span><span class="nc">Value</span><span class="o">&gt;</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">bscan</span><span class="o">)</span> <span class="o">{</span>
+    <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">" "</span> <span class="o">+</span> <span class="n">entry</span><span class="o">.</span><span class="na">getKey</span><span class="o">().</span><span class="na">getColumnQualifier</span><span class="o">());</span>
   <span class="o">}</span>
 <span class="o">}</span>
 </code></pre></div></div>
diff --git a/docs/2.x/security/authentication.html b/docs/2.x/security/authentication.html
index bd1b7f3..b2bf415 100644
--- a/docs/2.x/security/authentication.html
+++ b/docs/2.x/security/authentication.html
@@ -463,7 +463,7 @@ Please confirm new password for 'bob': ****
 
 <p>In the Java API using <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/client/admin/SecurityOperations.html">SecurityOperations</a>:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">client</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">createLocalUser</span><span class="o">(</span><span class="s">"bob"</span><span class="o">,</span> <span class="k">new</span> <span class="n">PasswordToken</span><span class="o">(</span><span class="s">"pass"</span><span class="o">));</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">client</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">createLocalUser</span><span class="o">(</span><span class="s">"bob"</span><span class="o">,</span> <span class="k">new</span> <span class="nc">PasswordToken</span><span class="o">(</span><span class="s">"pass"</span><span class="o">));</span>
 </code></pre></div></div>
 
 <h2 id="authenticating-users">Authenticating users</h2>
@@ -480,7 +480,7 @@ Valid
 
 <p>In the Java API using <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/client/admin/SecurityOperations.html">SecurityOperations</a>:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kt">boolean</span> <span class="n">valid</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">authenticateUser</span><span class="o">(</span><span class="s">"bob"</span><span class="o">,</span> <span class="k">new</span> <span class="n">PasswordToken</span><span cl [...]
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kt">boolean</span> <span class="n">valid</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">authenticateUser</span><span class="o">(</span><span class="s">"bob"</span><span class="o">,</span> <span class="k">new</span> <span class="nc">PasswordToken</span><span c [...]
 </code></pre></div></div>
 
 <h2 id="changing-user-passwords">Changing user passwords</h2>
@@ -494,7 +494,7 @@ Enter new password for 'bob': ***
 
 <p>In the Java API using <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/client/admin/SecurityOperations.html">SecurityOperations</a>:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">client</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">changeLocalUserPassword</span><span class="o">(</span><span class="s">"bob"</span><span class="o">,</span> <span class="k">new</span> <span class="n">PasswordToken</span><span class="o">(</span><span class="s">"pass"</span><span class="o">));</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">client</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">changeLocalUserPassword</span><span class="o">(</span><span class="s">"bob"</span><span class="o">,</span> <span class="k">new</span> <span class="nc">PasswordToken</span><span class="o">(</span><span class="s">"pass"</span><span class="o">));</span>
 </code></pre></div></div>
 
 <h2 id="removing-users">Removing users</h2>
diff --git a/docs/2.x/security/authorizations.html b/docs/2.x/security/authorizations.html
index 601e3fb..13e8361 100644
--- a/docs/2.x/security/authorizations.html
+++ b/docs/2.x/security/authorizations.html
@@ -442,8 +442,8 @@ preserving data confidentiality.</p>
 <p>When <a href="/docs/2.x/getting-started/clients#writing-data">writing data to Accumulo</a>, users can
 specify a security label for each value by passing a [ColumnVisibilty] to the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/data/Mutation.html">Mutation</a>.</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="k">try</span> <span class="o">(</span><span class="n">BatchWriter</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="s">"employees"</span><span class="o">))</span> <span class="o">{</span>
-  <span class="n">Mutation</span> <span class="n">mut</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Mutation</span><span class="o">(</span><span class="s">"employee1"</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="k">try</span> <span class="o">(</span><span class="nc">BatchWriter</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="s">"employees"</span><span class="o">))</span> <span class="o">{</span>
+  <span class="nc">Mutation</span> <span class="n">mut</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Mutation</span><span class="o">(</span><span class="s">"employee1"</span><span class="o">);</span>
   <span class="n">mut</span><span class="o">.</span><span class="na">at</span><span class="o">().</span><span class="na">family</span><span class="o">(</span><span class="s">"pay"</span><span class="o">).</span><span class="na">qualifier</span><span class="o">(</span><span class="s">"salary"</span><span class="o">).</span><span class="na">visibility</span><span class="o">(</span><span class="s">"payroll"</span><span class="o">).</span><span class="na">value</span><span class="o">(</span> [...]
   <span class="n">mut</span><span class="o">.</span><span class="na">at</span><span class="o">().</span><span class="na">family</span><span class="o">(</span><span class="s">"pay"</span><span class="o">).</span><span class="na">qualifier</span><span class="o">(</span><span class="s">"period"</span><span class="o">).</span><span class="na">visibility</span><span class="o">(</span><span class="s">"public"</span><span class="o">).</span><span class="na">value</span><span class="o">(</span>< [...]
   <span class="n">writer</span><span class="o">.</span><span class="na">addMutation</span><span class="o">(</span><span class="n">mut</span><span class="o">)</span>
@@ -500,9 +500,9 @@ results sent back to the client.</p>
 <p><a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/security/Authorizations.html">Authorizations</a> are specified as a comma-separated list of tokens the user possesses:</p>
 
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c1">// user possesses both admin and system level access</span>
-<span class="n">Authorizations</span> <span class="n">auths</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Authorizations</span><span class="o">(</span><span class="s">"admin"</span><span class="o">,</span><span class="s">"system"</span><span class="o">);</span>
+<span class="nc">Authorizations</span> <span class="n">auths</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Authorizations</span><span class="o">(</span><span class="s">"admin"</span><span class="o">,</span><span class="s">"system"</span><span class="o">);</span>
 
-<span class="n">Scanner</span> <span class="n">s</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"table"</span><span class="o">,</span> <span class="n">auths</span><span class="o">);</span>
+<span class="nc">Scanner</span> <span class="n">s</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"table"</span><span class="o">,</span> <span class="n">auths</span><span class="o">);</span>
 </code></pre></div></div>
 
 <h3 id="user-authorizations">User Authorizations</h3>
diff --git a/docs/2.x/security/kerberos.html b/docs/2.x/security/kerberos.html
index 6fe38ea..eb75ed3 100644
--- a/docs/2.x/security/kerberos.html
+++ b/docs/2.x/security/kerberos.html
@@ -851,18 +851,18 @@ delegation token.  The <a href="https://static.javadoc.io/org.apache.accumulo/ac
 job. It is expected that the user launching the MapReduce job is already logged in via Kerberos
 via a keytab or via a locally-cached Kerberos ticket-granting-ticket (TGT).</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">KerberosToken</span> <span class="n">kt</span> <span class="o">=</span> <span class="k">new</span> <span class="n">KerberosToken</span><span class="o">();</span>
-<span class="n">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">().</span><span class="na">to</span><span class="o">(</span><span class="s">"myinstance"</span><span class="o">,</span> <span class="s">"zoo1,zoo2"</span><span class="o">)</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">KerberosToken</span> <span class="n">kt</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">KerberosToken</span><span class="o">();</span>
+<span class="nc">AccumuloClient</span> <span class="n">client</span> <span class="o">=</span> <span class="nc">Accumulo</span><span class="o">.</span><span class="na">newClient</span><span class="o">().</span><span class="na">to</span><span class="o">(</span><span class="s">"myinstance"</span><span class="o">,</span> <span class="s">"zoo1,zoo2"</span><span class="o">)</span>
                           <span class="o">.</span><span class="na">as</span><span class="o">(</span><span class="n">principal</span><span class="o">,</span> <span class="n">kt</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
-<span class="n">DelegationToken</span> <span class="n">dt</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">getDelegationToken</span><span class="o">();</span>
-<span class="n">Properties</span> <span class="n">props</span> <span class="o">=</span> <span class="n">Accumulo</span><span class="o">.</span><span class="na">newClientProperties</span><span class="o">().</span><span class="na">from</span><span class="o">(</span><span class="n">client</span><span class="o">.</span><span class="na">properties</span><span class="o">())</span>
+<span class="nc">DelegationToken</span> <span class="n">dt</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">getDelegationToken</span><span class="o">();</span>
+<span class="nc">Properties</span> <span class="n">props</span> <span class="o">=</span> <span class="nc">Accumulo</span><span class="o">.</span><span class="na">newClientProperties</span><span class="o">().</span><span class="na">from</span><span class="o">(</span><span class="n">client</span><span class="o">.</span><span class="na">properties</span><span class="o">())</span>
                           <span class="o">.</span><span class="na">as</span><span class="o">(</span><span class="n">principal</span><span class="o">,</span> <span class="n">dt</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
 
 <span class="c1">// Reading from Accumulo</span>
-<span class="n">AccumuloInputFormat</span><span class="o">.</span><span class="na">configure</span><span class="o">().</span><span class="na">clientProperties</span><span class="o">(</span><span class="n">props</span><span class="o">).</span><span class="na">store</span><span class="o">(</span><span class="n">job</span><span class="o">);</span>
+<span class="nc">AccumuloInputFormat</span><span class="o">.</span><span class="na">configure</span><span class="o">().</span><span class="na">clientProperties</span><span class="o">(</span><span class="n">props</span><span class="o">).</span><span class="na">store</span><span class="o">(</span><span class="n">job</span><span class="o">);</span>
 
 <span class="c1">// Writing to Accumulo</span>
-<span class="n">AccumuloOutputFormat</span><span class="o">.</span><span class="na">configure</span><span class="o">().</span><span class="na">clientProperties</span><span class="o">(</span><span class="n">props</span><span class="o">).</span><span class="na">store</span><span class="o">(</span><span class="n">job</span><span class="o">);</span>
+<span class="nc">AccumuloOutputFormat</span><span class="o">.</span><span class="na">configure</span><span class="o">().</span><span class="na">clientProperties</span><span class="o">(</span><span class="n">props</span><span class="o">).</span><span class="na">store</span><span class="o">(</span><span class="n">job</span><span class="o">);</span>
 </code></pre></div></div>
 
 <p>Users must have the <code class="highlighter-rouge">DELEGATION_TOKEN</code> system permission to call the <code class="highlighter-rouge">getDelegationToken</code>
diff --git a/docs/2.x/security/on-disk-encryption.html b/docs/2.x/security/on-disk-encryption.html
index d9c3ca3..c4f3467 100644
--- a/docs/2.x/security/on-disk-encryption.html
+++ b/docs/2.x/security/on-disk-encryption.html
@@ -448,22 +448,22 @@ For example, openssl can be used to create a random 32 byte key:</p>
 <p>The new crypto interface for 2.0 allows for easier custom implementation of encryption and decryption. Your
 class only has to implement the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/spi/crypto/CryptoService.html">CryptoService</a> interface to work with Accumulo.
 The interface has 3 methods:</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code>  <span class="kt">void</span> <span class="nf">init</span><span class="o">(</span><span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">conf</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">CryptoException</span><span class="o">;</span>
-  <span class="n">FileEncrypter</span> <span class="nf">getFileEncrypter</span><span class="o">(</span><span class="n">CryptoEnvironment</span> <span class="n">environment</span><span class="o">);</span>
-  <span class="n">FileDecrypter</span> <span class="nf">getFileDecrypter</span><span class="o">(</span><span class="n">CryptoEnvironment</span> <span class="n">environment</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code>  <span class="kt">void</span> <span class="nf">init</span><span class="o">(</span><span class="nc">Map</span><span class="o">&lt;</span><span class="nc">String</span><span class="o">,</span><span class="nc">String</span><span class="o">&gt;</span> <span class="n">conf</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">CryptoException</span><span class="o">;</span>
+  <span class="nc">FileEncrypter</span> <span class="nf">getFileEncrypter</span><span class="o">(</span><span class="nc">CryptoEnvironment</span> <span class="n">environment</span><span class="o">);</span>
+  <span class="nc">FileDecrypter</span> <span class="nf">getFileDecrypter</span><span class="o">(</span><span class="nc">CryptoEnvironment</span> <span class="n">environment</span><span class="o">);</span>
 </code></pre></div></div>
 <p>The <code class="highlighter-rouge">init</code> method is where you will initialize any resources required for crypto and will get called once per Tablet Server.
 The <code class="highlighter-rouge">getFileEncrypter</code> method requires implementation of a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/spi/crypto/FileEncrypter.html">FileEncrypter</a> 
 for encryption and the <code class="highlighter-rouge">getFileDecrypter</code> method requires implementation of a <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/spi/crypto/FileDecrypter.html">FileDecrypter</a> 
 for decryption. The <code class="highlighter-rouge">CryptoEnvironment</code> passed into these methods will provide the scope of the crypto. 
 The FileEncrypter has two methods:</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code>  <span class="n">OutputStream</span> <span class="nf">encryptStream</span><span class="o">(</span><span class="n">OutputStream</span> <span class="n">outputStream</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">CryptoService</span><span class="o">.</span><span class="na">CryptoException</span><span class="o">;</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code>  <span class="nc">OutputStream</span> <span class="nf">encryptStream</span><span class="o">(</span><span class="nc">OutputStream</span> <span class="n">outputStream</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">CryptoService</span><span class="o">.</span><span class="na">CryptoException</span><span class="o">;</span>
   <span class="kt">byte</span><span class="o">[]</span> <span class="nf">getDecryptionParameters</span><span class="o">();</span>
 </code></pre></div></div>
 <p>The <code class="highlighter-rouge">encryptStream</code> method performs the encryption on the provided OutputStream and returns an OutputStream, most likely 
 wrapped in at least one other OutputStream.  The <code class="highlighter-rouge">getDecryptionParameters</code> returns a byte array of anything that will be 
 required to perform decryption. The FileDecrypter only has one method:</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code>  <span class="n">InputStream</span> <span class="nf">decryptStream</span><span class="o">(</span><span class="n">InputStream</span> <span class="n">inputStream</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">CryptoService</span><span class="o">.</span><span class="na">CryptoException</span><span class="o">;</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code>  <span class="nc">InputStream</span> <span class="nf">decryptStream</span><span class="o">(</span><span class="nc">InputStream</span> <span class="n">inputStream</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">CryptoService</span><span class="o">.</span><span class="na">CryptoException</span><span class="o">;</span>
 </code></pre></div></div>
 <p>For more help getting started see <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/security/crypto/impl/AESCryptoService.html">AESCryptoService</a>.</p>
 
diff --git a/docs/2.x/security/permissions.html b/docs/2.x/security/permissions.html
index 92dbc8b..a842c61 100644
--- a/docs/2.x/security/permissions.html
+++ b/docs/2.x/security/permissions.html
@@ -447,7 +447,7 @@
 
 <p>Or in the Java API using <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/client/admin/SecurityOperations.html">SecurityOperations</a>:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">client</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">grantSystem</span><span class="o">(</span><span class="s">"bob"</span><span class="o">,</span> <span class="n">SystemPermission</span><span class="o">.</span><span class="na">CREATE_TABLE</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">client</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">grantSystem</span><span class="o">(</span><span class="s">"bob"</span><span class="o">,</span> <span class="nc">SystemPermission</span><span class="o">.</span><span class="na">CREATE_TABLE</span><span class="o">);</span>
 </code></pre></div></div>
 
 <h2 id="view-permissions">View permissions</h2>
@@ -473,7 +473,7 @@ Table permissions (accumulo.root): Table.READ
 
 <p>Or in the Java API using <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0-alpha-2/org/apache/accumulo/core/client/admin/SecurityOperations.html">SecurityOperations</a>:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">client</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">revokeSystemPermission</span><span class="o">(</span><span class="s">"bob"</span><span class="o">,</span> <span class="n">SystemPermission</span><span class="o">.</span><span class="na">CREATE_TABLE</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">client</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">revokeSystemPermission</span><span class="o">(</span><span class="s">"bob"</span><span class="o">,</span> <span class="nc">SystemPermission</span><span class="o">.</span><span class="na">CREATE_TABLE</span><span class="o">);</span>
 </code></pre></div></div>
 
 
diff --git a/docs/2.x/troubleshooting/tracing.html b/docs/2.x/troubleshooting/tracing.html
index e52a49a..3b2d19d 100644
--- a/docs/2.x/troubleshooting/tracing.html
+++ b/docs/2.x/troubleshooting/tracing.html
@@ -591,10 +591,10 @@ your application call</p>
 
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kn">import</span> <span class="nn">org.apache.accumulo.core.trace.DistributedTrace</span><span class="o">;</span>
 <span class="o">...</span>
-<span class="n">DistributedTrace</span><span class="o">.</span><span class="na">enable</span><span class="o">(</span><span class="n">hostname</span><span class="o">,</span> <span class="s">"myApplication"</span><span class="o">);</span>
+<span class="nc">DistributedTrace</span><span class="o">.</span><span class="na">enable</span><span class="o">(</span><span class="n">hostname</span><span class="o">,</span> <span class="s">"myApplication"</span><span class="o">);</span>
 <span class="c1">// do some tracing</span>
 <span class="o">...</span>
-<span class="n">DistributedTrace</span><span class="o">.</span><span class="na">disable</span><span class="o">();</span>
+<span class="nc">DistributedTrace</span><span class="o">.</span><span class="na">disable</span><span class="o">();</span>
 </code></pre></div></div>
 
 <p>Once tracing has been enabled, a client can wrap an operation in a trace.</p>
@@ -603,10 +603,10 @@ your application call</p>
 <span class="kn">import</span> <span class="nn">org.apache.htrace.Trace</span><span class="o">;</span>
 <span class="kn">import</span> <span class="nn">org.apache.htrace.TraceScope</span><span class="o">;</span>
 <span class="o">...</span>
-<span class="n">TraceScope</span> <span class="n">scope</span> <span class="o">=</span> <span class="n">Trace</span><span class="o">.</span><span class="na">startSpan</span><span class="o">(</span><span class="s">"Client Scan"</span><span class="o">,</span> <span class="n">Sampler</span><span class="o">.</span><span class="na">ALWAYS</span><span class="o">);</span>
-<span class="n">BatchScanner</span> <span class="n">scanner</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchScanner</span><span class="o">(...);</span>
+<span class="nc">TraceScope</span> <span class="n">scope</span> <span class="o">=</span> <span class="nc">Trace</span><span class="o">.</span><span class="na">startSpan</span><span class="o">(</span><span class="s">"Client Scan"</span><span class="o">,</span> <span class="nc">Sampler</span><span class="o">.</span><span class="na">ALWAYS</span><span class="o">);</span>
+<span class="nc">BatchScanner</span> <span class="n">scanner</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createBatchScanner</span><span class="o">(...);</span>
 <span class="c1">// Configure your scanner</span>
-<span class="k">for</span> <span class="o">(</span><span class="n">Entry</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">scanner</span><span class="o">)</span> <span class="o">{</span>
+<span class="k">for</span> <span class="o">(</span><span class="nc">Entry</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">scanner</span><span class="o">)</span> <span class="o">{</span>
 <span class="o">}</span>
 <span class="n">scope</span><span class="o">.</span><span class="na">close</span><span class="o">();</span>
 </code></pre></div></div>
@@ -619,13 +619,13 @@ Don’t forget to specify a Sampler at the top-level span
 because the default Sampler only samples when part of a pre-existing trace,
 which will never occur in a client that never specifies a Sampler.</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">TraceScope</span> <span class="n">scope</span> <span class="o">=</span> <span class="n">Trace</span><span class="o">.</span><span class="na">startSpan</span><span class="o">(</span><span class="s">"Client Update"</span><span class="o">,</span> <span class="n">Sampler</span><span class="o">.</span><span class="na">ALWAYS</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">TraceScope</span> <span class="n">scope</span> <span class="o">=</span> <span class="nc">Trace</span><span class="o">.</span><span class="na">startSpan</span><span class="o">(</span><span class="s">"Client Update"</span><span class="o">,</span> <span class="nc">Sampler</span><span class="o">.</span><span class="na">ALWAYS</span><span class="o">);</span>
 <span class="o">...</span>
-<span class="n">TraceScope</span> <span class="n">readScope</span> <span class="o">=</span> <span class="n">Trace</span><span class="o">.</span><span class="na">startSpan</span><span class="o">(</span><span class="s">"Read"</span><span class="o">);</span>
+<span class="nc">TraceScope</span> <span class="n">readScope</span> <span class="o">=</span> <span class="nc">Trace</span><span class="o">.</span><span class="na">startSpan</span><span class="o">(</span><span class="s">"Read"</span><span class="o">);</span>
 <span class="o">...</span>
 <span class="n">readScope</span><span class="o">.</span><span class="na">close</span><span class="o">();</span>
 <span class="o">...</span>
-<span class="n">TraceScope</span> <span class="n">writeScope</span> <span class="o">=</span> <span class="n">Trace</span><span class="o">.</span><span class="na">startSpan</span><span class="o">(</span><span class="s">"Write"</span><span class="o">);</span>
+<span class="nc">TraceScope</span> <span class="n">writeScope</span> <span class="o">=</span> <span class="nc">Trace</span><span class="o">.</span><span class="na">startSpan</span><span class="o">(</span><span class="s">"Write"</span><span class="o">);</span>
 <span class="o">...</span>
 <span class="n">writeScope</span><span class="o">.</span><span class="na">close</span><span class="o">();</span>
 <span class="n">scope</span><span class="o">.</span><span class="na">close</span><span class="o">();</span>
@@ -636,12 +636,12 @@ Checking whether currently tracing is necessary when using a sampler other than
 
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="o">...</span>
 <span class="kt">int</span> <span class="n">numberOfEntriesRead</span> <span class="o">=</span> <span class="mi">0</span><span class="o">;</span>
-<span class="n">TraceScope</span> <span class="n">readScope</span> <span class="o">=</span> <span class="n">Trace</span><span class="o">.</span><span class="na">startSpan</span><span class="o">(</span><span class="s">"Read"</span><span class="o">);</span>
+<span class="nc">TraceScope</span> <span class="n">readScope</span> <span class="o">=</span> <span class="nc">Trace</span><span class="o">.</span><span class="na">startSpan</span><span class="o">(</span><span class="s">"Read"</span><span class="o">);</span>
 <span class="c1">// Do the read, update the counter</span>
 <span class="o">...</span>
-<span class="k">if</span> <span class="o">(</span><span class="n">Trace</span><span class="o">.</span><span class="na">isTracing</span><span class="o">)</span>
-  <span class="n">readScope</span><span class="o">.</span><span class="na">getSpan</span><span class="o">().</span><span class="na">addKVAnnotation</span><span class="o">(</span><span class="s">"Number of Entries Read"</span><span class="o">.</span><span class="na">getBytes</span><span class="o">(</span><span class="n">StandardCharsets</span><span class="o">.</span><span class="na">UTF_8</span><span class="o">),</span>
-      <span class="n">String</span><span class="o">.</span><span class="na">valueOf</span><span class="o">(</span><span class="n">numberOfEntriesRead</span><span class="o">).</span><span class="na">getBytes</span><span class="o">(</span><span class="n">StandardCharsets</span><span class="o">.</span><span class="na">UTF_8</span><span class="o">));</span>
+<span class="k">if</span> <span class="o">(</span><span class="nc">Trace</span><span class="o">.</span><span class="na">isTracing</span><span class="o">)</span>
+  <span class="n">readScope</span><span class="o">.</span><span class="na">getSpan</span><span class="o">().</span><span class="na">addKVAnnotation</span><span class="o">(</span><span class="s">"Number of Entries Read"</span><span class="o">.</span><span class="na">getBytes</span><span class="o">(</span><span class="nc">StandardCharsets</span><span class="o">.</span><span class="na">UTF_8</span><span class="o">),</span>
+      <span class="nc">String</span><span class="o">.</span><span class="na">valueOf</span><span class="o">(</span><span class="n">numberOfEntriesRead</span><span class="o">).</span><span class="na">getBytes</span><span class="o">(</span><span class="nc">StandardCharsets</span><span class="o">.</span><span class="na">UTF_8</span><span class="o">));</span>
 </code></pre></div></div>
 
 <p>It is also possible to add timeline annotations to your spans.
@@ -658,17 +658,17 @@ help enable tracing for 1-in-1000 operations</p>
 
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kn">import</span> <span class="nn">org.apache.htrace.impl.CountSampler</span><span class="o">;</span>
 <span class="o">...</span>
-<span class="n">Sampler</span> <span class="n">sampler</span> <span class="o">=</span> <span class="k">new</span> <span class="n">CountSampler</span><span class="o">(</span><span class="n">HTraceConfiguration</span><span class="o">.</span><span class="na">fromMap</span><span class="o">(</span>
-    <span class="n">Collections</span><span class="o">.</span><span class="na">singletonMap</span><span class="o">(</span><span class="n">CountSampler</span><span class="o">.</span><span class="na">SAMPLER_FREQUENCY_CONF_KEY</span><span class="o">,</span> <span class="s">"1000"</span><span class="o">)));</span>
+<span class="nc">Sampler</span> <span class="n">sampler</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">CountSampler</span><span class="o">(</span><span class="nc">HTraceConfiguration</span><span class="o">.</span><span class="na">fromMap</span><span class="o">(</span>
+    <span class="nc">Collections</span><span class="o">.</span><span class="na">singletonMap</span><span class="o">(</span><span class="nc">CountSampler</span><span class="o">.</span><span class="na">SAMPLER_FREQUENCY_CONF_KEY</span><span class="o">,</span> <span class="s">"1000"</span><span class="o">)));</span>
 <span class="o">...</span>
-<span class="n">TraceScope</span> <span class="n">readScope</span> <span class="o">=</span> <span class="n">Trace</span><span class="o">.</span><span class="na">startSpan</span><span class="o">(</span><span class="s">"Read"</span><span class="o">,</span> <span class="n">sampler</span><span class="o">);</span>
+<span class="nc">TraceScope</span> <span class="n">readScope</span> <span class="o">=</span> <span class="nc">Trace</span><span class="o">.</span><span class="na">startSpan</span><span class="o">(</span><span class="s">"Read"</span><span class="o">,</span> <span class="n">sampler</span><span class="o">);</span>
 <span class="o">...</span>
 <span class="n">readScope</span><span class="o">.</span><span class="na">close</span><span class="o">();</span>
 </code></pre></div></div>
 
 <p>Remember to close all spans and disable tracing when finished.</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">DistributedTrace</span><span class="o">.</span><span class="na">disable</span><span class="o">();</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">DistributedTrace</span><span class="o">.</span><span class="na">disable</span><span class="o">();</span>
 </code></pre></div></div>
 
 <h2 id="viewing-collected-traces">Viewing Collected Traces</h2>
diff --git a/feed.xml b/feed.xml
index fe52e10..142ed11 100644
--- a/feed.xml
+++ b/feed.xml
@@ -6,9 +6,9 @@
 </description>
     <link>https://accumulo.apache.org/</link>
     <atom:link href="https://accumulo.apache.org/feed.xml" rel="self" type="application/rss+xml"/>
-    <pubDate>Fri, 12 Jul 2019 16:31:41 -0400</pubDate>
-    <lastBuildDate>Fri, 12 Jul 2019 16:31:41 -0400</lastBuildDate>
-    <generator>Jekyll v3.8.5</generator>
+    <pubDate>Fri, 12 Jul 2019 16:32:52 -0400</pubDate>
+    <lastBuildDate>Fri, 12 Jul 2019 16:32:52 -0400</lastBuildDate>
+    <generator>Jekyll v3.8.6</generator>
     
     
       <item>
diff --git a/tour/authorizations-code/index.html b/tour/authorizations-code/index.html
index cac53af..16fd9f8 100644
--- a/tour/authorizations-code/index.html
+++ b/tour/authorizations-code/index.html
@@ -148,49 +148,49 @@
 <div id="tour-content">
   <p>Below is a solution for the exercise.</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">static</span> <span class="kt">void</span> <span class="nf">exercise</span><span class="o">(</span><span class="n">MiniAccumuloCluster</span> <span class="n">mac</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">static</span> <span class="kt">void</span> <span class="nf">exercise</span><span class="o">(</span><span class="nc">MiniAccumuloCluster</span> <span class="n">mac</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
     <span class="c1">// Connect to Mini Accumulo as the root user and create a table called "GothamPD".</span>
-    <span class="n">Connector</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">mac</span><span class="o">.</span><span class="na">getConnector</span><span class="o">(</span><span class="s">"root"</span><span class="o">,</span> <span class="s">"tourguide"</span><span class="o">);</span>
+    <span class="nc">Connector</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">mac</span><span class="o">.</span><span class="na">getConnector</span><span class="o">(</span><span class="s">"root"</span><span class="o">,</span> <span class="s">"tourguide"</span><span class="o">);</span>
     <span class="n">conn</span><span class="o">.</span><span class="na">tableOperations</span><span class="o">().</span><span class="na">create</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">);</span>
 
     <span class="c1">// Create a "secretId" authorization &amp; visibility</span>
-    <span class="kd">final</span> <span class="n">String</span> <span class="n">secretId</span> <span class="o">=</span> <span class="s">"secretId"</span><span class="o">;</span>
-    <span class="n">Authorizations</span> <span class="n">auths</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Authorizations</span><span class="o">(</span><span class="n">secretId</span><span class="o">);</span>
-    <span class="n">ColumnVisibility</span> <span class="n">colVis</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ColumnVisibility</span><span class="o">(</span><span class="n">secretId</span><span class="o">);</span>
+    <span class="kd">final</span> <span class="nc">String</span> <span class="n">secretId</span> <span class="o">=</span> <span class="s">"secretId"</span><span class="o">;</span>
+    <span class="nc">Authorizations</span> <span class="n">auths</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Authorizations</span><span class="o">(</span><span class="n">secretId</span><span class="o">);</span>
+    <span class="nc">ColumnVisibility</span> <span class="n">colVis</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">ColumnVisibility</span><span class="o">(</span><span class="n">secretId</span><span class="o">);</span>
 
     <span class="c1">// Create a user with the "secretId" authorization and grant him read permissions on our table</span>
-    <span class="n">conn</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">createLocalUser</span><span class="o">(</span><span class="s">"commissioner"</span><span class="o">,</span> <span class="k">new</span> <span class="n">PasswordToken</span><span class="o">(</span><span class="s">"gordonrocks"</span><span class="o">));</span>
+    <span class="n">conn</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">createLocalUser</span><span class="o">(</span><span class="s">"commissioner"</span><span class="o">,</span> <span class="k">new</span> <span class="nc">PasswordToken</span><span class="o">(</span><span class="s">"gordonrocks"</span><span class="o">));</span>
     <span class="n">conn</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">changeUserAuthorizations</span><span class="o">(</span><span class="s">"commissioner"</span><span class="o">,</span> <span class="n">auths</span><span class="o">);</span>
-    <span class="n">conn</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">grantTablePermission</span><span class="o">(</span><span class="s">"commissioner"</span><span class="o">,</span> <span class="s">"GothamPD"</span><span class="o">,</span> <span class="n">TablePermission</span><span class="o">.</span><span class="na">READ</span><span class="o">);</span>
+    <span class="n">conn</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">grantTablePermission</span><span class="o">(</span><span class="s">"commissioner"</span><span class="o">,</span> <span class="s">"GothamPD"</span><span class="o">,</span> <span class="nc">TablePermission</span><span class="o">.</span><span class="na">READ</span><span class="o">);</span>
 
     <span class="c1">// Create 3 Mutation objects, securing the proper columns.</span>
-    <span class="n">Mutation</span> <span class="n">mutation1</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Mutation</span><span class="o">(</span><span class="s">"id0001"</span><span class="o">);</span>
+    <span class="nc">Mutation</span> <span class="n">mutation1</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Mutation</span><span class="o">(</span><span class="s">"id0001"</span><span class="o">);</span>
     <span class="n">mutation1</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"hero"</span><span class="o">,</span><span class="s">"alias"</span><span class="o">,</span> <span class="s">"Batman"</span><span class="o">);</span>
     <span class="n">mutation1</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"hero"</span><span class="o">,</span><span class="s">"name"</span><span class="o">,</span> <span class="n">colVis</span><span class="o">,</span> <span class="s">"Bruce Wayne"</span><span class="o">);</span>
     <span class="n">mutation1</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"hero"</span><span class="o">,</span><span class="s">"wearsCape?"</span><span class="o">,</span> <span class="s">"true"</span><span class="o">);</span>
-    <span class="n">Mutation</span> <span class="n">mutation2</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Mutation</span><span class="o">(</span><span class="s">"id0002"</span><span class="o">);</span>
+    <span class="nc">Mutation</span> <span class="n">mutation2</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Mutation</span><span class="o">(</span><span class="s">"id0002"</span><span class="o">);</span>
     <span class="n">mutation2</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"hero"</span><span class="o">,</span><span class="s">"alias"</span><span class="o">,</span> <span class="s">"Robin"</span><span class="o">);</span>
     <span class="n">mutation2</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"hero"</span><span class="o">,</span><span class="s">"name"</span><span class="o">,</span> <span class="n">colVis</span><span class="o">,</span><span class="s">"Dick Grayson"</span><span class="o">);</span>
     <span class="n">mutation2</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"hero"</span><span class="o">,</span><span class="s">"wearsCape?"</span><span class="o">,</span> <span class="s">"true"</span><span class="o">);</span>
-    <span class="n">Mutation</span> <span class="n">mutation3</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Mutation</span><span class="o">(</span><span class="s">"id0003"</span><span class="o">);</span>
+    <span class="nc">Mutation</span> <span class="n">mutation3</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Mutation</span><span class="o">(</span><span class="s">"id0003"</span><span class="o">);</span>
     <span class="n">mutation3</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"villain"</span><span class="o">,</span><span class="s">"alias"</span><span class="o">,</span> <span class="s">"Joker"</span><span class="o">);</span>
     <span class="n">mutation3</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"villain"</span><span class="o">,</span><span class="s">"name"</span><span class="o">,</span> <span class="s">"Unknown"</span><span class="o">);</span>
     <span class="n">mutation3</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"villain"</span><span class="o">,</span><span class="s">"wearsCape?"</span><span class="o">,</span> <span class="s">"false"</span><span class="o">);</span>
 
     <span class="c1">// Create a BatchWriter to the GothamPD table and add your mutations to it.</span>
     <span class="c1">// Once the BatchWriter is closed by the try w/ resources, data will be available to scans.</span>
-    <span class="k">try</span> <span class="o">(</span><span class="n">BatchWriter</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="k">new</span> <span class="n">BatchWriterConfig</span><span class="o">()))</span> <span class="o">{</span>
+    <span class="k">try</span> <span class="o">(</span><span class="nc">BatchWriter</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="k">new</span> <span class="nc">BatchWriterConfig</span><span class="o">()))</span> <span class="o">{</span>
         <span class="n">writer</span><span class="o">.</span><span class="na">addMutation</span><span class="o">(</span><span class="n">mutation1</span><span class="o">);</span>
         <span class="n">writer</span><span class="o">.</span><span class="na">addMutation</span><span class="o">(</span><span class="n">mutation2</span><span class="o">);</span>
         <span class="n">writer</span><span class="o">.</span><span class="na">addMutation</span><span class="o">(</span><span class="n">mutation3</span><span class="o">);</span>
     <span class="o">}</span>
 
     <span class="c1">// Read and print all rows of the commissioner can see. Pass Scanner proper authorizations</span>
-    <span class="n">Connector</span> <span class="n">commishConn</span> <span class="o">=</span> <span class="n">mac</span><span class="o">.</span><span class="na">getConnector</span><span class="o">(</span><span class="s">"commissioner"</span><span class="o">,</span> <span class="s">"gordonrocks"</span><span class="o">);</span>
-    <span class="k">try</span> <span class="o">(</span><span class="n">Scanner</span> <span class="n">scan</span> <span class="o">=</span> <span class="n">commishConn</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="n">auths</span><span class="o">))</span> <span class="o">{</span>
-        <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"Gotham Police Department Persons of Interest:"</span><span class="o">);</span>
-        <span class="k">for</span> <span class="o">(</span><span class="n">Map</span><span class="o">.</span><span class="na">Entry</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span> <span class="n">Value</span><span class="o">&gt;</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">scan</span><span class="o">)</span> <span class="o">{</span>
-            <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">printf</span><span class="o">(</span><span class="s">"Key : %-60s  Value : %s\n"</span><span class="o">,</span> <span class="n">entry</span><span class="o">.</span><span class="na">getKey</span><span class="o">(),</span> <span class="n">entry</span><span class="o">.</span><span class="na">getValue</span><span class="o">());</span>
+    <span class="nc">Connector</span> <span class="n">commishConn</span> <span class="o">=</span> <span class="n">mac</span><span class="o">.</span><span class="na">getConnector</span><span class="o">(</span><span class="s">"commissioner"</span><span class="o">,</span> <span class="s">"gordonrocks"</span><span class="o">);</span>
+    <span class="k">try</span> <span class="o">(</span><span class="nc">Scanner</span> <span class="n">scan</span> <span class="o">=</span> <span class="n">commishConn</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="n">auths</span><span class="o">))</span> <span class="o">{</span>
+        <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"Gotham Police Department Persons of Interest:"</span><span class="o">);</span>
+        <span class="k">for</span> <span class="o">(</span><span class="nc">Map</span><span class="o">.</span><span class="na">Entry</span><span class="o">&lt;</span><span class="nc">Key</span><span class="o">,</span> <span class="nc">Value</span><span class="o">&gt;</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">scan</span><span class="o">)</span> <span class="o">{</span>
+            <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">printf</span><span class="o">(</span><span class="s">"Key : %-60s  Value : %s\n"</span><span class="o">,</span> <span class="n">entry</span><span class="o">.</span><span class="na">getKey</span><span class="o">(),</span> <span class="n">entry</span><span class="o">.</span><span class="na">getValue</span><span class="o">());</span>
         <span class="o">}</span>
     <span class="o">}</span>
 <span class="o">}</span>
diff --git a/tour/authorizations/index.html b/tour/authorizations/index.html
index 9a4cdea..c04125c 100644
--- a/tour/authorizations/index.html
+++ b/tour/authorizations/index.html
@@ -165,14 +165,14 @@ visible to the user.</p>
 <ol>
   <li>Using the code from the previous exercise, add the following to the beginning of the <em>exercise</em> method (after we get the Connector).
     <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code>     <span class="c1">// Create a "secretId" authorization &amp; visibility</span>
-     <span class="kd">final</span> <span class="n">String</span> <span class="n">secretId</span> <span class="o">=</span> <span class="s">"secretId"</span><span class="o">;</span>
-     <span class="n">Authorizations</span> <span class="n">auths</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Authorizations</span><span class="o">(</span><span class="n">secretId</span><span class="o">);</span>
-     <span class="n">ColumnVisibility</span> <span class="n">colVis</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ColumnVisibility</span><span class="o">(</span><span class="n">secretId</span><span class="o">);</span>
+     <span class="kd">final</span> <span class="nc">String</span> <span class="n">secretId</span> <span class="o">=</span> <span class="s">"secretId"</span><span class="o">;</span>
+     <span class="nc">Authorizations</span> <span class="n">auths</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Authorizations</span><span class="o">(</span><span class="n">secretId</span><span class="o">);</span>
+     <span class="nc">ColumnVisibility</span> <span class="n">colVis</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">ColumnVisibility</span><span class="o">(</span><span class="n">secretId</span><span class="o">);</span>
         
      <span class="c1">// Create a user with the "secretId" authorization and grant him read permissions on our table</span>
-     <span class="n">conn</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">createLocalUser</span><span class="o">(</span><span class="s">"commissioner"</span><span class="o">,</span> <span class="k">new</span> <span class="n">PasswordToken</span><span class="o">(</span><span class="s">"gordonrocks"</span><span class="o">));</span>
+     <span class="n">conn</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">createLocalUser</span><span class="o">(</span><span class="s">"commissioner"</span><span class="o">,</span> <span class="k">new</span> <span class="nc">PasswordToken</span><span class="o">(</span><span class="s">"gordonrocks"</span><span class="o">));</span>
      <span class="n">conn</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">changeUserAuthorizations</span><span class="o">(</span><span class="s">"commissioner"</span><span class="o">,</span> <span class="n">auths</span><span class="o">);</span>
-     <span class="n">conn</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">grantTablePermission</span><span class="o">(</span><span class="s">"commissioner"</span><span class="o">,</span> <span class="s">"GothamPD"</span><span class="o">,</span> <span class="n">TablePermission</span><span class="o">.</span><span class="na">READ</span><span class="o">);</span>
+     <span class="n">conn</span><span class="o">.</span><span class="na">securityOperations</span><span class="o">().</span><span class="na">grantTablePermission</span><span class="o">(</span><span class="s">"commissioner"</span><span class="o">,</span> <span class="s">"GothamPD"</span><span class="o">,</span> <span class="nc">TablePermission</span><span class="o">.</span><span class="na">READ</span><span class="o">);</span>
 </code></pre></div>    </div>
   </li>
   <li>
diff --git a/tour/basic-read-write/index.html b/tour/basic-read-write/index.html
index 4689b1c..298c427 100644
--- a/tour/basic-read-write/index.html
+++ b/tour/basic-read-write/index.html
@@ -150,13 +150,13 @@
 data in tables and rows.  Each row in an Accumulo table can hold many key/value pairs. Our next exercise shows how to
 write and read from a table.</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">static</span> <span class="kt">void</span> <span class="nf">exercise</span><span class="o">(</span><span class="n">MiniAccumuloCluster</span> <span class="n">mac</span><span class="o">)</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">static</span> <span class="kt">void</span> <span class="nf">exercise</span><span class="o">(</span><span class="nc">MiniAccumuloCluster</span> <span class="n">mac</span><span class="o">)</span> <span class="o">{</span>
     <span class="c1">// Connect to Mini Accumulo as the root user and create a table called "GothamPD".</span>
-    <span class="n">Connector</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">mac</span><span class="o">.</span><span class="na">getConnector</span><span class="o">(</span><span class="s">"root"</span><span class="o">,</span> <span class="s">"tourguide"</span><span class="o">);</span>
+    <span class="nc">Connector</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">mac</span><span class="o">.</span><span class="na">getConnector</span><span class="o">(</span><span class="s">"root"</span><span class="o">,</span> <span class="s">"tourguide"</span><span class="o">);</span>
     <span class="n">conn</span><span class="o">.</span><span class="na">tableOperations</span><span class="o">().</span><span class="na">create</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">);</span>
 
     <span class="c1">// Create a Mutation object to hold all changes to a row in a table.  Each row has a unique row ID.</span>
-    <span class="n">Mutation</span> <span class="n">mutation</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Mutation</span><span class="o">(</span><span class="s">"id0001"</span><span class="o">);</span>
+    <span class="nc">Mutation</span> <span class="n">mutation</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Mutation</span><span class="o">(</span><span class="s">"id0001"</span><span class="o">);</span>
 
     <span class="c1">// Create key/value pairs for Batman.  Put them in the "hero" family.</span>
     <span class="n">mutation</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"hero"</span><span class="o">,</span><span class="s">"alias"</span><span class="o">,</span> <span class="s">"Batman"</span><span class="o">);</span>
@@ -164,16 +164,16 @@ write and read from a table.</p>
     <span class="n">mutation</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"hero"</span><span class="o">,</span><span class="s">"wearsCape?"</span><span class="o">,</span> <span class="s">"true"</span><span class="o">);</span>
 
     <span class="c1">// Create a BatchWriter to the GothamPD table and add your mutation to it. Try w/ resources will close for us.</span>
-    <span class="k">try</span> <span class="o">(</span><span class="n">BatchWriter</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="k">new</span> <span class="n">BatchWriterConfig</span><span class="o">()))</span> <span class="o">{</span>
+    <span class="k">try</span> <span class="o">(</span><span class="nc">BatchWriter</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="k">new</span> <span class="nc">BatchWriterConfig</span><span class="o">()))</span> <span class="o">{</span>
         <span class="n">writer</span><span class="o">.</span><span class="na">addMutation</span><span class="o">(</span><span class="n">mutation</span><span class="o">);</span>
     <span class="o">}</span>
 
     <span class="c1">// Read and print all rows of the "GothamPD" table. Try w/ resources will close for us.</span>
-    <span class="k">try</span> <span class="o">(</span><span class="n">Scanner</span> <span class="n">scan</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="n">Authorizations</span><span class="o">.</span><span class="na">EMPTY</span><span class="o">))</span> <span class="o">{</span>
-        <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"Gotham Police Department Persons of Interest:"</span><span class="o">);</span>
+    <span class="k">try</span> <span class="o">(</span><span class="nc">Scanner</span> <span class="n">scan</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="nc">Authorizations</span><span class="o">.</span><span class="na">EMPTY</span><span class="o">))</span> <span class="o">{</span>
+        <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"Gotham Police Department Persons of Interest:"</span><span class="o">);</span>
         <span class="c1">// A Scanner is an extension of java.lang.Iterable so behaves just like one.</span>
-        <span class="k">for</span> <span class="o">(</span><span class="n">Map</span><span class="o">.</span><span class="na">Entry</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span> <span class="n">Value</span><span class="o">&gt;</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">scan</span><span class="o">)</span> <span class="o">{</span>
-            <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">printf</span><span class="o">(</span><span class="s">"Key : %-50s  Value : %s\n"</span><span class="o">,</span> <span class="n">entry</span><span class="o">.</span><span class="na">getKey</span><span class="o">(),</span> <span class="n">entry</span><span class="o">.</span><span class="na">getValue</span><span class="o">());</span>
+        <span class="k">for</span> <span class="o">(</span><span class="nc">Map</span><span class="o">.</span><span class="na">Entry</span><span class="o">&lt;</span><span class="nc">Key</span><span class="o">,</span> <span class="nc">Value</span><span class="o">&gt;</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">scan</span><span class="o">)</span> <span class="o">{</span>
+            <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">printf</span><span class="o">(</span><span class="s">"Key : %-50s  Value : %s\n"</span><span class="o">,</span> <span class="n">entry</span><span class="o">.</span><span class="na">getKey</span><span class="o">(),</span> <span class="n">entry</span><span class="o">.</span><span class="na">getValue</span><span class="o">());</span>
         <span class="o">}</span>
     <span class="o">}</span>
 <span class="o">}</span>
diff --git a/tour/batch-scanner-code/index.html b/tour/batch-scanner-code/index.html
index c79aae2..75720d4 100644
--- a/tour/batch-scanner-code/index.html
+++ b/tour/batch-scanner-code/index.html
@@ -148,41 +148,41 @@
 <div id="tour-content">
   <p>Below is a solution to the exercise.</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">static</span> <span class="kt">void</span> <span class="nf">exercise</span><span class="o">(</span><span class="n">MiniAccumuloCluster</span> <span class="n">mac</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">static</span> <span class="kt">void</span> <span class="nf">exercise</span><span class="o">(</span><span class="nc">MiniAccumuloCluster</span> <span class="n">mac</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
     <span class="c1">// Connect to Mini Accumulo as the root user and create a table called "GothamPD".</span>
-    <span class="n">Connector</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">mac</span><span class="o">.</span><span class="na">getConnector</span><span class="o">(</span><span class="s">"root"</span><span class="o">,</span> <span class="s">"tourguide"</span><span class="o">);</span>
+    <span class="nc">Connector</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">mac</span><span class="o">.</span><span class="na">getConnector</span><span class="o">(</span><span class="s">"root"</span><span class="o">,</span> <span class="s">"tourguide"</span><span class="o">);</span>
     <span class="n">conn</span><span class="o">.</span><span class="na">tableOperations</span><span class="o">().</span><span class="na">create</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">);</span>
 
     <span class="c1">// Generate 10,000 rows of henchman data</span>
-    <span class="k">try</span><span class="o">(</span><span class="n">BatchWriter</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="k">new</span> <span class="n">BatchWriterConfig</span><span class="o">()))</span> <span class="o">{</span>
+    <span class="k">try</span><span class="o">(</span><span class="nc">BatchWriter</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="k">new</span> <span class="nc">BatchWriterConfig</span><span class="o">()))</span> <span class="o">{</span>
         <span class="k">for</span><span class="o">(</span><span class="kt">int</span> <span class="n">i</span> <span class="o">=</span> <span class="mi">0</span><span class="o">;</span> <span class="n">i</span> <span class="o">&lt;</span> <span class="mi">10_000</span><span class="o">;</span> <span class="n">i</span><span class="o">++)</span> <span class="o">{</span>
-            <span class="n">Mutation</span> <span class="n">m</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Mutation</span><span class="o">(</span><span class="n">String</span><span class="o">.</span><span class="na">format</span><span class="o">(</span><span class="s">"id%04d"</span><span class="o">,</span> <span class="n">i</span><span class="o">));</span>
+            <span class="nc">Mutation</span> <span class="n">m</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Mutation</span><span class="o">(</span><span class="nc">String</span><span class="o">.</span><span class="na">format</span><span class="o">(</span><span class="s">"id%04d"</span><span class="o">,</span> <span class="n">i</span><span class="o">));</span>
             <span class="n">m</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"villain"</span><span class="o">,</span> <span class="s">"alias"</span><span class="o">,</span> <span class="s">"henchman"</span> <span class="o">+</span> <span class="n">i</span><span class="o">);</span>
-            <span class="n">m</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"villain"</span><span class="o">,</span> <span class="s">"yearsOfService"</span><span class="o">,</span> <span class="s">""</span> <span class="o">+</span> <span class="o">(</span><span class="k">new</span> <span class="n">Random</span><span class="o">().</span><span class="na">nextInt</span><span class="o">(</span><span class="mi">50</span><span class="o">)));</span>
+            <span class="n">m</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"villain"</span><span class="o">,</span> <span class="s">"yearsOfService"</span><span class="o">,</span> <span class="s">""</span> <span class="o">+</span> <span class="o">(</span><span class="k">new</span> <span class="nc">Random</span><span class="o">().</span><span class="na">nextInt</span><span class="o">(</span><span class="mi">50</span><span class="o">)));</span>
             <span class="n">m</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"villain"</span><span class="o">,</span> <span class="s">"wearsCape?"</span><span class="o">,</span> <span class="s">"false"</span><span class="o">);</span>
             <span class="n">writer</span><span class="o">.</span><span class="na">addMutation</span><span class="o">(</span><span class="n">m</span><span class="o">);</span>
         <span class="o">}</span>
     <span class="o">}</span>
 
     <span class="c1">// 1. Create a BatchScanner with 5 query threads</span>
-    <span class="k">try</span><span class="o">(</span><span class="n">BatchScanner</span> <span class="n">batchScanner</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createBatchScanner</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="n">Authorizations</span><span class="o">.</span><span class="na">EMPTY</span><span class="o">,</span> <span class="mi">5</span><span class="o">))</span>  [...]
+    <span class="k">try</span><span class="o">(</span><span class="nc">BatchScanner</span> <span class="n">batchScanner</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createBatchScanner</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="nc">Authorizations</span><span class="o">.</span><span class="na">EMPTY</span><span class="o">,</span> <span class="mi">5</span><span class="o">))</span [...]
         <span class="c1">// 2. Create a collection of 2 sample ranges and set it to the batchScanner</span>
-        <span class="n">List</span> <span class="n">ranges</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ArrayList</span><span class="o">&lt;</span><span class="n">Range</span><span class="o">&gt;();</span>
-        <span class="n">ranges</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="n">Range</span><span class="o">(</span><span class="s">"id1000"</span><span class="o">,</span> <span class="s">"id1999"</span><span class="o">));</span>
-        <span class="n">ranges</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="n">Range</span><span class="o">(</span><span class="s">"id9000"</span><span class="o">,</span> <span class="s">"id9999"</span><span class="o">));</span>
+        <span class="nc">List</span> <span class="n">ranges</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">ArrayList</span><span class="o">&lt;</span><span class="nc">Range</span><span class="o">&gt;();</span>
+        <span class="n">ranges</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="nc">Range</span><span class="o">(</span><span class="s">"id1000"</span><span class="o">,</span> <span class="s">"id1999"</span><span class="o">));</span>
+        <span class="n">ranges</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="nc">Range</span><span class="o">(</span><span class="s">"id9000"</span><span class="o">,</span> <span class="s">"id9999"</span><span class="o">));</span>
         <span class="n">batchScanner</span><span class="o">.</span><span class="na">setRanges</span><span class="o">(</span><span class="n">ranges</span><span class="o">);</span>
 
         <span class="c1">// 3. Fetch just the columns we want</span>
-        <span class="n">batchScanner</span><span class="o">.</span><span class="na">fetchColumn</span><span class="o">(</span><span class="k">new</span> <span class="n">Text</span><span class="o">(</span><span class="s">"villain"</span><span class="o">),</span> <span class="k">new</span> <span class="n">Text</span><span class="o">(</span><span class="s">"yearsOfService"</span><span class="o">));</span>
+        <span class="n">batchScanner</span><span class="o">.</span><span class="na">fetchColumn</span><span class="o">(</span><span class="k">new</span> <span class="nc">Text</span><span class="o">(</span><span class="s">"villain"</span><span class="o">),</span> <span class="k">new</span> <span class="nc">Text</span><span class="o">(</span><span class="s">"yearsOfService"</span><span class="o">));</span>
 
         <span class="c1">// 4. Calculate average years of service</span>
-        <span class="n">Long</span> <span class="n">totalYears</span> <span class="o">=</span> <span class="mi">0L</span><span class="o">;</span>
-        <span class="n">Long</span> <span class="n">entriesRead</span> <span class="o">=</span> <span class="mi">0L</span><span class="o">;</span>
-        <span class="k">for</span> <span class="o">(</span><span class="n">Map</span><span class="o">.</span><span class="na">Entry</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span> <span class="n">Value</span><span class="o">&gt;</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">batchScanner</span><span class="o">)</span> <span class="o">{</span>
-            <span class="n">totalYears</span> <span class="o">+=</span> <span class="n">Long</span><span class="o">.</span><span class="na">valueOf</span><span class="o">(</span><span class="n">entry</span><span class="o">.</span><span class="na">getValue</span><span class="o">().</span><span class="na">toString</span><span class="o">());</span>
+        <span class="nc">Long</span> <span class="n">totalYears</span> <span class="o">=</span> <span class="mi">0L</span><span class="o">;</span>
+        <span class="nc">Long</span> <span class="n">entriesRead</span> <span class="o">=</span> <span class="mi">0L</span><span class="o">;</span>
+        <span class="k">for</span> <span class="o">(</span><span class="nc">Map</span><span class="o">.</span><span class="na">Entry</span><span class="o">&lt;</span><span class="nc">Key</span><span class="o">,</span> <span class="nc">Value</span><span class="o">&gt;</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">batchScanner</span><span class="o">)</span> <span class="o">{</span>
+            <span class="n">totalYears</span> <span class="o">+=</span> <span class="nc">Long</span><span class="o">.</span><span class="na">valueOf</span><span class="o">(</span><span class="n">entry</span><span class="o">.</span><span class="na">getValue</span><span class="o">().</span><span class="na">toString</span><span class="o">());</span>
             <span class="n">entriesRead</span><span class="o">++;</span>
         <span class="o">}</span>
-        <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"The average years of service of "</span> <span class="o">+</span> <span class="n">entriesRead</span> <span class="o">+</span> <span class="s">" villians is "</span> <span class="o">+</span> <span class="n">totalYears</span> <span class="o">/</span> <span class="n">entriesRead</span><span class="o">);</span>
+        <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"The average years of service of "</span> <span class="o">+</span> <span class="n">entriesRead</span> <span class="o">+</span> <span class="s">" villians is "</span> <span class="o">+</span> <span class="n">totalYears</span> <span class="o">/</span> <span class="n">entriesRead</span><span class="o">);</span>
     <span class="o">}</span>
 <span class="o">}</span>
 </code></pre></div></div>
diff --git a/tour/batch-scanner/index.html b/tour/batch-scanner/index.html
index 73dbbf6..53f167a 100644
--- a/tour/batch-scanner/index.html
+++ b/tour/batch-scanner/index.html
@@ -150,17 +150,17 @@
 will retrieve multiple Ranges of data using multiple threads.  A BatchScanner can be more efficient but does not guarantee Keys will be returned in sorted order.</p>
 
 <p>For this exercise, we need to generate a bunch of data to test BatchScanner.  Copy the code below into your <code class="highlighter-rouge">exercise</code> method.</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">static</span> <span class="kt">void</span> <span class="nf">exercise</span><span class="o">(</span><span class="n">MiniAccumuloCluster</span> <span class="n">mac</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">static</span> <span class="kt">void</span> <span class="nf">exercise</span><span class="o">(</span><span class="nc">MiniAccumuloCluster</span> <span class="n">mac</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
     <span class="c1">// Connect to Mini Accumulo as the root user and create a table called "GothamPD".</span>
-    <span class="n">Connector</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">mac</span><span class="o">.</span><span class="na">getConnector</span><span class="o">(</span><span class="s">"root"</span><span class="o">,</span> <span class="s">"tourguide"</span><span class="o">);</span>
+    <span class="nc">Connector</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">mac</span><span class="o">.</span><span class="na">getConnector</span><span class="o">(</span><span class="s">"root"</span><span class="o">,</span> <span class="s">"tourguide"</span><span class="o">);</span>
     <span class="n">conn</span><span class="o">.</span><span class="na">tableOperations</span><span class="o">().</span><span class="na">create</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">);</span>
 
     <span class="c1">// Generate 10,000 rows of henchman data, each with a different number yearsOfService</span>
-    <span class="k">try</span> <span class="o">(</span><span class="n">BatchWriter</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="k">new</span> <span class="n">BatchWriterConfig</span><span class="o">()))</span> <span class="o">{</span>
+    <span class="k">try</span> <span class="o">(</span><span class="nc">BatchWriter</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="k">new</span> <span class="nc">BatchWriterConfig</span><span class="o">()))</span> <span class="o">{</span>
         <span class="k">for</span> <span class="o">(</span><span class="kt">int</span> <span class="n">i</span> <span class="o">=</span> <span class="mi">0</span><span class="o">;</span> <span class="n">i</span> <span class="o">&lt;</span> <span class="mi">10_000</span><span class="o">;</span> <span class="n">i</span><span class="o">++)</span> <span class="o">{</span>
-            <span class="n">Mutation</span> <span class="n">m</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Mutation</span><span class="o">(</span><span class="n">String</span><span class="o">.</span><span class="na">format</span><span class="o">(</span><span class="s">"id%04d"</span><span class="o">,</span> <span class="n">i</span><span class="o">));</span>
+            <span class="nc">Mutation</span> <span class="n">m</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Mutation</span><span class="o">(</span><span class="nc">String</span><span class="o">.</span><span class="na">format</span><span class="o">(</span><span class="s">"id%04d"</span><span class="o">,</span> <span class="n">i</span><span class="o">));</span>
             <span class="n">m</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"villain"</span><span class="o">,</span> <span class="s">"alias"</span><span class="o">,</span> <span class="s">"henchman"</span> <span class="o">+</span> <span class="n">i</span><span class="o">);</span>
-            <span class="n">m</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"villain"</span><span class="o">,</span> <span class="s">"yearsOfService"</span><span class="o">,</span> <span class="s">""</span> <span class="o">+</span> <span class="o">(</span><span class="k">new</span> <span class="n">Random</span><span class="o">().</span><span class="na">nextInt</span><span class="o">(</span><span class="mi">50</span><span class="o">)));</span>
+            <span class="n">m</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"villain"</span><span class="o">,</span> <span class="s">"yearsOfService"</span><span class="o">,</span> <span class="s">""</span> <span class="o">+</span> <span class="o">(</span><span class="k">new</span> <span class="nc">Random</span><span class="o">().</span><span class="na">nextInt</span><span class="o">(</span><span class="mi">50</span><span class="o">)));</span>
             <span class="n">m</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"villain"</span><span class="o">,</span> <span class="s">"wearsCape?"</span><span class="o">,</span> <span class="s">"false"</span><span class="o">);</span>
             <span class="n">writer</span><span class="o">.</span><span class="na">addMutation</span><span class="o">(</span><span class="n">m</span><span class="o">);</span>
         <span class="o">}</span>
diff --git a/tour/conditional-writer-code/index.html b/tour/conditional-writer-code/index.html
index 9782f75..6974178 100644
--- a/tour/conditional-writer-code/index.html
+++ b/tour/conditional-writer-code/index.html
@@ -148,16 +148,16 @@
 <div id="tour-content">
   <p>Below is a solution to the exercise.</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code>  <span class="kd">static</span> <span class="kt">boolean</span> <span class="nf">setAddress</span><span class="o">(</span><span class="n">Connector</span> <span class="n">conn</span><span class="o">,</span> <span class="n">String</span> <span class="n">id</span><span class="o">,</span> <span class="n">String</span> <span class="n">expectedAddr</span><span class="o">,</span> <span class="n">S [...]
-    <span class="k">try</span> <span class="o">(</span><span class="n">ConditionalWriter</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createConditionalWriter</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="k">new</span> <span class="n">ConditionalWriterConfig</span><span class="o">()))</span> <span class="o">{</span>
-      <span class="n">Condition</span> <span class="n">condition</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Condition</span><span class="o">(</span><span class="s">"location"</span><span class="o">,</span> <span class="s">"home"</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code>  <span class="kd">static</span> <span class="kt">boolean</span> <span class="nf">setAddress</span><span class="o">(</span><span class="nc">Connector</span> <span class="n">conn</span><span class="o">,</span> <span class="nc">String</span> <span class="n">id</span><span class="o">,</span> <span class="nc">String</span> <span class="n">expectedAddr</span><span class="o">,</span> <span class="n [...]
+    <span class="k">try</span> <span class="o">(</span><span class="nc">ConditionalWriter</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createConditionalWriter</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="k">new</span> <span class="nc">ConditionalWriterConfig</span><span class="o">()))</span> <span class="o">{</span>
+      <span class="nc">Condition</span> <span class="n">condition</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Condition</span><span class="o">(</span><span class="s">"location"</span><span class="o">,</span> <span class="s">"home"</span><span class="o">);</span>
       <span class="k">if</span><span class="o">(</span><span class="n">expectedAddr</span> <span class="o">!=</span> <span class="kc">null</span><span class="o">)</span> <span class="o">{</span>
         <span class="n">condition</span><span class="o">.</span><span class="na">setValue</span><span class="o">(</span><span class="n">expectedAddr</span><span class="o">);</span>
       <span class="o">}</span>
-      <span class="n">ConditionalMutation</span> <span class="n">mutation</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ConditionalMutation</span><span class="o">(</span><span class="n">id</span><span class="o">,</span> <span class="n">condition</span><span class="o">);</span>
+      <span class="nc">ConditionalMutation</span> <span class="n">mutation</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">ConditionalMutation</span><span class="o">(</span><span class="n">id</span><span class="o">,</span> <span class="n">condition</span><span class="o">);</span>
       <span class="n">mutation</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"location"</span><span class="o">,</span> <span class="s">"home"</span><span class="o">,</span> <span class="n">newAddr</span><span class="o">);</span>
-      <span class="k">return</span> <span class="n">writer</span><span class="o">.</span><span class="na">write</span><span class="o">(</span><span class="n">mutation</span><span class="o">).</span><span class="na">getStatus</span><span class="o">()</span> <span class="o">==</span> <span class="n">Status</span><span class="o">.</span><span class="na">ACCEPTED</span><span class="o">;</span>
-    <span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="n">Exception</span> <span class="n">e</span><span class="o">)</span> <span class="o">{</span>
+      <span class="k">return</span> <span class="n">writer</span><span class="o">.</span><span class="na">write</span><span class="o">(</span><span class="n">mutation</span><span class="o">).</span><span class="na">getStatus</span><span class="o">()</span> <span class="o">==</span> <span class="nc">Status</span><span class="o">.</span><span class="na">ACCEPTED</span><span class="o">;</span>
+    <span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="nc">Exception</span> <span class="n">e</span><span class="o">)</span> <span class="o">{</span>
       <span class="k">throw</span> <span class="k">new</span> <span class="nf">RuntimeException</span><span class="o">(</span><span class="n">e</span><span class="o">);</span>
     <span class="o">}</span>
   <span class="o">}</span>
diff --git a/tour/conditional-writer/index.html b/tour/conditional-writer/index.html
index 2f728a4..978477c 100644
--- a/tour/conditional-writer/index.html
+++ b/tour/conditional-writer/index.html
@@ -183,58 +183,58 @@ starts multiple threads, with each thread doing the following.</p>
 is the batch writer always makes the update, even when the value has
 changed since it was read.</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code>  <span class="kd">static</span> <span class="n">String</span> <span class="nf">getAddress</span><span class="o">(</span><span class="n">Connector</span> <span class="n">conn</span><span class="o">,</span> <span class="n">String</span> <span class="n">id</span><span class="o">)</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code>  <span class="kd">static</span> <span class="nc">String</span> <span class="nf">getAddress</span><span class="o">(</span><span class="nc">Connector</span> <span class="n">conn</span><span class="o">,</span> <span class="nc">String</span> <span class="n">id</span><span class="o">)</span> <span class="o">{</span>
     <span class="c1">// The IsolatedScanner ensures partial changes to a row are not seen</span>
-    <span class="k">try</span> <span class="o">(</span><span class="n">Scanner</span> <span class="n">scanner</span> <span class="o">=</span> <span class="k">new</span> <span class="n">IsolatedScanner</span><span class="o">(</span><span class="n">conn</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="n">Authorizations</span><span class="o">.</span><span class="na">EMPTY</span>< [...]
-      <span class="n">scanner</span><span class="o">.</span><span class="na">setRange</span><span class="o">(</span><span class="n">Range</span><span class="o">.</span><span class="na">exact</span><span class="o">(</span><span class="n">id</span><span class="o">,</span> <span class="s">"location"</span><span class="o">,</span> <span class="s">"home"</span><span class="o">));</span>
-      <span class="k">for</span> <span class="o">(</span><span class="n">Entry</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span><span class="n">Value</span><span class="o">&gt;</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">scanner</span><span class="o">)</span> <span class="o">{</span>
+    <span class="k">try</span> <span class="o">(</span><span class="nc">Scanner</span> <span class="n">scanner</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">IsolatedScanner</span><span class="o">(</span><span class="n">conn</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="nc">Authorizations</span><span class="o">.</span><span class="na">EMPTY</spa [...]
+      <span class="n">scanner</span><span class="o">.</span><span class="na">setRange</span><span class="o">(</span><span class="nc">Range</span><span class="o">.</span><span class="na">exact</span><span class="o">(</span><span class="n">id</span><span class="o">,</span> <span class="s">"location"</span><span class="o">,</span> <span class="s">"home"</span><span class="o">));</span>
+      <span class="k">for</span> <span class="o">(</span><span class="nc">Entry</span><span class="o">&lt;</span><span class="nc">Key</span><span class="o">,</span><span class="nc">Value</span><span class="o">&gt;</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">scanner</span><span class="o">)</span> <span class="o">{</span>
         <span class="k">return</span> <span class="n">entry</span><span class="o">.</span><span class="na">getValue</span><span class="o">().</span><span class="na">toString</span><span class="o">();</span>
       <span class="o">}</span>
       <span class="k">return</span> <span class="kc">null</span><span class="o">;</span>
-    <span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="n">TableNotFoundException</span> <span class="n">e</span><span class="o">)</span> <span class="o">{</span>
+    <span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="nc">TableNotFoundException</span> <span class="n">e</span><span class="o">)</span> <span class="o">{</span>
       <span class="k">throw</span> <span class="k">new</span> <span class="nf">RuntimeException</span><span class="o">(</span><span class="n">e</span><span class="o">);</span>
     <span class="o">}</span>
   <span class="o">}</span>
 
-  <span class="kd">static</span> <span class="kt">boolean</span> <span class="nf">setAddress</span><span class="o">(</span><span class="n">Connector</span> <span class="n">conn</span><span class="o">,</span> <span class="n">String</span> <span class="n">id</span><span class="o">,</span> <span class="n">String</span> <span class="n">expectedAddr</span><span class="o">,</span> <span class="n">String</span> <span class="n">newAddr</span><span class="o">)</span> <span class="o">{</span>
-    <span class="k">try</span> <span class="o">(</span><span class="n">BatchWriter</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="k">new</span> <span class="n">BatchWriterConfig</span><span class="o">()))</span> <span class="o">{</span>
-      <span class="n">Mutation</span> <span class="n">mutation</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Mutation</span><span class="o">(</span><span class="n">id</span><span class="o">);</span>
+  <span class="kd">static</span> <span class="kt">boolean</span> <span class="nf">setAddress</span><span class="o">(</span><span class="nc">Connector</span> <span class="n">conn</span><span class="o">,</span> <span class="nc">String</span> <span class="n">id</span><span class="o">,</span> <span class="nc">String</span> <span class="n">expectedAddr</span><span class="o">,</span> <span class="nc">String</span> <span class="n">newAddr</span><span class="o">)</span> <span class="o">{</span>
+    <span class="k">try</span> <span class="o">(</span><span class="nc">BatchWriter</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="k">new</span> <span class="nc">BatchWriterConfig</span><span class="o">()))</span> <span class="o">{</span>
+      <span class="nc">Mutation</span> <span class="n">mutation</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Mutation</span><span class="o">(</span><span class="n">id</span><span class="o">);</span>
       <span class="n">mutation</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"location"</span><span class="o">,</span> <span class="s">"home"</span><span class="o">,</span> <span class="n">newAddr</span><span class="o">);</span>
       <span class="n">writer</span><span class="o">.</span><span class="na">addMutation</span><span class="o">(</span><span class="n">mutation</span><span class="o">);</span>
       <span class="k">return</span> <span class="kc">true</span><span class="o">;</span>
-    <span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="n">Exception</span> <span class="n">e</span><span class="o">)</span> <span class="o">{</span>
+    <span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="nc">Exception</span> <span class="n">e</span><span class="o">)</span> <span class="o">{</span>
       <span class="k">throw</span> <span class="k">new</span> <span class="nf">RuntimeException</span><span class="o">(</span><span class="n">e</span><span class="o">);</span>
     <span class="o">}</span>
   <span class="o">}</span>
 
-  <span class="kd">public</span> <span class="kd">static</span> <span class="n">Future</span><span class="o">&lt;</span><span class="n">Void</span><span class="o">&gt;</span> <span class="nf">modifyAddress</span><span class="o">(</span><span class="n">Connector</span> <span class="n">conn</span><span class="o">,</span> <span class="n">String</span> <span class="n">id</span><span class="o">,</span> <span class="n">Function</span><span class="o">&lt;</span><span class="n">String</span><spa [...]
-    <span class="k">return</span> <span class="n">CompletableFuture</span><span class="o">.</span><span class="na">runAsync</span><span class="o">(()</span> <span class="o">-&gt;</span> <span class="o">{</span>
-      <span class="n">String</span> <span class="n">currAddr</span><span class="o">,</span> <span class="n">newAddr</span><span class="o">;</span>
+  <span class="kd">public</span> <span class="kd">static</span> <span class="nc">Future</span><span class="o">&lt;</span><span class="nc">Void</span><span class="o">&gt;</span> <span class="nf">modifyAddress</span><span class="o">(</span><span class="nc">Connector</span> <span class="n">conn</span><span class="o">,</span> <span class="nc">String</span> <span class="n">id</span><span class="o">,</span> <span class="nc">Function</span><span class="o">&lt;</span><span class="nc">String</spa [...]
+    <span class="k">return</span> <span class="nc">CompletableFuture</span><span class="o">.</span><span class="na">runAsync</span><span class="o">(()</span> <span class="o">-&gt;</span> <span class="o">{</span>
+      <span class="nc">String</span> <span class="n">currAddr</span><span class="o">,</span> <span class="n">newAddr</span><span class="o">;</span>
       <span class="k">do</span> <span class="o">{</span>
         <span class="n">currAddr</span> <span class="o">=</span> <span class="n">getAddress</span><span class="o">(</span><span class="n">conn</span><span class="o">,</span> <span class="n">id</span><span class="o">);</span>
         <span class="n">newAddr</span> <span class="o">=</span> <span class="n">modifier</span><span class="o">.</span><span class="na">apply</span><span class="o">(</span><span class="n">currAddr</span><span class="o">);</span>
-        <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">printf</span><span class="o">(</span><span class="s">"Thread %3d attempting change %20s -&gt; %-20s\n"</span><span class="o">,</span>
-            <span class="n">Thread</span><span class="o">.</span><span class="na">currentThread</span><span class="o">().</span><span class="na">getId</span><span class="o">(),</span> <span class="s">"'"</span><span class="o">+</span><span class="n">currAddr</span><span class="o">+</span><span class="s">"'"</span><span class="o">,</span> <span class="s">"'"</span><span class="o">+</span><span class="n">newAddr</span><span class="o">+</span><span class="s">"'"</span><span class="o">);</span>
+        <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">printf</span><span class="o">(</span><span class="s">"Thread %3d attempting change %20s -&gt; %-20s\n"</span><span class="o">,</span>
+            <span class="nc">Thread</span><span class="o">.</span><span class="na">currentThread</span><span class="o">().</span><span class="na">getId</span><span class="o">(),</span> <span class="s">"'"</span><span class="o">+</span><span class="n">currAddr</span><span class="o">+</span><span class="s">"'"</span><span class="o">,</span> <span class="s">"'"</span><span class="o">+</span><span class="n">newAddr</span><span class="o">+</span><span class="s">"'"</span><span class="o">);</span>
       <span class="o">}</span> <span class="k">while</span> <span class="o">(!</span><span class="n">setAddress</span><span class="o">(</span><span class="n">conn</span><span class="o">,</span> <span class="n">id</span><span class="o">,</span> <span class="n">currAddr</span><span class="o">,</span> <span class="n">newAddr</span><span class="o">));</span>
     <span class="o">});</span>
   <span class="o">}</span>
 
-  <span class="kd">static</span> <span class="kt">void</span> <span class="nf">exercise</span><span class="o">(</span><span class="n">MiniAccumuloCluster</span> <span class="n">mac</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
-    <span class="n">Connector</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">mac</span><span class="o">.</span><span class="na">getConnector</span><span class="o">(</span><span class="s">"root"</span><span class="o">,</span> <span class="s">"tourguide"</span><span class="o">);</span>
+  <span class="kd">static</span> <span class="kt">void</span> <span class="nf">exercise</span><span class="o">(</span><span class="nc">MiniAccumuloCluster</span> <span class="n">mac</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
+    <span class="nc">Connector</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">mac</span><span class="o">.</span><span class="na">getConnector</span><span class="o">(</span><span class="s">"root"</span><span class="o">,</span> <span class="s">"tourguide"</span><span class="o">);</span>
     <span class="n">conn</span><span class="o">.</span><span class="na">tableOperations</span><span class="o">().</span><span class="na">create</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">);</span>
 
-    <span class="n">String</span> <span class="n">id</span> <span class="o">=</span> <span class="s">"id0001"</span><span class="o">;</span>
+    <span class="nc">String</span> <span class="n">id</span> <span class="o">=</span> <span class="s">"id0001"</span><span class="o">;</span>
 
     <span class="n">setAddress</span><span class="o">(</span><span class="n">conn</span><span class="o">,</span> <span class="n">id</span><span class="o">,</span> <span class="kc">null</span><span class="o">,</span> <span class="s">"  1007 Mountain Drive, Gotham, New York  "</span><span class="o">);</span>
 
     <span class="c1">// create async operation to trim whitespace</span>
-    <span class="n">Future</span><span class="o">&lt;</span><span class="n">Void</span><span class="o">&gt;</span> <span class="n">future1</span> <span class="o">=</span> <span class="n">modifyAddress</span><span class="o">(</span><span class="n">conn</span><span class="o">,</span> <span class="n">id</span><span class="o">,</span> <span class="nl">String:</span><span class="o">:</span><span class="n">trim</span><span class="o">);</span>
+    <span class="nc">Future</span><span class="o">&lt;</span><span class="nc">Void</span><span class="o">&gt;</span> <span class="n">future1</span> <span class="o">=</span> <span class="n">modifyAddress</span><span class="o">(</span><span class="n">conn</span><span class="o">,</span> <span class="n">id</span><span class="o">,</span> <span class="nl">String:</span><span class="o">:</span><span class="n">trim</span><span class="o">);</span>
 
     <span class="c1">// create async operation to replace Dr with Drive</span>
-    <span class="n">Future</span><span class="o">&lt;</span><span class="n">Void</span><span class="o">&gt;</span> <span class="n">future2</span> <span class="o">=</span> <span class="n">modifyAddress</span><span class="o">(</span><span class="n">conn</span><span class="o">,</span> <span class="n">id</span><span class="o">,</span> <span class="n">addr</span> <span class="o">-&gt;</span> <span class="n">addr</span><span class="o">.</span><span class="na">replace</span><span class="o">(</s [...]
+    <span class="nc">Future</span><span class="o">&lt;</span><span class="nc">Void</span><span class="o">&gt;</span> <span class="n">future2</span> <span class="o">=</span> <span class="n">modifyAddress</span><span class="o">(</span><span class="n">conn</span><span class="o">,</span> <span class="n">id</span><span class="o">,</span> <span class="n">addr</span> <span class="o">-&gt;</span> <span class="n">addr</span><span class="o">.</span><span class="na">replace</span><span class="o">(< [...]
 
     <span class="c1">// create async operation to replace New York with NY</span>
-    <span class="n">Future</span><span class="o">&lt;</span><span class="n">Void</span><span class="o">&gt;</span> <span class="n">future3</span> <span class="o">=</span> <span class="n">modifyAddress</span><span class="o">(</span><span class="n">conn</span><span class="o">,</span> <span class="n">id</span><span class="o">,</span> <span class="n">addr</span> <span class="o">-&gt;</span> <span class="n">addr</span><span class="o">.</span><span class="na">replace</span><span class="o">(</s [...]
+    <span class="nc">Future</span><span class="o">&lt;</span><span class="nc">Void</span><span class="o">&gt;</span> <span class="n">future3</span> <span class="o">=</span> <span class="n">modifyAddress</span><span class="o">(</span><span class="n">conn</span><span class="o">,</span> <span class="n">id</span><span class="o">,</span> <span class="n">addr</span> <span class="o">-&gt;</span> <span class="n">addr</span><span class="o">.</span><span class="na">replace</span><span class="o">(< [...]
 
     <span class="c1">// wait for async operations to complete</span>
     <span class="n">future1</span><span class="o">.</span><span class="na">get</span><span class="o">();</span>
@@ -242,7 +242,7 @@ changed since it was read.</p>
     <span class="n">future3</span><span class="o">.</span><span class="na">get</span><span class="o">();</span>
 
     <span class="c1">// print the address stored in Accumulo</span>
-    <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"Final address : '"</span><span class="o">+</span><span class="n">getAddress</span><span class="o">(</span><span class="n">conn</span><span class="o">,</span> <span class="n">id</span><span class="o">)+</span><span class="s">"'"</span><span class="o">);</span>
+    <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"Final address : '"</span><span class="o">+</span><span class="n">getAddress</span><span class="o">(</span><span class="n">conn</span><span class="o">,</span> <span class="n">id</span><span class="o">)+</span><span class="s">"'"</span><span class="o">);</span>
   <span class="o">}</span>
 </code></pre></div></div>
 
diff --git a/tour/data-model-code/index.html b/tour/data-model-code/index.html
index 68382eb..5b6d3b6 100644
--- a/tour/data-model-code/index.html
+++ b/tour/data-model-code/index.html
@@ -148,43 +148,43 @@
 <div id="tour-content">
   <p>Below is the solution for the exercise.</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">static</span> <span class="kt">void</span> <span class="nf">exercise</span><span class="o">(</span><span class="n">MiniAccumuloCluster</span> <span class="n">mac</span><span class="o">)</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">static</span> <span class="kt">void</span> <span class="nf">exercise</span><span class="o">(</span><span class="nc">MiniAccumuloCluster</span> <span class="n">mac</span><span class="o">)</span> <span class="o">{</span>
     <span class="c1">// Connect to Mini Accumulo as the root user and create a table called "GothamPD".</span>
-    <span class="n">Connector</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">mac</span><span class="o">.</span><span class="na">getConnector</span><span class="o">(</span><span class="s">"root"</span><span class="o">,</span> <span class="s">"tourguide"</span><span class="o">);</span>
+    <span class="nc">Connector</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">mac</span><span class="o">.</span><span class="na">getConnector</span><span class="o">(</span><span class="s">"root"</span><span class="o">,</span> <span class="s">"tourguide"</span><span class="o">);</span>
     <span class="n">conn</span><span class="o">.</span><span class="na">tableOperations</span><span class="o">().</span><span class="na">create</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">);</span>
 
     <span class="c1">// Create a row for Batman</span>
-    <span class="n">Mutation</span> <span class="n">mutation1</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Mutation</span><span class="o">(</span><span class="s">"id0001"</span><span class="o">);</span>
+    <span class="nc">Mutation</span> <span class="n">mutation1</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Mutation</span><span class="o">(</span><span class="s">"id0001"</span><span class="o">);</span>
     <span class="n">mutation1</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"hero"</span><span class="o">,</span><span class="s">"alias"</span><span class="o">,</span> <span class="s">"Batman"</span><span class="o">);</span>
     <span class="n">mutation1</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"hero"</span><span class="o">,</span><span class="s">"name"</span><span class="o">,</span> <span class="s">"Bruce Wayne"</span><span class="o">);</span>
     <span class="n">mutation1</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"hero"</span><span class="o">,</span><span class="s">"wearsCape?"</span><span class="o">,</span> <span class="s">"true"</span><span class="o">);</span>
 
     <span class="c1">// Create a row for Robin</span>
-    <span class="n">Mutation</span> <span class="n">mutation2</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Mutation</span><span class="o">(</span><span class="s">"id0002"</span><span class="o">);</span>
+    <span class="nc">Mutation</span> <span class="n">mutation2</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Mutation</span><span class="o">(</span><span class="s">"id0002"</span><span class="o">);</span>
     <span class="n">mutation2</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"hero"</span><span class="o">,</span><span class="s">"alias"</span><span class="o">,</span> <span class="s">"Robin"</span><span class="o">);</span>
     <span class="n">mutation2</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"hero"</span><span class="o">,</span><span class="s">"name"</span><span class="o">,</span> <span class="s">"Dick Grayson"</span><span class="o">);</span>
     <span class="n">mutation2</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"hero"</span><span class="o">,</span><span class="s">"wearsCape?"</span><span class="o">,</span> <span class="s">"true"</span><span class="o">);</span>
 
     <span class="c1">// Create a row for Joker</span>
-    <span class="n">Mutation</span> <span class="n">mutation3</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Mutation</span><span class="o">(</span><span class="s">"id0003"</span><span class="o">);</span>
+    <span class="nc">Mutation</span> <span class="n">mutation3</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Mutation</span><span class="o">(</span><span class="s">"id0003"</span><span class="o">);</span>
     <span class="n">mutation3</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"villain"</span><span class="o">,</span><span class="s">"alias"</span><span class="o">,</span> <span class="s">"Joker"</span><span class="o">);</span>
     <span class="n">mutation3</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"villain"</span><span class="o">,</span><span class="s">"name"</span><span class="o">,</span> <span class="s">"Unknown"</span><span class="o">);</span>
     <span class="n">mutation3</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"villain"</span><span class="o">,</span><span class="s">"wearsCape?"</span><span class="o">,</span> <span class="s">"false"</span><span class="o">);</span>
 
     <span class="c1">// Create a BatchWriter to the GothamPD table and add your mutations to it.</span>
     <span class="c1">// Once the BatchWriter is closed by the try w/ resources, data will be available to scans.</span>
-    <span class="k">try</span> <span class="o">(</span><span class="n">BatchWriter</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="k">new</span> <span class="n">BatchWriterConfig</span><span class="o">()))</span> <span class="o">{</span>
+    <span class="k">try</span> <span class="o">(</span><span class="nc">BatchWriter</span> <span class="n">writer</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createBatchWriter</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="k">new</span> <span class="nc">BatchWriterConfig</span><span class="o">()))</span> <span class="o">{</span>
         <span class="n">writer</span><span class="o">.</span><span class="na">addMutation</span><span class="o">(</span><span class="n">mutation1</span><span class="o">);</span>
         <span class="n">writer</span><span class="o">.</span><span class="na">addMutation</span><span class="o">(</span><span class="n">mutation2</span><span class="o">);</span>
         <span class="n">writer</span><span class="o">.</span><span class="na">addMutation</span><span class="o">(</span><span class="n">mutation3</span><span class="o">);</span>
     <span class="o">}</span>
 
     <span class="c1">// Read and print all rows of the "GothamPD" table. Try w/ resources will close for us.</span>
-    <span class="k">try</span> <span class="o">(</span><span class="n">Scanner</span> <span class="n">scan</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="n">Authorizations</span><span class="o">.</span><span class="na">EMPTY</span><span class="o">))</span> <span class="o">{</span>
-        <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"Gotham Police Department Persons of Interest:"</span><span class="o">);</span>
+    <span class="k">try</span> <span class="o">(</span><span class="nc">Scanner</span> <span class="n">scan</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="na">createScanner</span><span class="o">(</span><span class="s">"GothamPD"</span><span class="o">,</span> <span class="nc">Authorizations</span><span class="o">.</span><span class="na">EMPTY</span><span class="o">))</span> <span class="o">{</span>
+        <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"Gotham Police Department Persons of Interest:"</span><span class="o">);</span>
         <span class="c1">// A Scanner is an extension of java.lang.Iterable so behaves just like one.</span>
-        <span class="k">for</span> <span class="o">(</span><span class="n">Map</span><span class="o">.</span><span class="na">Entry</span><span class="o">&lt;</span><span class="n">Key</span><span class="o">,</span> <span class="n">Value</span><span class="o">&gt;</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">scan</span><span class="o">)</span> <span class="o">{</span>
-            <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">printf</span><span class="o">(</span><span class="s">"Key : %-50s  Value : %s\n"</span><span class="o">,</span> <span class="n">entry</span><span class="o">.</span><span class="na">getKey</span><span class="o">(),</span> <span class="n">entry</span><span class="o">.</span><span class="na">getValue</span><span class="o">());</span>
+        <span class="k">for</span> <span class="o">(</span><span class="nc">Map</span><span class="o">.</span><span class="na">Entry</span><span class="o">&lt;</span><span class="nc">Key</span><span class="o">,</span> <span class="nc">Value</span><span class="o">&gt;</span> <span class="n">entry</span> <span class="o">:</span> <span class="n">scan</span><span class="o">)</span> <span class="o">{</span>
+            <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">printf</span><span class="o">(</span><span class="s">"Key : %-50s  Value : %s\n"</span><span class="o">,</span> <span class="n">entry</span><span class="o">.</span><span class="na">getKey</span><span class="o">(),</span> <span class="n">entry</span><span class="o">.</span><span class="na">getValue</span><span class="o">());</span>
         <span class="o">}</span>
     <span class="o">}</span>
 <span class="o">}</span>
diff --git a/tour/data-model/index.html b/tour/data-model/index.html
index 5498baf..841e619 100644
--- a/tour/data-model/index.html
+++ b/tour/data-model/index.html
@@ -160,7 +160,7 @@ as seen in the image below.</p>
 <p>The <strong>value</strong> is where the actual data is stored. For brevity, we often refer to the 3 parts of the column as the family, qualifier and visibility.</p>
 
 <p>Take a closer look at the Mutation object created in the first exercise:</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Mutation</span> <span class="n">mutation</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Mutation</span><span class="o">(</span><span class="s">"id0001"</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">Mutation</span> <span class="n">mutation</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Mutation</span><span class="o">(</span><span class="s">"id0001"</span><span class="o">);</span>
 <span class="n">mutation</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"hero"</span><span class="o">,</span><span class="s">"alias"</span><span class="o">,</span> <span class="s">"Batman"</span><span class="o">);</span>
 </code></pre></div></div>
 <p>It can be broken down as follows: <br />
diff --git a/tour/getting-started/index.html b/tour/getting-started/index.html
index 8d6faf1..d775a93 100644
--- a/tour/getting-started/index.html
+++ b/tour/getting-started/index.html
@@ -162,9 +162,9 @@ version of Accumulo that runs on your local filesystem.  It should only be used
 great here on the tour.  Files and logs used by MiniAccumuloCluster can be seen in the <code class="highlighter-rouge">target/mac######</code> directory.</p>
   </li>
   <li>Modify the <em>exercise</em> method to print a hello message. You will put your code in this method for each lesson.
-    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">exercise</span><span class="o">(</span><span class="n">MiniAccumuloCluster</span> <span class="n">mac</span><span class="o">)</span> <span class="o">{</span>
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">exercise</span><span class="o">(</span><span class="nc">MiniAccumuloCluster</span> <span class="n">mac</span><span class="o">)</span> <span class="o">{</span>
      <span class="c1">// start writing your code here</span>
-     <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"Hello world"</span><span class="o">);</span>
+     <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"Hello world"</span><span class="o">);</span>
  <span class="o">}</span>
 </code></pre></div>    </div>
   </li>
diff --git a/tour/ranges-splits/index.html b/tour/ranges-splits/index.html
index 336cb4e..54e4c5e 100644
--- a/tour/ranges-splits/index.html
+++ b/tour/ranges-splits/index.html
@@ -148,14 +148,14 @@
 <div id="tour-content">
   <p>A <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.9.3/org/apache/accumulo/core/data/Range.html">Range</a> is a specified group of Keys. There are many different ways to create a Range.  Here are a few examples:</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Range</span> <span class="n">r1</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Range</span><span class="o">(</span><span class="n">startKey</span><span class="o">,</span> <span class="n">endKey</span><span class="o">);</span>  <span class="c1">// Creates a range from startKey inclusive to endKey inclusive.</span>
-<span class="n">Range</span> <span class="n">r2</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Range</span><span class="o">(</span><span class="n">row</span><span class="o">);</span>               <span class="c1">// Creates a range that covers an entire row.</span>
-<span class="n">Range</span> <span class="n">r3</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Range</span><span class="o">(</span><span class="n">startRow</span><span class="o">,</span> <span class="n">endRow</span><span class="o">);</span>  <span class="c1">// Creates a range from startRow inclusive to endRow inclusive.</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">Range</span> <span class="n">r1</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Range</span><span class="o">(</span><span class="n">startKey</span><span class="o">,</span> <span class="n">endKey</span><span class="o">);</span>  <span class="c1">// Creates a range from startKey inclusive to endKey inclusive.</span>
+<span class="nc">Range</span> <span class="n">r2</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Range</span><span class="o">(</span><span class="n">row</span><span class="o">);</span>               <span class="c1">// Creates a range that covers an entire row.</span>
+<span class="nc">Range</span> <span class="n">r3</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Range</span><span class="o">(</span><span class="n">startRow</span><span class="o">,</span> <span class="n">endRow</span><span class="o">);</span>  <span class="c1">// Creates a range from startRow inclusive to endRow inclusive.</span>
 </code></pre></div></div>
 
 <p>A Scanner by default will scan all Keys in a table but this can be inefficient. It is a good practice to set a range on a Scanner.</p>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">scanner</span><span class="o">.</span><span class="na">setRange</span><span class="o">(</span><span class="k">new</span> <span class="n">Range</span><span class="o">(</span><span class="s">"id0000"</span><span class="o">,</span> <span class="s">"id0010"</span><span class="o">));</span>  <span class="c1">// returns rows from id0000 to id0010</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">scanner</span><span class="o">.</span><span class="na">setRange</span><span class="o">(</span><span class="k">new</span> <span class="nc">Range</span><span class="o">(</span><span class="s">"id0000"</span><span class="o">,</span> <span class="s">"id0010"</span><span class="o">));</span>  <span class="c1">// returns rows from id0000 to id0010</span>
 </code></pre></div></div>
 
 <p>As your data grows larger, Accumulo will split tables into smaller pieces called Tablets.  Tablets can then be distributed across multiple Tablet Servers.<br />


Mime
View raw message