You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2016/04/25 17:46:36 UTC
[4/4] accumulo git commit: Jekyll build from gh-pages:2918196
Jekyll build from gh-pages:2918196
Ensure "Apache <Foo>" is explicit on the website
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7a477677
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7a477677
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7a477677
Branch: refs/heads/asf-site
Commit: 7a477677b38996fe7e148a00345791a1cf1506ad
Parents: 906f782
Author: Josh Elser <el...@apache.org>
Authored: Mon Apr 25 11:45:47 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Apr 25 11:45:47 2016 -0400
----------------------------------------------------------------------
1.4/examples/batch.html | 5 +++--
1.4/examples/bloom.html | 5 +++--
1.4/examples/bulkIngest.html | 5 +++--
1.4/examples/combiner.html | 5 +++--
1.4/examples/constraints.html | 5 +++--
1.4/examples/dirlist.html | 5 +++--
1.4/examples/filedata.html | 5 +++--
1.4/examples/filter.html | 5 +++--
1.4/examples/helloworld.html | 5 +++--
1.4/examples/index.html | 5 +++--
1.4/examples/isolation.html | 5 +++--
1.4/examples/mapred.html | 5 +++--
1.4/examples/shard.html | 5 +++--
1.4/examples/visibility.html | 5 +++--
1.4/user_manual/Accumulo_Design.html | 5 +++--
1.4/user_manual/Accumulo_Shell.html | 5 +++--
1.4/user_manual/Administration.html | 5 +++--
1.4/user_manual/Analytics.html | 5 +++--
1.4/user_manual/Contents.html | 5 +++--
1.4/user_manual/Development_Clients.html | 5 +++--
1.4/user_manual/High_Speed_Ingest.html | 5 +++--
1.4/user_manual/Introduction.html | 5 +++--
1.4/user_manual/Security.html | 5 +++--
1.4/user_manual/Shell_Commands.html | 5 +++--
1.4/user_manual/Table_Configuration.html | 5 +++--
1.4/user_manual/Table_Design.html | 5 +++--
1.4/user_manual/Writing_Accumulo_Clients.html | 5 +++--
1.4/user_manual/accumulo_user_manual.html | 5 +++--
1.4/user_manual/index.html | 5 +++--
1.5/examples/batch.html | 5 +++--
1.5/examples/bloom.html | 5 +++--
1.5/examples/bulkIngest.html | 5 +++--
1.5/examples/classpath.html | 5 +++--
1.5/examples/client.html | 5 +++--
1.5/examples/combiner.html | 5 +++--
1.5/examples/constraints.html | 5 +++--
1.5/examples/dirlist.html | 5 +++--
1.5/examples/export.html | 5 +++--
1.5/examples/filedata.html | 5 +++--
1.5/examples/filter.html | 5 +++--
1.5/examples/helloworld.html | 5 +++--
1.5/examples/index.html | 5 +++--
1.5/examples/isolation.html | 5 +++--
1.5/examples/mapred.html | 5 +++--
1.5/examples/maxmutation.html | 5 +++--
1.5/examples/regex.html | 5 +++--
1.5/examples/rowhash.html | 5 +++--
1.5/examples/shard.html | 5 +++--
1.5/examples/tabletofile.html | 5 +++--
1.5/examples/terasort.html | 5 +++--
1.5/examples/visibility.html | 5 +++--
1.6/examples/batch.html | 5 +++--
1.6/examples/bloom.html | 5 +++--
1.6/examples/bulkIngest.html | 5 +++--
1.6/examples/classpath.html | 5 +++--
1.6/examples/client.html | 5 +++--
1.6/examples/combiner.html | 5 +++--
1.6/examples/constraints.html | 5 +++--
1.6/examples/dirlist.html | 5 +++--
1.6/examples/export.html | 5 +++--
1.6/examples/filedata.html | 5 +++--
1.6/examples/filter.html | 5 +++--
1.6/examples/helloworld.html | 5 +++--
1.6/examples/index.html | 5 +++--
1.6/examples/isolation.html | 5 +++--
1.6/examples/mapred.html | 5 +++--
1.6/examples/maxmutation.html | 5 +++--
1.6/examples/regex.html | 5 +++--
1.6/examples/reservations.html | 5 +++--
1.6/examples/rowhash.html | 5 +++--
1.6/examples/shard.html | 5 +++--
1.6/examples/tabletofile.html | 5 +++--
1.6/examples/terasort.html | 5 +++--
1.6/examples/visibility.html | 5 +++--
1.7/examples/batch.html | 5 +++--
1.7/examples/bloom.html | 5 +++--
1.7/examples/bulkIngest.html | 5 +++--
1.7/examples/classpath.html | 5 +++--
1.7/examples/client.html | 5 +++--
1.7/examples/combiner.html | 5 +++--
1.7/examples/constraints.html | 5 +++--
1.7/examples/dirlist.html | 5 +++--
1.7/examples/export.html | 5 +++--
1.7/examples/filedata.html | 5 +++--
1.7/examples/filter.html | 5 +++--
1.7/examples/helloworld.html | 5 +++--
1.7/examples/index.html | 5 +++--
1.7/examples/isolation.html | 5 +++--
1.7/examples/mapred.html | 5 +++--
1.7/examples/maxmutation.html | 5 +++--
1.7/examples/regex.html | 5 +++--
1.7/examples/reservations.html | 5 +++--
1.7/examples/rowhash.html | 5 +++--
1.7/examples/shard.html | 5 +++--
1.7/examples/tabletofile.html | 5 +++--
1.7/examples/terasort.html | 5 +++--
1.7/examples/visibility.html | 5 +++--
bylaws.html | 5 +++--
contrib.html | 5 +++--
downloads/index.html | 5 +++--
example/wikisearch.html | 5 +++--
examples/latest.html | 5 +++--
feed.xml | 4 ++--
get_involved.html | 5 +++--
git.html | 5 +++--
glossary.html | 5 +++--
governance/consensusBuilding.html | 5 +++--
governance/lazyConsensus.html | 5 +++--
governance/releasing.html | 5 +++--
governance/voting.html | 5 +++--
index.html | 11 ++++++-----
mailing_list.html | 5 +++--
notable_features.html | 5 +++--
old_documentation.html | 5 +++--
papers.html | 5 +++--
papers/index.html | 5 +++--
people.html | 5 +++--
projects.html | 5 +++--
rb.html | 5 +++--
release_notes/1.5.1.html | 5 +++--
release_notes/1.5.2.html | 5 +++--
release_notes/1.5.3.html | 5 +++--
release_notes/1.5.4.html | 5 +++--
release_notes/1.6.0.html | 5 +++--
release_notes/1.6.1.html | 5 +++--
release_notes/1.6.2.html | 5 +++--
release_notes/1.6.3.html | 5 +++--
release_notes/1.6.4.html | 5 +++--
release_notes/1.6.5.html | 5 +++--
release_notes/1.7.0.html | 5 +++--
release_notes/1.7.1.html | 5 +++--
release_notes/index.html | 5 +++--
releasing.html | 5 +++--
screenshots.html | 5 +++--
source.html | 5 +++--
user-manual/latest.html | 5 +++--
user_manual_1.3-incubating/Accumulo_Design.html | 5 +++--
user_manual_1.3-incubating/Accumulo_Shell.html | 5 +++--
user_manual_1.3-incubating/Administration.html | 5 +++--
user_manual_1.3-incubating/Analytics.html | 5 +++--
user_manual_1.3-incubating/Contents.html | 5 +++--
user_manual_1.3-incubating/High_Speed_Ingest.html | 5 +++--
user_manual_1.3-incubating/Introduction.html | 5 +++--
user_manual_1.3-incubating/Security.html | 5 +++--
user_manual_1.3-incubating/Shell_Commands.html | 5 +++--
user_manual_1.3-incubating/Table_Configuration.html | 5 +++--
user_manual_1.3-incubating/Table_Design.html | 5 +++--
user_manual_1.3-incubating/Writing_Accumulo_Clients.html | 5 +++--
user_manual_1.3-incubating/accumulo_user_manual.html | 5 +++--
user_manual_1.3-incubating/examples.html | 5 +++--
user_manual_1.3-incubating/examples/aggregation.html | 5 +++--
user_manual_1.3-incubating/examples/batch.html | 5 +++--
user_manual_1.3-incubating/examples/bloom.html | 5 +++--
user_manual_1.3-incubating/examples/bulkIngest.html | 5 +++--
user_manual_1.3-incubating/examples/constraints.html | 5 +++--
user_manual_1.3-incubating/examples/dirlist.html | 5 +++--
user_manual_1.3-incubating/examples/filter.html | 5 +++--
user_manual_1.3-incubating/examples/helloworld.html | 5 +++--
user_manual_1.3-incubating/examples/index.html | 5 +++--
user_manual_1.3-incubating/examples/mapred.html | 5 +++--
user_manual_1.3-incubating/examples/shard.html | 5 +++--
user_manual_1.3-incubating/index.html | 5 +++--
verifying_releases.html | 5 +++--
versioning.html | 5 +++--
164 files changed, 494 insertions(+), 331 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/examples/batch.html
----------------------------------------------------------------------
diff --git a/1.4/examples/batch.html b/1.4/examples/batch.html
index 30853d3..d83f2b6 100644
--- a/1.4/examples/batch.html
+++ b/1.4/examples/batch.html
@@ -286,8 +286,9 @@ $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchScanner i
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/examples/bloom.html
----------------------------------------------------------------------
diff --git a/1.4/examples/bloom.html b/1.4/examples/bloom.html
index 2e62b1e..3fa2476 100644
--- a/1.4/examples/bloom.html
+++ b/1.4/examples/bloom.html
@@ -467,8 +467,9 @@ Meta block : acu_bloom
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/examples/bulkIngest.html
----------------------------------------------------------------------
diff --git a/1.4/examples/bulkIngest.html b/1.4/examples/bulkIngest.html
index 2199ecb..e2cf91f 100644
--- a/1.4/examples/bulkIngest.html
+++ b/1.4/examples/bulkIngest.html
@@ -261,8 +261,9 @@ $ ./bin/accumulo org.apache.accumulo.examples.simple.mapreduce.bulk.VerifyIngest
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/examples/combiner.html
----------------------------------------------------------------------
diff --git a/1.4/examples/combiner.html b/1.4/examples/combiner.html
index e9ee4a5..3359991 100644
--- a/1.4/examples/combiner.html
+++ b/1.4/examples/combiner.html
@@ -299,8 +299,9 @@ hstat is configured for base 16.</p>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/examples/constraints.html
----------------------------------------------------------------------
diff --git a/1.4/examples/constraints.html b/1.4/examples/constraints.html
index 58db8e8..86da794 100644
--- a/1.4/examples/constraints.html
+++ b/1.4/examples/constraints.html
@@ -282,8 +282,9 @@ username@instance testConstraints>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/examples/dirlist.html
----------------------------------------------------------------------
diff --git a/1.4/examples/dirlist.html b/1.4/examples/dirlist.html
index 9149d91..95ec5e2 100644
--- a/1.4/examples/dirlist.html
+++ b/1.4/examples/dirlist.html
@@ -368,8 +368,9 @@ Other column family : column qualifier pairs are “~chunk” : chunk size in by
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/examples/filedata.html
----------------------------------------------------------------------
diff --git a/1.4/examples/filedata.html b/1.4/examples/filedata.html
index 1f12149..d5c4706 100644
--- a/1.4/examples/filedata.html
+++ b/1.4/examples/filedata.html
@@ -292,8 +292,9 @@ The example has the following classes:</p>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/examples/filter.html
----------------------------------------------------------------------
diff --git a/1.4/examples/filter.html b/1.4/examples/filter.html
index 0342341..fc0b658 100644
--- a/1.4/examples/filter.html
+++ b/1.4/examples/filter.html
@@ -343,8 +343,9 @@ Also, each iterator must have a unique name and priority within each scope.</p>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/examples/helloworld.html
----------------------------------------------------------------------
diff --git a/1.4/examples/helloworld.html b/1.4/examples/helloworld.html
index 5d69bdd..bb6be11 100644
--- a/1.4/examples/helloworld.html
+++ b/1.4/examples/helloworld.html
@@ -293,8 +293,9 @@ username@instance hellotable> scan
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/examples/index.html
----------------------------------------------------------------------
diff --git a/1.4/examples/index.html b/1.4/examples/index.html
index f79564e..10eae08 100644
--- a/1.4/examples/index.html
+++ b/1.4/examples/index.html
@@ -297,8 +297,9 @@ This user will need to have the ability to create tables.</p>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/examples/isolation.html
----------------------------------------------------------------------
diff --git a/1.4/examples/isolation.html b/1.4/examples/isolation.html
index 44e3ecc..ce52f96 100644
--- a/1.4/examples/isolation.html
+++ b/1.4/examples/isolation.html
@@ -277,8 +277,9 @@ finished
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/examples/mapred.html
----------------------------------------------------------------------
diff --git a/1.4/examples/mapred.html b/1.4/examples/mapred.html
index 9aecaf8..ea8ec23 100644
--- a/1.4/examples/mapred.html
+++ b/1.4/examples/mapred.html
@@ -330,8 +330,9 @@ can directly read a tables files from HDFS.</p>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/examples/shard.html
----------------------------------------------------------------------
diff --git a/1.4/examples/shard.html b/1.4/examples/shard.html
index b000057..0d25f68 100644
--- a/1.4/examples/shard.html
+++ b/1.4/examples/shard.html
@@ -303,8 +303,9 @@ $ ./bin/accumulo org.apache.accumulo.examples.simple.shard.Query instance zookee
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/examples/visibility.html
----------------------------------------------------------------------
diff --git a/1.4/examples/visibility.html b/1.4/examples/visibility.html
index 73cbfc0..e0582eb 100644
--- a/1.4/examples/visibility.html
+++ b/1.4/examples/visibility.html
@@ -372,8 +372,9 @@ username@instance vistest>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/user_manual/Accumulo_Design.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Accumulo_Design.html b/1.4/user_manual/Accumulo_Design.html
index 24ef011..0147eef 100644
--- a/1.4/user_manual/Accumulo_Design.html
+++ b/1.4/user_manual/Accumulo_Design.html
@@ -330,8 +330,9 @@ http://master-address:50095/monitor.</p>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/user_manual/Accumulo_Shell.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Accumulo_Shell.html b/1.4/user_manual/Accumulo_Shell.html
index 946e285..ccf908b 100644
--- a/1.4/user_manual/Accumulo_Shell.html
+++ b/1.4/user_manual/Accumulo_Shell.html
@@ -371,8 +371,9 @@ root@myinstance bobstable> revoke System.CREATE_TABLE -s -u bob
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/user_manual/Administration.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Administration.html b/1.4/user_manual/Administration.html
index e554518..0ee2620 100644
--- a/1.4/user_manual/Administration.html
+++ b/1.4/user_manual/Administration.html
@@ -423,8 +423,9 @@ $ACCUMULO/logs/.</p>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/user_manual/Analytics.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Analytics.html b/1.4/user_manual/Analytics.html
index f81bbe6..7ed5aa3 100644
--- a/1.4/user_manual/Analytics.html
+++ b/1.4/user_manual/Analytics.html
@@ -385,8 +385,9 @@ accumulo/docs/examples/README.mapred</p>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/user_manual/Contents.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Contents.html b/1.4/user_manual/Contents.html
index 62e407a..df884d5 100644
--- a/1.4/user_manual/Contents.html
+++ b/1.4/user_manual/Contents.html
@@ -455,8 +455,9 @@
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/user_manual/Development_Clients.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Development_Clients.html b/1.4/user_manual/Development_Clients.html
index 33288ee..beff10d 100644
--- a/1.4/user_manual/Development_Clients.html
+++ b/1.4/user_manual/Development_Clients.html
@@ -339,8 +339,9 @@ Connector conn = instance.getConnector("root", "password");
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/user_manual/High_Speed_Ingest.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/High_Speed_Ingest.html b/1.4/user_manual/High_Speed_Ingest.html
index 66272ab..2d4ef47 100644
--- a/1.4/user_manual/High_Speed_Ingest.html
+++ b/1.4/user_manual/High_Speed_Ingest.html
@@ -324,8 +324,9 @@ accumulo/docs/examples/README.mapred</p>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/user_manual/Introduction.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Introduction.html b/1.4/user_manual/Introduction.html
index 1d682e1..ec64819 100644
--- a/1.4/user_manual/Introduction.html
+++ b/1.4/user_manual/Introduction.html
@@ -253,8 +253,9 @@
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/user_manual/Security.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Security.html b/1.4/user_manual/Security.html
index 64d9f04..da2aa3c 100644
--- a/1.4/user_manual/Security.html
+++ b/1.4/user_manual/Security.html
@@ -354,8 +354,9 @@ Scanner s = connector.createScanner("table", auths);
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/user_manual/Shell_Commands.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Shell_Commands.html b/1.4/user_manual/Shell_Commands.html
index 2592379..2fc2a53 100644
--- a/1.4/user_manual/Shell_Commands.html
+++ b/1.4/user_manual/Shell_Commands.html
@@ -1036,8 +1036,9 @@ description: reports the current user name
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/user_manual/Table_Configuration.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Table_Configuration.html b/1.4/user_manual/Table_Configuration.html
index cda15d3..96c88ea 100644
--- a/1.4/user_manual/Table_Configuration.html
+++ b/1.4/user_manual/Table_Configuration.html
@@ -701,8 +701,9 @@ root@a14 cic>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/user_manual/Table_Design.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Table_Design.html b/1.4/user_manual/Table_Design.html
index adb76ff..c522777 100644
--- a/1.4/user_manual/Table_Design.html
+++ b/1.4/user_manual/Table_Design.html
@@ -418,8 +418,9 @@ for(Entry<Key,Value> entry : bs) {
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/user_manual/Writing_Accumulo_Clients.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Writing_Accumulo_Clients.html b/1.4/user_manual/Writing_Accumulo_Clients.html
index 8a558ee..14bc774 100644
--- a/1.4/user_manual/Writing_Accumulo_Clients.html
+++ b/1.4/user_manual/Writing_Accumulo_Clients.html
@@ -494,8 +494,9 @@ client.closeScanner(scanner);
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/user_manual/accumulo_user_manual.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/accumulo_user_manual.html b/1.4/user_manual/accumulo_user_manual.html
index a5f47ea..449913b 100644
--- a/1.4/user_manual/accumulo_user_manual.html
+++ b/1.4/user_manual/accumulo_user_manual.html
@@ -270,8 +270,9 @@
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.4/user_manual/index.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/index.html b/1.4/user_manual/index.html
index a5f47ea..449913b 100644
--- a/1.4/user_manual/index.html
+++ b/1.4/user_manual/index.html
@@ -270,8 +270,9 @@
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.5/examples/batch.html
----------------------------------------------------------------------
diff --git a/1.5/examples/batch.html b/1.5/examples/batch.html
index cbb2b22..57d1134 100644
--- a/1.5/examples/batch.html
+++ b/1.5/examples/batch.html
@@ -286,8 +286,9 @@ $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchScanner -
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.5/examples/bloom.html
----------------------------------------------------------------------
diff --git a/1.5/examples/bloom.html b/1.5/examples/bloom.html
index 12d771a..1fedbd7 100644
--- a/1.5/examples/bloom.html
+++ b/1.5/examples/bloom.html
@@ -469,8 +469,9 @@ Meta block : acu_bloom
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.5/examples/bulkIngest.html
----------------------------------------------------------------------
diff --git a/1.5/examples/bulkIngest.html b/1.5/examples/bulkIngest.html
index 1a55b7d..2a4580b 100644
--- a/1.5/examples/bulkIngest.html
+++ b/1.5/examples/bulkIngest.html
@@ -260,8 +260,9 @@ $ ./bin/accumulo $PKG.VerifyIngest $ARGS -t test_bulk --start-row 0 --count 1000
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.5/examples/classpath.html
----------------------------------------------------------------------
diff --git a/1.5/examples/classpath.html b/1.5/examples/classpath.html
index 092776f..6016e3b 100644
--- a/1.5/examples/classpath.html
+++ b/1.5/examples/classpath.html
@@ -304,8 +304,9 @@ Filter accepts or rejects each Key/Value pair
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.5/examples/client.html
----------------------------------------------------------------------
diff --git a/1.5/examples/client.html b/1.5/examples/client.html
index 1432b17..34a3a41 100644
--- a/1.5/examples/client.html
+++ b/1.5/examples/client.html
@@ -312,8 +312,9 @@ hello%09; datatypes:xml [LEVEL1|GROUP1] 1358192329450 false -> world
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.5/examples/combiner.html
----------------------------------------------------------------------
diff --git a/1.5/examples/combiner.html b/1.5/examples/combiner.html
index 026d0b9..8cf0940 100644
--- a/1.5/examples/combiner.html
+++ b/1.5/examples/combiner.html
@@ -299,8 +299,9 @@ hstat is configured for base 16.</p>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.5/examples/constraints.html
----------------------------------------------------------------------
diff --git a/1.5/examples/constraints.html b/1.5/examples/constraints.html
index bff25f4..1896644 100644
--- a/1.5/examples/constraints.html
+++ b/1.5/examples/constraints.html
@@ -283,8 +283,9 @@ username@instance testConstraints>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.5/examples/dirlist.html
----------------------------------------------------------------------
diff --git a/1.5/examples/dirlist.html b/1.5/examples/dirlist.html
index e0bf1d1..64a7b7e 100644
--- a/1.5/examples/dirlist.html
+++ b/1.5/examples/dirlist.html
@@ -368,8 +368,9 @@ Other column family : column qualifier pairs are “~chunk” : chunk size in by
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.5/examples/export.html
----------------------------------------------------------------------
diff --git a/1.5/examples/export.html b/1.5/examples/export.html
index 157db61..54cf006 100644
--- a/1.5/examples/export.html
+++ b/1.5/examples/export.html
@@ -322,8 +322,9 @@ root@test15 table1_copy> scan -t !METADATA -b 5 -c srv:time
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.5/examples/filedata.html
----------------------------------------------------------------------
diff --git a/1.5/examples/filedata.html b/1.5/examples/filedata.html
index 79c7f01..19e649b 100644
--- a/1.5/examples/filedata.html
+++ b/1.5/examples/filedata.html
@@ -292,8 +292,9 @@ The example has the following classes:</p>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.5/examples/filter.html
----------------------------------------------------------------------
diff --git a/1.5/examples/filter.html b/1.5/examples/filter.html
index 0342341..fc0b658 100644
--- a/1.5/examples/filter.html
+++ b/1.5/examples/filter.html
@@ -343,8 +343,9 @@ Also, each iterator must have a unique name and priority within each scope.</p>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.5/examples/helloworld.html
----------------------------------------------------------------------
diff --git a/1.5/examples/helloworld.html b/1.5/examples/helloworld.html
index 4731d60..7fcbefe 100644
--- a/1.5/examples/helloworld.html
+++ b/1.5/examples/helloworld.html
@@ -286,8 +286,9 @@ username@instance hellotable> scan
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.5/examples/index.html
----------------------------------------------------------------------
diff --git a/1.5/examples/index.html b/1.5/examples/index.html
index fbe6958..a8a6521 100644
--- a/1.5/examples/index.html
+++ b/1.5/examples/index.html
@@ -328,8 +328,9 @@ features of Apache Accumulo.</p>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.5/examples/isolation.html
----------------------------------------------------------------------
diff --git a/1.5/examples/isolation.html b/1.5/examples/isolation.html
index 12449fc..d037440 100644
--- a/1.5/examples/isolation.html
+++ b/1.5/examples/isolation.html
@@ -277,8 +277,9 @@ finished
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.5/examples/mapred.html
----------------------------------------------------------------------
diff --git a/1.5/examples/mapred.html b/1.5/examples/mapred.html
index 989845b..7e61573 100644
--- a/1.5/examples/mapred.html
+++ b/1.5/examples/mapred.html
@@ -330,8 +330,9 @@ can directly read a tables files from HDFS.</p>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.5/examples/maxmutation.html
----------------------------------------------------------------------
diff --git a/1.5/examples/maxmutation.html b/1.5/examples/maxmutation.html
index 80132fd..26bb0fd 100644
--- a/1.5/examples/maxmutation.html
+++ b/1.5/examples/maxmutation.html
@@ -274,8 +274,9 @@ a single row with 10000 columns, which exceeds the memory limit:</p>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.5/examples/regex.html
----------------------------------------------------------------------
diff --git a/1.5/examples/regex.html b/1.5/examples/regex.html
index 2930006..1405289 100644
--- a/1.5/examples/regex.html
+++ b/1.5/examples/regex.html
@@ -288,8 +288,9 @@ $
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.5/examples/rowhash.html
----------------------------------------------------------------------
diff --git a/1.5/examples/rowhash.html b/1.5/examples/rowhash.html
index 4fa7784..e9dbf55 100644
--- a/1.5/examples/rowhash.html
+++ b/1.5/examples/rowhash.html
@@ -290,8 +290,9 @@ username@instance>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.5/examples/shard.html
----------------------------------------------------------------------
diff --git a/1.5/examples/shard.html b/1.5/examples/shard.html
index 2cb945d..6e9c7cf 100644
--- a/1.5/examples/shard.html
+++ b/1.5/examples/shard.html
@@ -304,8 +304,9 @@ randomly selects one set of 5 terms and queries. It prints the number of matchi
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.5/examples/tabletofile.html
----------------------------------------------------------------------
diff --git a/1.5/examples/tabletofile.html b/1.5/examples/tabletofile.html
index 37bb9a1..564f930 100644
--- a/1.5/examples/tabletofile.html
+++ b/1.5/examples/tabletofile.html
@@ -290,8 +290,9 @@ $
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.5/examples/terasort.html
----------------------------------------------------------------------
diff --git a/1.5/examples/terasort.html b/1.5/examples/terasort.html
index b5a5d91..d732e12 100644
--- a/1.5/examples/terasort.html
+++ b/1.5/examples/terasort.html
@@ -279,8 +279,9 @@ w[o||:N&H, c: 2 [] QQQQQQQQQQGGGGGGGGGGWWWWWWWWWWMMMMMMMMMMCCCCCC
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.5/examples/visibility.html
----------------------------------------------------------------------
diff --git a/1.5/examples/visibility.html b/1.5/examples/visibility.html
index 73cbfc0..e0582eb 100644
--- a/1.5/examples/visibility.html
+++ b/1.5/examples/visibility.html
@@ -372,8 +372,9 @@ username@instance vistest>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.6/examples/batch.html
----------------------------------------------------------------------
diff --git a/1.6/examples/batch.html b/1.6/examples/batch.html
index 9839085..c99f040 100644
--- a/1.6/examples/batch.html
+++ b/1.6/examples/batch.html
@@ -286,8 +286,9 @@ $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchScanner -
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.6/examples/bloom.html
----------------------------------------------------------------------
diff --git a/1.6/examples/bloom.html b/1.6/examples/bloom.html
index 01e66f7..fe534f6 100644
--- a/1.6/examples/bloom.html
+++ b/1.6/examples/bloom.html
@@ -470,8 +470,9 @@ Meta block : acu_bloom
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.6/examples/bulkIngest.html
----------------------------------------------------------------------
diff --git a/1.6/examples/bulkIngest.html b/1.6/examples/bulkIngest.html
index 257fbf7..d270e36 100644
--- a/1.6/examples/bulkIngest.html
+++ b/1.6/examples/bulkIngest.html
@@ -260,8 +260,9 @@ $ ./bin/accumulo $PKG.VerifyIngest $ARGS -t test_bulk --start-row 0 --count 1000
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.6/examples/classpath.html
----------------------------------------------------------------------
diff --git a/1.6/examples/classpath.html b/1.6/examples/classpath.html
index 701d3cb..f5a59dd 100644
--- a/1.6/examples/classpath.html
+++ b/1.6/examples/classpath.html
@@ -304,8 +304,9 @@ Filter accepts or rejects each Key/Value pair
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.6/examples/client.html
----------------------------------------------------------------------
diff --git a/1.6/examples/client.html b/1.6/examples/client.html
index a7a42bb..0ddae53 100644
--- a/1.6/examples/client.html
+++ b/1.6/examples/client.html
@@ -312,8 +312,9 @@ hello%09; datatypes:xml [LEVEL1|GROUP1] 1358192329450 false -> world
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.6/examples/combiner.html
----------------------------------------------------------------------
diff --git a/1.6/examples/combiner.html b/1.6/examples/combiner.html
index 6fa0978..866bcee 100644
--- a/1.6/examples/combiner.html
+++ b/1.6/examples/combiner.html
@@ -299,8 +299,9 @@ hstat is configured for base 16.</p>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.6/examples/constraints.html
----------------------------------------------------------------------
diff --git a/1.6/examples/constraints.html b/1.6/examples/constraints.html
index 36f658a..3da1f8d 100644
--- a/1.6/examples/constraints.html
+++ b/1.6/examples/constraints.html
@@ -283,8 +283,9 @@ username@instance testConstraints>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.6/examples/dirlist.html
----------------------------------------------------------------------
diff --git a/1.6/examples/dirlist.html b/1.6/examples/dirlist.html
index b468179..15a1ab6 100644
--- a/1.6/examples/dirlist.html
+++ b/1.6/examples/dirlist.html
@@ -368,8 +368,9 @@ Other column family : column qualifier pairs are “~chunk” : chunk size in by
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.6/examples/export.html
----------------------------------------------------------------------
diff --git a/1.6/examples/export.html b/1.6/examples/export.html
index 79003c1..31ce727 100644
--- a/1.6/examples/export.html
+++ b/1.6/examples/export.html
@@ -323,8 +323,9 @@ root@test16 table1_copy> scan -t accumulo.metadata -b 5 -c srv:time
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.6/examples/filedata.html
----------------------------------------------------------------------
diff --git a/1.6/examples/filedata.html b/1.6/examples/filedata.html
index 1efcbae..46d448b 100644
--- a/1.6/examples/filedata.html
+++ b/1.6/examples/filedata.html
@@ -292,8 +292,9 @@ The example has the following classes:</p>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.6/examples/filter.html
----------------------------------------------------------------------
diff --git a/1.6/examples/filter.html b/1.6/examples/filter.html
index bd602d4..caf9c6f 100644
--- a/1.6/examples/filter.html
+++ b/1.6/examples/filter.html
@@ -343,8 +343,9 @@ Also, each iterator must have a unique name and priority within each scope.</p>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.6/examples/helloworld.html
----------------------------------------------------------------------
diff --git a/1.6/examples/helloworld.html b/1.6/examples/helloworld.html
index 0054ce5..96ff7c7 100644
--- a/1.6/examples/helloworld.html
+++ b/1.6/examples/helloworld.html
@@ -286,8 +286,9 @@ username@instance hellotable> scan
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.6/examples/index.html
----------------------------------------------------------------------
diff --git a/1.6/examples/index.html b/1.6/examples/index.html
index 78da6c1..1f72892 100644
--- a/1.6/examples/index.html
+++ b/1.6/examples/index.html
@@ -325,8 +325,9 @@ features of Apache Accumulo.</p>
<p>Copyright © 2011-2016 The Apache Software
Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
<p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
<a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>