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:33 UTC
[1/4] accumulo git commit: Ensure "Apache " is explicit on the
website
Repository: accumulo
Updated Branches:
refs/heads/asf-site 906f782ac -> 7a477677b
refs/heads/gh-pages 54012968b -> 29181962b
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/29181962
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/29181962
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/29181962
Branch: refs/heads/gh-pages
Commit: 29181962b249564c2748cfee9482809e1221824e
Parents: 5401296
Author: Josh Elser <el...@apache.org>
Authored: Mon Apr 25 11:43:22 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Apr 25 11:43:22 2016 -0400
----------------------------------------------------------------------
_includes/footer.md | 5 +++--
index.md | 16 ++++++++--------
2 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/29181962/_includes/footer.md
----------------------------------------------------------------------
diff --git a/_includes/footer.md b/_includes/footer.md
index 79424c9..fe76263 100644
--- a/_includes/footer.md
+++ b/_includes/footer.md
@@ -5,8 +5,9 @@
Copyright © 2011-{{ site.time | date: '%Y' }} The Apache Software
Foundation, Licensed under the [Apache License, Version 2.0][AL2]. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the [Apache Software Foundation][ASF].
+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 [Apache Software Foundation][ASF].
Site created with [Bootstrap][BOOTSTRAP] including icons from
[GLYPHICONS][GLYPHICONS] and [Font Awesome][FONTAWE].
http://git-wip-us.apache.org/repos/asf/accumulo/blob/29181962/index.md
----------------------------------------------------------------------
diff --git a/index.md b/index.md
index a677779..b18caf1 100644
--- a/index.md
+++ b/index.md
@@ -13,21 +13,21 @@ The Apache Accumulo™ sorted, distributed key/value store is a robust, scal
</div>
Apache Accumulo is based on Google's [BigTable][1] design and is built on
-top of Apache [Hadoop][2], [Zookeeper][3], and [Thrift][4]. Apache Accumulo features a few novel
+top of [Apache Hadoop][2], [Apache Zookeeper][3], and [Apache Thrift][4]. Apache Accumulo features a few novel
improvements on the BigTable design in the form of cell-based access control and a server-side
programming mechanism that can modify key/value pairs at various points in the
data management process. Other notable improvements and feature are outlined
[here](notable_features).
Google published the design of BigTable in 2006. Several other open source
-projects have implemented aspects of this design including [HBase][5], [Hypertable][6],
-and [Cassandra][7]. Accumulo began its development in 2008 and joined the [Apache community][8] in 2011.
+projects have implemented aspects of this design including [Apache HBase][5], [Hypertable][6],
+and [Apache Cassandra][7]. Accumulo began its development in 2008 and joined the [Apache community][8] in 2011.
[1]: https://research.google.com/archive/bigtable.html "BigTable"
-[2]: https://hadoop.apache.org "Hadoop"
-[3]: https://zookeeper.apache.org "Zookeeper"
-[4]: https://thrift.apache.org "Thrift"
-[5]: https://hbase.apache.org "HBase"
+[2]: https://hadoop.apache.org "Apache Hadoop"
+[3]: https://zookeeper.apache.org "Apache Zookeeper"
+[4]: https://thrift.apache.org "Apache Thrift"
+[5]: https://hbase.apache.org "Apache HBase"
[6]: http://hypertable.com "Hypertable"
-[7]: https://cassandra.apache.org "Cassandra"
+[7]: https://cassandra.apache.org "Apache Cassandra"
[8]: https://www.apache.org "Apache Software Foundation"
[3/4] accumulo git commit: Jekyll build from gh-pages:2918196
Posted by el...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.6/examples/isolation.html
----------------------------------------------------------------------
diff --git a/1.6/examples/isolation.html b/1.6/examples/isolation.html
index 6f14a8e..81178b9 100644
--- a/1.6/examples/isolation.html
+++ b/1.6/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.6/examples/mapred.html
----------------------------------------------------------------------
diff --git a/1.6/examples/mapred.html b/1.6/examples/mapred.html
index 5b74b07..ccd2645 100644
--- a/1.6/examples/mapred.html
+++ b/1.6/examples/mapred.html
@@ -393,8 +393,9 @@ WordCount example, then the resulting counts should just double.)</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/maxmutation.html
----------------------------------------------------------------------
diff --git a/1.6/examples/maxmutation.html b/1.6/examples/maxmutation.html
index 967b0fa..af24997 100644
--- a/1.6/examples/maxmutation.html
+++ b/1.6/examples/maxmutation.html
@@ -275,8 +275,9 @@ ERROR : Constraint violates : ConstraintViolationSummary(constrainClass:org.apac
<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/regex.html
----------------------------------------------------------------------
diff --git a/1.6/examples/regex.html b/1.6/examples/regex.html
index 0eebb96..b7d989b 100644
--- a/1.6/examples/regex.html
+++ b/1.6/examples/regex.html
@@ -286,8 +286,9 @@ dogrow dogcf:dogcq [] 1357844987994 false dogvalue
<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/reservations.html
----------------------------------------------------------------------
diff --git a/1.6/examples/reservations.html b/1.6/examples/reservations.html
index f4251ab..44ebfb0 100644
--- a/1.6/examples/reservations.html
+++ b/1.6/examples/reservations.html
@@ -295,8 +295,9 @@ the conditional mutation will fail and the example code will retry.</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/rowhash.html
----------------------------------------------------------------------
diff --git a/1.6/examples/rowhash.html b/1.6/examples/rowhash.html
index b816f37..36e2c34 100644
--- a/1.6/examples/rowhash.html
+++ b/1.6/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.6/examples/shard.html
----------------------------------------------------------------------
diff --git a/1.6/examples/shard.html b/1.6/examples/shard.html
index 0d521d9..b10f321 100644
--- a/1.6/examples/shard.html
+++ b/1.6/examples/shard.html
@@ -304,8 +304,9 @@ randomly selects one set of 5 terms and queries. It prints the number of matchin
<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/tabletofile.html
----------------------------------------------------------------------
diff --git a/1.6/examples/tabletofile.html b/1.6/examples/tabletofile.html
index 125d113..fca7b62 100644
--- a/1.6/examples/tabletofile.html
+++ b/1.6/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.6/examples/terasort.html
----------------------------------------------------------------------
diff --git a/1.6/examples/terasort.html b/1.6/examples/terasort.html
index 0a771bc..01684ec 100644
--- a/1.6/examples/terasort.html
+++ b/1.6/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.6/examples/visibility.html
----------------------------------------------------------------------
diff --git a/1.6/examples/visibility.html b/1.6/examples/visibility.html
index 55095d3..2800472 100644
--- a/1.6/examples/visibility.html
+++ b/1.6/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.7/examples/batch.html
----------------------------------------------------------------------
diff --git a/1.7/examples/batch.html b/1.7/examples/batch.html
index 9839085..c99f040 100644
--- a/1.7/examples/batch.html
+++ b/1.7/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.7/examples/bloom.html
----------------------------------------------------------------------
diff --git a/1.7/examples/bloom.html b/1.7/examples/bloom.html
index 01e66f7..fe534f6 100644
--- a/1.7/examples/bloom.html
+++ b/1.7/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.7/examples/bulkIngest.html
----------------------------------------------------------------------
diff --git a/1.7/examples/bulkIngest.html b/1.7/examples/bulkIngest.html
index 257fbf7..d270e36 100644
--- a/1.7/examples/bulkIngest.html
+++ b/1.7/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.7/examples/classpath.html
----------------------------------------------------------------------
diff --git a/1.7/examples/classpath.html b/1.7/examples/classpath.html
index 701d3cb..f5a59dd 100644
--- a/1.7/examples/classpath.html
+++ b/1.7/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.7/examples/client.html
----------------------------------------------------------------------
diff --git a/1.7/examples/client.html b/1.7/examples/client.html
index a7a42bb..0ddae53 100644
--- a/1.7/examples/client.html
+++ b/1.7/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.7/examples/combiner.html
----------------------------------------------------------------------
diff --git a/1.7/examples/combiner.html b/1.7/examples/combiner.html
index 6fa0978..866bcee 100644
--- a/1.7/examples/combiner.html
+++ b/1.7/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.7/examples/constraints.html
----------------------------------------------------------------------
diff --git a/1.7/examples/constraints.html b/1.7/examples/constraints.html
index 36f658a..3da1f8d 100644
--- a/1.7/examples/constraints.html
+++ b/1.7/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.7/examples/dirlist.html
----------------------------------------------------------------------
diff --git a/1.7/examples/dirlist.html b/1.7/examples/dirlist.html
index b468179..15a1ab6 100644
--- a/1.7/examples/dirlist.html
+++ b/1.7/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.7/examples/export.html
----------------------------------------------------------------------
diff --git a/1.7/examples/export.html b/1.7/examples/export.html
index 79003c1..31ce727 100644
--- a/1.7/examples/export.html
+++ b/1.7/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.7/examples/filedata.html
----------------------------------------------------------------------
diff --git a/1.7/examples/filedata.html b/1.7/examples/filedata.html
index 1efcbae..46d448b 100644
--- a/1.7/examples/filedata.html
+++ b/1.7/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.7/examples/filter.html
----------------------------------------------------------------------
diff --git a/1.7/examples/filter.html b/1.7/examples/filter.html
index bd602d4..caf9c6f 100644
--- a/1.7/examples/filter.html
+++ b/1.7/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.7/examples/helloworld.html
----------------------------------------------------------------------
diff --git a/1.7/examples/helloworld.html b/1.7/examples/helloworld.html
index 0054ce5..96ff7c7 100644
--- a/1.7/examples/helloworld.html
+++ b/1.7/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.7/examples/index.html
----------------------------------------------------------------------
diff --git a/1.7/examples/index.html b/1.7/examples/index.html
index a1ef5c6..95207a6 100644
--- a/1.7/examples/index.html
+++ b/1.7/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>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.7/examples/isolation.html
----------------------------------------------------------------------
diff --git a/1.7/examples/isolation.html b/1.7/examples/isolation.html
index 6f14a8e..81178b9 100644
--- a/1.7/examples/isolation.html
+++ b/1.7/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.7/examples/mapred.html
----------------------------------------------------------------------
diff --git a/1.7/examples/mapred.html b/1.7/examples/mapred.html
index 5b74b07..ccd2645 100644
--- a/1.7/examples/mapred.html
+++ b/1.7/examples/mapred.html
@@ -393,8 +393,9 @@ WordCount example, then the resulting counts should just double.)</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.7/examples/maxmutation.html
----------------------------------------------------------------------
diff --git a/1.7/examples/maxmutation.html b/1.7/examples/maxmutation.html
index 967b0fa..af24997 100644
--- a/1.7/examples/maxmutation.html
+++ b/1.7/examples/maxmutation.html
@@ -275,8 +275,9 @@ ERROR : Constraint violates : ConstraintViolationSummary(constrainClass:org.apac
<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.7/examples/regex.html
----------------------------------------------------------------------
diff --git a/1.7/examples/regex.html b/1.7/examples/regex.html
index 0eebb96..b7d989b 100644
--- a/1.7/examples/regex.html
+++ b/1.7/examples/regex.html
@@ -286,8 +286,9 @@ dogrow dogcf:dogcq [] 1357844987994 false dogvalue
<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.7/examples/reservations.html
----------------------------------------------------------------------
diff --git a/1.7/examples/reservations.html b/1.7/examples/reservations.html
index f4251ab..44ebfb0 100644
--- a/1.7/examples/reservations.html
+++ b/1.7/examples/reservations.html
@@ -295,8 +295,9 @@ the conditional mutation will fail and the example code will retry.</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.7/examples/rowhash.html
----------------------------------------------------------------------
diff --git a/1.7/examples/rowhash.html b/1.7/examples/rowhash.html
index b816f37..36e2c34 100644
--- a/1.7/examples/rowhash.html
+++ b/1.7/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.7/examples/shard.html
----------------------------------------------------------------------
diff --git a/1.7/examples/shard.html b/1.7/examples/shard.html
index 0d521d9..b10f321 100644
--- a/1.7/examples/shard.html
+++ b/1.7/examples/shard.html
@@ -304,8 +304,9 @@ randomly selects one set of 5 terms and queries. It prints the number of matchin
<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.7/examples/tabletofile.html
----------------------------------------------------------------------
diff --git a/1.7/examples/tabletofile.html b/1.7/examples/tabletofile.html
index 125d113..fca7b62 100644
--- a/1.7/examples/tabletofile.html
+++ b/1.7/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.7/examples/terasort.html
----------------------------------------------------------------------
diff --git a/1.7/examples/terasort.html b/1.7/examples/terasort.html
index 0a771bc..01684ec 100644
--- a/1.7/examples/terasort.html
+++ b/1.7/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.7/examples/visibility.html
----------------------------------------------------------------------
diff --git a/1.7/examples/visibility.html b/1.7/examples/visibility.html
index 55095d3..2800472 100644
--- a/1.7/examples/visibility.html
+++ b/1.7/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/bylaws.html
----------------------------------------------------------------------
diff --git a/bylaws.html b/bylaws.html
index 4a6841c..016d9df 100644
--- a/bylaws.html
+++ b/bylaws.html
@@ -512,8 +512,9 @@ See the <a href="https://www.apache.org/dev/pmc">PMC Guide</a> for more informat
<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/contrib.html
----------------------------------------------------------------------
diff --git a/contrib.html b/contrib.html
index 6d86d73..ba2be29 100644
--- a/contrib.html
+++ b/contrib.html
@@ -315,8 +315,9 @@ codebase</a> and the related published documentation for versions
<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/downloads/index.html
----------------------------------------------------------------------
diff --git a/downloads/index.html b/downloads/index.html
index 4dde048..1e7133e 100644
--- a/downloads/index.html
+++ b/downloads/index.html
@@ -395,8 +395,9 @@ $(function() { $.getJSON(mirrorURL + "?as_json", mirrorsCallback); });
<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/example/wikisearch.html
----------------------------------------------------------------------
diff --git a/example/wikisearch.html b/example/wikisearch.html
index b919976..aeba341 100644
--- a/example/wikisearch.html
+++ b/example/wikisearch.html
@@ -625,8 +625,9 @@ The English wikipedia data was re-ingested on top of the existing, compacted dat
<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/examples/latest.html
----------------------------------------------------------------------
diff --git a/examples/latest.html b/examples/latest.html
index 67050f0..aea2507 100644
--- a/examples/latest.html
+++ b/examples/latest.html
@@ -251,8 +251,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/feed.xml
----------------------------------------------------------------------
diff --git a/feed.xml b/feed.xml
index 9380d40..862854d 100644
--- a/feed.xml
+++ b/feed.xml
@@ -6,8 +6,8 @@
</description>
<link>https://accumulo.apache.org/</link>
<atom:link href="https://accumulo.apache.org/feed.xml" rel="self" type="application/rss+xml"/>
- <pubDate>Fri, 22 Apr 2016 18:57:58 -0400</pubDate>
- <lastBuildDate>Fri, 22 Apr 2016 18:57:58 -0400</lastBuildDate>
+ <pubDate>Mon, 25 Apr 2016 11:45:42 -0400</pubDate>
+ <lastBuildDate>Mon, 25 Apr 2016 11:45:42 -0400</lastBuildDate>
<generator>Jekyll v3.0.3</generator>
</channel>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/get_involved.html
----------------------------------------------------------------------
diff --git a/get_involved.html b/get_involved.html
index fd5081c..ad8715e 100644
--- a/get_involved.html
+++ b/get_involved.html
@@ -329,8 +329,9 @@ to approve a release.</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/git.html
----------------------------------------------------------------------
diff --git a/git.html b/git.html
index f0f6f7e..fa80309 100644
--- a/git.html
+++ b/git.html
@@ -771,8 +771,9 @@ variables</a>.</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/glossary.html
----------------------------------------------------------------------
diff --git a/glossary.html b/glossary.html
index eddb8dc..219d1a5 100644
--- a/glossary.html
+++ b/glossary.html
@@ -301,8 +301,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/governance/consensusBuilding.html
----------------------------------------------------------------------
diff --git a/governance/consensusBuilding.html b/governance/consensusBuilding.html
index f29d740..df166f2 100644
--- a/governance/consensusBuilding.html
+++ b/governance/consensusBuilding.html
@@ -297,8 +297,9 @@ the work under the <a href="/governance/lazyConsensus">lazy consensus</a> model.
<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/governance/lazyConsensus.html
----------------------------------------------------------------------
diff --git a/governance/lazyConsensus.html b/governance/lazyConsensus.html
index 07cd498..5c2f560 100644
--- a/governance/lazyConsensus.html
+++ b/governance/lazyConsensus.html
@@ -300,8 +300,9 @@ can take some time to get used to.</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/governance/releasing.html
----------------------------------------------------------------------
diff --git a/governance/releasing.html b/governance/releasing.html
index 5bea655..699861e 100644
--- a/governance/releasing.html
+++ b/governance/releasing.html
@@ -320,8 +320,9 @@ release, the release should be vetoed via the normal voting process. New major r
<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/governance/voting.html
----------------------------------------------------------------------
diff --git a/governance/voting.html b/governance/voting.html
index ef643a8..df98042 100644
--- a/governance/voting.html
+++ b/governance/voting.html
@@ -337,8 +337,9 @@ Voting results:
<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/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index af51ccc..9674634 100644
--- a/index.html
+++ b/index.html
@@ -245,15 +245,15 @@ The Apache Accumulo™ sorted, distributed key/value store is a robust, scal
</div>
<p>Apache Accumulo is based on Google’s <a href="https://research.google.com/archive/bigtable.html" title="BigTable">BigTable</a> design and is built on
-top of Apache <a href="https://hadoop.apache.org" title="Hadoop">Hadoop</a>, <a href="https://zookeeper.apache.org" title="Zookeeper">Zookeeper</a>, and <a href="https://thrift.apache.org" title="Thrift">Thrift</a>. Apache Accumulo features a few novel
+top of <a href="https://hadoop.apache.org" title="Apache Hadoop">Apache Hadoop</a>, <a href="https://zookeeper.apache.org" title="Apache Zookeeper">Apache Zookeeper</a>, and <a href="https://thrift.apache.org" title="Apache Thrift">Apache Thrift</a>. Apache Accumulo features a few novel
improvements on the BigTable design in the form of cell-based access control and a server-side
programming mechanism that can modify key/value pairs at various points in the
data management process. Other notable improvements and feature are outlined
<a href="notable_features">here</a>.</p>
<p>Google published the design of BigTable in 2006. Several other open source
-projects have implemented aspects of this design including <a href="https://hbase.apache.org" title="HBase">HBase</a>, <a href="http://hypertable.com" title="Hypertable">Hypertable</a>,
-and <a href="https://cassandra.apache.org" title="Cassandra">Cassandra</a>. Accumulo began its development in 2008 and joined the <a href="https://www.apache.org" title="Apache Software Foundation">Apache community</a> in 2011.</p>
+projects have implemented aspects of this design including <a href="https://hbase.apache.org" title="Apache HBase">Apache HBase</a>, <a href="http://hypertable.com" title="Hypertable">Hypertable</a>,
+and <a href="https://cassandra.apache.org" title="Apache Cassandra">Apache Cassandra</a>. Accumulo began its development in 2008 and joined the <a href="https://www.apache.org" title="Apache Software Foundation">Apache community</a> in 2011.</p>
</div>
@@ -265,8 +265,9 @@ and <a href="https://cassandra.apache.org" title="Cassandra">Cassandra</a>. Acc
<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/mailing_list.html
----------------------------------------------------------------------
diff --git a/mailing_list.html b/mailing_list.html
index df84d3d..0c6b4e0 100644
--- a/mailing_list.html
+++ b/mailing_list.html
@@ -298,8 +298,9 @@ It is recommended that you also subscribe to <b>notifications</b>.</td>
<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/notable_features.html
----------------------------------------------------------------------
diff --git a/notable_features.html b/notable_features.html
index a75eaa9..25e0bfb 100644
--- a/notable_features.html
+++ b/notable_features.html
@@ -688,8 +688,9 @@ beginning and end of the range are split, compacted, and then merged.</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/old_documentation.html
----------------------------------------------------------------------
diff --git a/old_documentation.html b/old_documentation.html
index a7c1d11..1356706 100644
--- a/old_documentation.html
+++ b/old_documentation.html
@@ -277,8 +277,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/papers.html
----------------------------------------------------------------------
diff --git a/papers.html b/papers.html
index e75c103..8f49e15 100644
--- a/papers.html
+++ b/papers.html
@@ -251,8 +251,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/papers/index.html
----------------------------------------------------------------------
diff --git a/papers/index.html b/papers/index.html
index 71be783..405bbfe 100644
--- a/papers/index.html
+++ b/papers/index.html
@@ -508,8 +508,9 @@ $("#citationtable").dataTable();
<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/people.html
----------------------------------------------------------------------
diff --git a/people.html b/people.html
index cfefc5e..77157e4 100644
--- a/people.html
+++ b/people.html
@@ -876,8 +876,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/projects.html
----------------------------------------------------------------------
diff --git a/projects.html b/projects.html
index b55cb7c..1710936 100644
--- a/projects.html
+++ b/projects.html
@@ -289,8 +289,9 @@ in some way, shape or form.</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/rb.html
----------------------------------------------------------------------
diff --git a/rb.html b/rb.html
index a6afb80..7835a86 100644
--- a/rb.html
+++ b/rb.html
@@ -352,8 +352,9 @@ They should be in the form of a patch containing a single commit,
<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/release_notes/1.5.1.html
----------------------------------------------------------------------
diff --git a/release_notes/1.5.1.html b/release_notes/1.5.1.html
index a00504f..4bfac11 100644
--- a/release_notes/1.5.1.html
+++ b/release_notes/1.5.1.html
@@ -453,8 +453,9 @@ and, in HDFS High-Availability instances, forcing NameNode failover.</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/release_notes/1.5.2.html
----------------------------------------------------------------------
diff --git a/release_notes/1.5.2.html b/release_notes/1.5.2.html
index 0339717..2571f72 100644
--- a/release_notes/1.5.2.html
+++ b/release_notes/1.5.2.html
@@ -410,8 +410,9 @@ and, in HDFS High-Availability instances, forcing NameNode failover.</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/release_notes/1.5.3.html
----------------------------------------------------------------------
diff --git a/release_notes/1.5.3.html b/release_notes/1.5.3.html
index 294fe05..3000b87 100644
--- a/release_notes/1.5.3.html
+++ b/release_notes/1.5.3.html
@@ -360,8 +360,9 @@ Accumulo configuration from <code class="highlighter-rouge">120s</code> to <code
<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/release_notes/1.5.4.html
----------------------------------------------------------------------
diff --git a/release_notes/1.5.4.html b/release_notes/1.5.4.html
index 0fb3ba0..b06cb77 100644
--- a/release_notes/1.5.4.html
+++ b/release_notes/1.5.4.html
@@ -322,8 +322,9 @@ HDFS High-Availability instances, forcing NameNode fail-over.</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/release_notes/1.6.0.html
----------------------------------------------------------------------
diff --git a/release_notes/1.6.0.html b/release_notes/1.6.0.html
index ce57a11..248f26c 100644
--- a/release_notes/1.6.0.html
+++ b/release_notes/1.6.0.html
@@ -615,8 +615,9 @@ and, in HDFS High-Availability instances, forcing NameNode failover.</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/release_notes/1.6.1.html
----------------------------------------------------------------------
diff --git a/release_notes/1.6.1.html b/release_notes/1.6.1.html
index 2aa3b39..f7482bd 100644
--- a/release_notes/1.6.1.html
+++ b/release_notes/1.6.1.html
@@ -420,8 +420,9 @@ and, in HDFS High-Availability instances, forcing NameNode failover.</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/release_notes/1.6.2.html
----------------------------------------------------------------------
diff --git a/release_notes/1.6.2.html b/release_notes/1.6.2.html
index a668408..f34b650 100644
--- a/release_notes/1.6.2.html
+++ b/release_notes/1.6.2.html
@@ -425,8 +425,9 @@ and, in HDFS High-Availability instances, forcing NameNode failover.</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/release_notes/1.6.3.html
----------------------------------------------------------------------
diff --git a/release_notes/1.6.3.html b/release_notes/1.6.3.html
index 3602127..833665d 100644
--- a/release_notes/1.6.3.html
+++ b/release_notes/1.6.3.html
@@ -370,8 +370,9 @@ HDFS High-Availability instances, forcing NameNode failover.</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/release_notes/1.6.4.html
----------------------------------------------------------------------
diff --git a/release_notes/1.6.4.html b/release_notes/1.6.4.html
index 6606258..d7ebad3 100644
--- a/release_notes/1.6.4.html
+++ b/release_notes/1.6.4.html
@@ -311,8 +311,9 @@ HDFS High-Availability instances, forcing NameNode failover.</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/release_notes/1.6.5.html
----------------------------------------------------------------------
diff --git a/release_notes/1.6.5.html b/release_notes/1.6.5.html
index c88f554..68533fb 100644
--- a/release_notes/1.6.5.html
+++ b/release_notes/1.6.5.html
@@ -367,8 +367,9 @@ HDFS High-Availability instances, forcing NameNode failover.</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/release_notes/1.7.0.html
----------------------------------------------------------------------
diff --git a/release_notes/1.7.0.html b/release_notes/1.7.0.html
index bb40417..c59ed24 100644
--- a/release_notes/1.7.0.html
+++ b/release_notes/1.7.0.html
@@ -652,8 +652,9 @@ Accumulo configuration from <code class="highlighter-rouge">120s</code> to <code
<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/release_notes/1.7.1.html
----------------------------------------------------------------------
diff --git a/release_notes/1.7.1.html b/release_notes/1.7.1.html
index dc6dc96..30d8e01 100644
--- a/release_notes/1.7.1.html
+++ b/release_notes/1.7.1.html
@@ -402,8 +402,9 @@ HDFS High-Availability instances, forcing NameNode failover.</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/release_notes/index.html
----------------------------------------------------------------------
diff --git a/release_notes/index.html b/release_notes/index.html
index 0e428dd..17483a8 100644
--- a/release_notes/index.html
+++ b/release_notes/index.html
@@ -293,8 +293,9 @@ concerns) in updating to a new version.</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/releasing.html
----------------------------------------------------------------------
diff --git a/releasing.html b/releasing.html
index 7827b57..70ff759 100644
--- a/releasing.html
+++ b/releasing.html
@@ -389,8 +389,9 @@ to avoid known <a href="https://www.kb.cert.org/vuls/id/225657">vulnerabilities<
<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/screenshots.html
----------------------------------------------------------------------
diff --git a/screenshots.html b/screenshots.html
index e20d76d..d0fdd13 100644
--- a/screenshots.html
+++ b/screenshots.html
@@ -293,8 +293,9 @@ root@test15 ci> scan -b 1c16a4ae1bef9f1f -e 1c16a4ae1bef9f1f
<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/source.html
----------------------------------------------------------------------
diff --git a/source.html b/source.html
index 198975c..0ca16e5 100644
--- a/source.html
+++ b/source.html
@@ -483,8 +483,9 @@ nothing to commit (working directory clean)
<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/user-manual/latest.html
----------------------------------------------------------------------
diff --git a/user-manual/latest.html b/user-manual/latest.html
index 8522b26..0f02e23 100644
--- a/user-manual/latest.html
+++ b/user-manual/latest.html
@@ -251,8 +251,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/user_manual_1.3-incubating/Accumulo_Design.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/Accumulo_Design.html b/user_manual_1.3-incubating/Accumulo_Design.html
index 25f111a..47628fc 100644
--- a/user_manual_1.3-incubating/Accumulo_Design.html
+++ b/user_manual_1.3-incubating/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/user_manual_1.3-incubating/Accumulo_Shell.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/Accumulo_Shell.html b/user_manual_1.3-incubating/Accumulo_Shell.html
index f550b82..ab5fdee 100644
--- a/user_manual_1.3-incubating/Accumulo_Shell.html
+++ b/user_manual_1.3-incubating/Accumulo_Shell.html
@@ -369,8 +369,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>
[4/4] accumulo git commit: Jekyll build from gh-pages:2918196
Posted by el...@apache.org.
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>
[2/4] accumulo git commit: Jekyll build from gh-pages:2918196
Posted by el...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/user_manual_1.3-incubating/Administration.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/Administration.html b/user_manual_1.3-incubating/Administration.html
index a966686..df0bd49 100644
--- a/user_manual_1.3-incubating/Administration.html
+++ b/user_manual_1.3-incubating/Administration.html
@@ -399,8 +399,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/user_manual_1.3-incubating/Analytics.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/Analytics.html b/user_manual_1.3-incubating/Analytics.html
index e68b9ac..176ee49 100644
--- a/user_manual_1.3-incubating/Analytics.html
+++ b/user_manual_1.3-incubating/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/user_manual_1.3-incubating/Contents.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/Contents.html b/user_manual_1.3-incubating/Contents.html
index 1d2056d..28e661a 100644
--- a/user_manual_1.3-incubating/Contents.html
+++ b/user_manual_1.3-incubating/Contents.html
@@ -424,8 +424,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/user_manual_1.3-incubating/High_Speed_Ingest.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/High_Speed_Ingest.html b/user_manual_1.3-incubating/High_Speed_Ingest.html
index 99faff0..5fa9b71 100644
--- a/user_manual_1.3-incubating/High_Speed_Ingest.html
+++ b/user_manual_1.3-incubating/High_Speed_Ingest.html
@@ -317,8 +317,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/user_manual_1.3-incubating/Introduction.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/Introduction.html b/user_manual_1.3-incubating/Introduction.html
index b855d5c..051e991 100644
--- a/user_manual_1.3-incubating/Introduction.html
+++ b/user_manual_1.3-incubating/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/user_manual_1.3-incubating/Security.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/Security.html b/user_manual_1.3-incubating/Security.html
index c0b9858..a99a2b9 100644
--- a/user_manual_1.3-incubating/Security.html
+++ b/user_manual_1.3-incubating/Security.html
@@ -339,8 +339,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/user_manual_1.3-incubating/Shell_Commands.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/Shell_Commands.html b/user_manual_1.3-incubating/Shell_Commands.html
index 7d3ef40..d41b3e8 100644
--- a/user_manual_1.3-incubating/Shell_Commands.html
+++ b/user_manual_1.3-incubating/Shell_Commands.html
@@ -882,8 +882,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/user_manual_1.3-incubating/Table_Configuration.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/Table_Configuration.html b/user_manual_1.3-incubating/Table_Configuration.html
index 0f0cb7c..9b1dac3 100644
--- a/user_manual_1.3-incubating/Table_Configuration.html
+++ b/user_manual_1.3-incubating/Table_Configuration.html
@@ -562,8 +562,9 @@ table.cache.index.enable: Determines whether index cache is enabled.
<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/user_manual_1.3-incubating/Table_Design.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/Table_Design.html b/user_manual_1.3-incubating/Table_Design.html
index 45872a9..28ea261 100644
--- a/user_manual_1.3-incubating/Table_Design.html
+++ b/user_manual_1.3-incubating/Table_Design.html
@@ -422,8 +422,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/user_manual_1.3-incubating/Writing_Accumulo_Clients.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/Writing_Accumulo_Clients.html b/user_manual_1.3-incubating/Writing_Accumulo_Clients.html
index 5a0b983..1f5d6b2 100644
--- a/user_manual_1.3-incubating/Writing_Accumulo_Clients.html
+++ b/user_manual_1.3-incubating/Writing_Accumulo_Clients.html
@@ -358,8 +358,9 @@ accumulo/docs/examples/README.batch</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/user_manual_1.3-incubating/accumulo_user_manual.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/accumulo_user_manual.html b/user_manual_1.3-incubating/accumulo_user_manual.html
index 24a7404..c531f03 100644
--- a/user_manual_1.3-incubating/accumulo_user_manual.html
+++ b/user_manual_1.3-incubating/accumulo_user_manual.html
@@ -269,8 +269,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/user_manual_1.3-incubating/examples.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/examples.html b/user_manual_1.3-incubating/examples.html
index f83ffd0..29d6453 100644
--- a/user_manual_1.3-incubating/examples.html
+++ b/user_manual_1.3-incubating/examples.html
@@ -251,8 +251,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/user_manual_1.3-incubating/examples/aggregation.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/examples/aggregation.html b/user_manual_1.3-incubating/examples/aggregation.html
index 4b07059..e2d4cfb 100644
--- a/user_manual_1.3-incubating/examples/aggregation.html
+++ b/user_manual_1.3-incubating/examples/aggregation.html
@@ -277,8 +277,9 @@ applied to the column family app.</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/user_manual_1.3-incubating/examples/batch.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/examples/batch.html b/user_manual_1.3-incubating/examples/batch.html
index 5299a52..fd1b1d6 100644
--- a/user_manual_1.3-incubating/examples/batch.html
+++ b/user_manual_1.3-incubating/examples/batch.html
@@ -282,8 +282,9 @@ $ ./bin/accumulo org.apache.accumulo.examples.client.RandomBatchScanner 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/user_manual_1.3-incubating/examples/bloom.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/examples/bloom.html b/user_manual_1.3-incubating/examples/bloom.html
index 67e724a..8bfc1e1 100644
--- a/user_manual_1.3-incubating/examples/bloom.html
+++ b/user_manual_1.3-incubating/examples/bloom.html
@@ -368,8 +368,9 @@ num results : 500
<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/user_manual_1.3-incubating/examples/bulkIngest.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/examples/bulkIngest.html b/user_manual_1.3-incubating/examples/bulkIngest.html
index 48f99f0..7a6af22 100644
--- a/user_manual_1.3-incubating/examples/bulkIngest.html
+++ b/user_manual_1.3-incubating/examples/bulkIngest.html
@@ -261,8 +261,9 @@ $ ./bin/accumulo org.apache.accumulo.examples.mapreduce.bulk.VerifyIngest instan
<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/user_manual_1.3-incubating/examples/constraints.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/examples/constraints.html b/user_manual_1.3-incubating/examples/constraints.html
index 3d9b000..6426099 100644
--- a/user_manual_1.3-incubating/examples/constraints.html
+++ b/user_manual_1.3-incubating/examples/constraints.html
@@ -275,8 +275,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/user_manual_1.3-incubating/examples/dirlist.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/examples/dirlist.html b/user_manual_1.3-incubating/examples/dirlist.html
index 4d2e301..0a2aee0 100644
--- a/user_manual_1.3-incubating/examples/dirlist.html
+++ b/user_manual_1.3-incubating/examples/dirlist.html
@@ -294,8 +294,9 @@ The results can be written back to the same table.</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/user_manual_1.3-incubating/examples/filter.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/examples/filter.html b/user_manual_1.3-incubating/examples/filter.html
index cb20c38..6bb1a0e 100644
--- a/user_manual_1.3-incubating/examples/filter.html
+++ b/user_manual_1.3-incubating/examples/filter.html
@@ -338,8 +338,9 @@ the filters to be applied.</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/user_manual_1.3-incubating/examples/helloworld.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/examples/helloworld.html b/user_manual_1.3-incubating/examples/helloworld.html
index 4233787..218e20e 100644
--- a/user_manual_1.3-incubating/examples/helloworld.html
+++ b/user_manual_1.3-incubating/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/user_manual_1.3-incubating/examples/index.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/examples/index.html b/user_manual_1.3-incubating/examples/index.html
index a6b9caa..e640c32 100644
--- a/user_manual_1.3-incubating/examples/index.html
+++ b/user_manual_1.3-incubating/examples/index.html
@@ -285,8 +285,9 @@ The Accumulo user name will be referred to as “username” with password “pa
<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/user_manual_1.3-incubating/examples/mapred.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/examples/mapred.html b/user_manual_1.3-incubating/examples/mapred.html
index b6120f9..ff16977 100644
--- a/user_manual_1.3-incubating/examples/mapred.html
+++ b/user_manual_1.3-incubating/examples/mapred.html
@@ -318,8 +318,9 @@ tserver.compaction.major.concurrent.max count:20080906 [] 1
<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/user_manual_1.3-incubating/examples/shard.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/examples/shard.html b/user_manual_1.3-incubating/examples/shard.html
index 244ec23..4de610c 100644
--- a/user_manual_1.3-incubating/examples/shard.html
+++ b/user_manual_1.3-incubating/examples/shard.html
@@ -303,8 +303,9 @@ $ ./bin/accumulo org.apache.accumulo.examples.shard.Query instance zookeepers sh
<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/user_manual_1.3-incubating/index.html
----------------------------------------------------------------------
diff --git a/user_manual_1.3-incubating/index.html b/user_manual_1.3-incubating/index.html
index 24a7404..c531f03 100644
--- a/user_manual_1.3-incubating/index.html
+++ b/user_manual_1.3-incubating/index.html
@@ -269,8 +269,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/verifying_releases.html
----------------------------------------------------------------------
diff --git a/verifying_releases.html b/verifying_releases.html
index 18cf742..c7be6ba 100644
--- a/verifying_releases.html
+++ b/verifying_releases.html
@@ -334,8 +334,9 @@ own NOTICE file. The contents of the Apache Thrift NOTICE file should be include
<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/versioning.html
----------------------------------------------------------------------
diff --git a/versioning.html b/versioning.html
index 1bcf12e..db1cb06 100644
--- a/versioning.html
+++ b/versioning.html
@@ -323,8 +323,9 @@ preceding identifiers are equal. Example: 1.0.0-alpha < 1.0.0-alpha.1 < 1.
<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>