Improvements to branding, some general updates, and EPS logos

126 files changed, 174 insertions, 152 deletions

diff --git a/_layouts/global.html b/_layouts/global.html
index 3c1e01648..59e29f4f9 100644
--- a/_layouts/global.html
+++ b/_layouts/global.html
@@ -199,7 +199,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/community.md b/community.md
index bb8e369d4..d856409e6 100644
--- a/community.md
+++ b/community.md
@@ -7,7 +7,7 @@ navigation:
   show: true
 ---
 
-<h2>Spark Community</h2>
+<h2>Apache Spark Community</h2>
 
 <a name="mailing-lists"></a>
 <h3>Mailing Lists</h3>
diff --git a/documentation.md b/documentation.md
index cd5e09b2f..293c34a6a 100644
--- a/documentation.md
+++ b/documentation.md
@@ -7,7 +7,7 @@ navigation:
   show: true
 ---
 
-<h2>Spark Documentation</h2>
+<h2>Apache Spark Documentation</h2>
 
 <p>Setup instructions, programming guides, and other documentation are available for each version of Spark below:</p>
 
diff --git a/downloads.md b/downloads.md
index 2acf3ad96..116696f40 100644
--- a/downloads.md
+++ b/downloads.md
@@ -16,7 +16,7 @@ $(document).ready(function() {
 
 ## Download Apache Spark&trade;
 
-Our latest version is Spark 1.6.1, released on March 9, 2016
+Our latest version is Apache Spark 1.6.1, released on March 9, 2016
 <a href="{{site.url}}releases/spark-release-1-6-1.html">(release notes)</a>
 <a href="https://github.com/apache/spark/releases/tag/v1.6.1">(git tag)</a><br/>
 
diff --git a/examples.md b/examples.md
index bd2a52bf4..b4ac73460 100644
--- a/examples.md
+++ b/examples.md
@@ -6,7 +6,7 @@ navigation:
   weight: 4
   show: true
 ---
-<h1>Spark Examples</h1>
+<h2>Apache Spark Examples</h2>
 
 These examples give a quick overview of the Spark API.
 Spark is built on the concept of <em>distributed datasets</em>, which contain arbitrary Java or
diff --git a/faq.md b/faq.md
index 8cd540e3b..d8de57546 100644
--- a/faq.md
+++ b/faq.md
@@ -6,16 +6,16 @@ navigation:
   weight: 7
   show: true
 ---
-<h2>Spark FAQ</h2>
+<h2>Apache Spark FAQ</h2>
 
-<p class="question">How does Spark relate to Hadoop?</p>
+<p class="question">How does Spark relate to Apache Hadoop?</p>
 <p class="answer">
 Spark is a fast and general processing engine compatible with Hadoop data. It can run in Hadoop clusters through YARN or Spark's standalone mode, and it can process data in HDFS, HBase, Cassandra, Hive, and any Hadoop InputFormat. It is designed to perform both batch processing (similar to MapReduce) and new workloads like streaming, interactive queries, and machine learning.
 </p>
 
 <p class="question">Who is using Spark in production?</p>
 
-<p class="answer">As of early 2015, <a href="http://java.dzone.com/articles/apache-spark-survey-typesafe-0">surveys</a> show that more than 500 organizations are using Spark in production. Some of them are listed on the <a href="https://cwiki.apache.org/confluence/display/SPARK/Powered+By+Spark">Powered By page</a> and at the <a href="http://spark-summit.org">Spark Summit</a>.</p>
+<p class="answer">As of 2016, surveys show that more than 1000 organizations are using Spark in production. Some of them are listed on the <a href="https://cwiki.apache.org/confluence/display/SPARK/Powered+By+Spark">Powered By page</a> and at the <a href="http://spark-summit.org">Spark Summit</a>.</p>
 
 
 <p class="question">How large a cluster can Spark scale to?</p>
@@ -49,6 +49,17 @@ Spark is a fast and general processing engine compatible with Hadoop data. It ca
 
 While Spark does use a micro-batch execution model, this does not have much impact on applications, because the batches can be as short as 0.5 seconds. In most applications of streaming big data, the analytics is done over a larger window (say 10 minutes), or the latency to get data in is higher (e.g. sensors collect readings every 10 seconds). The benefit of Spark's micro-batch model is that it enables <a href="http://people.csail.mit.edu/matei/papers/2013/sosp_spark_streaming.pdf">exactly-once semantics</a>, meaning the system can recover all intermediate state and results on failure.
 
+<p class="question">Where can I find high-resolution versions of the Spark logo?</p>
+
+<p class="answer">We provide versions here:
+  <a href="images/spark-logo.eps">black logo</a>,
+  <a href="images/spark-logo-reverse.eps">white logo</a>.
+  Please be aware that Spark, Apache Spark and the Spark logo are
+  trademarks of the Apache Software Foundation, and follow the Foundation's
+  <a href="https://www.apache.org/foundation/marks/">trademark policy</a>
+  in all uses of these logos.
+</p>
+
 <p class="question">How can I contribute to Spark?</p>
 
 <p class="answer">See the <a href="https://cwiki.apache.org/confluence/display/SPARK/Contributing+to+Spark">Contributing to Spark wiki</a> for more information.</p>
diff --git a/graphx/index.md b/graphx/index.md
index 8fbc4bef0..8e7b54c56 100644
--- a/graphx/index.md
+++ b/graphx/index.md
@@ -112,7 +112,7 @@ subproject: GraphX
 <div class="row">
   <div class="col-sm-12 col-center">
     <a href="{{site.url}}downloads.html" class="btn btn-success btn-lg btn-multiline">
-      Download Spark<br/><span class="small">Includes GraphX</span>
+      Download Apache Spark<br/><span class="small">Includes GraphX</span>
     </a>
   </div>
 </div>
diff --git a/images/spark-logo-reverse.eps b/images/spark-logo-reverse.eps
new file mode 100644
index 000000000..7ccfa3522
--- /dev/null
+++ b/images/spark-logo-reverse.eps
diff --git a/images/spark-logo.eps b/images/spark-logo.eps
new file mode 100644
index 000000000..1ef5362ad
--- /dev/null
+++ b/images/spark-logo.eps
diff --git a/images/spark-logo.png b/images/spark-logo.png
index 3f3dd9d98..28a7400f7 100644
--- a/images/spark-logo.png
+++ b/images/spark-logo.png
diff --git a/index.md b/index.md
index 36f8fbe5c..fe1de4512 100644
--- a/index.md
+++ b/index.md
@@ -24,7 +24,7 @@ navigation:
     </p>
 
     <p>
-      Spark has an advanced DAG execution engine that supports cyclic data flow and
+      Apache Spark has an advanced DAG execution engine that supports cyclic data flow and
       in-memory computing.
     </p>
   </div>
@@ -113,7 +113,7 @@ navigation:
     </p>
 
     <p>
-      You can run Spark using its <a href="{{site.url}}docs/latest/spark-standalone.html">standalone cluster mode</a>, on <a href="{{site.url}}docs/latest/ec2-scripts.html">EC2</a>, on Hadoop YARN, or on <a href="http://mesos.apache.org">Apache Mesos</a>.
+      You can run Spark using its <a href="{{site.url}}docs/latest/spark-standalone.html">standalone cluster mode</a>, on <a href="{{site.url}}docs/latest/ec2-scripts.html">EC2</a>, on <a href="http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/index.html">Hadoop YARN</a>, or on <a href="http://mesos.apache.org">Apache Mesos</a>.
       Access data in <a href="http://hadoop.apache.org/docs/stable/hadoop-project-dist/hadoop-hdfs/HdfsUserGuide.html">HDFS</a>, <a href="http://cassandra.apache.org">Cassandra</a>, <a href="http://hbase.apache.org">HBase</a>,
       <a href="http://hive.apache.org">Hive</a>, <a href="http://tachyon-project.org">Tachyon</a>, and any Hadoop data source.
     </p>
@@ -143,7 +143,7 @@ navigation:
     </p>
     <ul class="list-narrow">
       <li>Use the <a href="{{site.url}}community.html#mailing-lists">mailing lists</a> to ask questions.</li>
-      <li>In-person events include the <a href="http://www.meetup.com/spark-users/">Bay Area Spark meetup</a> and
+      <li>In-person events include numerous <a href="http://www.meetup.com/topics/apache-spark/">meetup groups</a> and
       <a href="http://spark-summit.org/">Spark Summit</a>.</li>
       <li>We use <a href="https://issues.apache.org/jira/browse/SPARK">JIRA</a> for issue tracking.</li>
     </ul>
@@ -154,13 +154,13 @@ navigation:
 
     <p>
       Apache Spark is built by a wide set of developers from over 200 companies.
-      Since 2009, more than 800 developers have contributed to Spark!
+      Since 2009, more than 1000 developers have contributed to Spark!
     </p>
 
     <p>
       The project's
       <a href="https://cwiki.apache.org/confluence/display/SPARK/Committers">committers</a>
-      come from 16 organizations.
+      come from 19 organizations.
     </p>
 
     <p>
@@ -187,7 +187,7 @@ navigation:
 
 <div class="row">
   <div class="col-sm-12 col-center">
-    <a href="{{site.url}}downloads.html" class="btn btn-success btn-lg" style="width: 262px;">Download Spark</a>
+    <a href="{{site.url}}downloads.html" class="btn btn-success btn-lg" style="width: 262px;">Download Apache Spark</a>
   </div>
 </div>
 
diff --git a/mllib/index.md b/mllib/index.md
index 5d3267356..64e2c11f5 100644
--- a/mllib/index.md
+++ b/mllib/index.md
@@ -144,7 +144,7 @@ subproject: MLlib
 <div class="row">
   <div class="col-sm-12 col-center">
     <a href="{{site.url}}downloads.html" class="btn btn-success btn-lg btn-multiline">
-      Download Spark<br/><span class="small">Includes MLlib</span>
+      Download Apache Spark<br/><span class="small">Includes MLlib</span>
     </a>
   </div>
 </div>
diff --git a/site/community.html b/site/community.html
index 607c2f4dc..4f2625f62 100644
--- a/site/community.html
+++ b/site/community.html
@@ -183,7 +183,7 @@
   </div>
 
   <div class="col-md-9 col-md-pull-3">
-    <h2>Spark Community</h2>
+    <h2>Apache Spark Community</h2>
 
 <p><a name="mailing-lists"></a></p>
 <h3>Mailing Lists</h3>
@@ -346,7 +346,7 @@ A wide range of contributors now develop the project (over 400 developers from 1
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/documentation.html b/site/documentation.html
index 2e76a4efb..82ed7bfb6 100644
--- a/site/documentation.html
+++ b/site/documentation.html
@@ -183,7 +183,7 @@
   </div>
 
   <div class="col-md-9 col-md-pull-3">
-    <h2>Spark Documentation</h2>
+    <h2>Apache Spark Documentation</h2>
 
 <p>Setup instructions, programming guides, and other documentation are available for each version of Spark below:</p>
 
@@ -386,7 +386,7 @@ The following papers have been published about Spark and related projects.
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/downloads.html b/site/downloads.html
index 2a5415a18..53d3e5fd3 100644
--- a/site/downloads.html
+++ b/site/downloads.html
@@ -149,7 +149,7 @@
     <div class="news" style="margin-bottom: 20px;">
       <h5>Latest News</h5>
       <ul class="list-unstyled">
-
+        
           <li><a href="/news/spark-summit-june-2016-agenda-posted.html">Spark Summit (June 6, 2016, San Francisco) agenda posted</a>
           <span class="small">(Apr 17, 2016)</span></li>
         
@@ -161,7 +161,7 @@
         
           <li><a href="/news/spark-summit-east-agenda-posted.html">Spark Summit East (Feb 16, 2016, New York) agenda posted</a>
           <span class="small">(Jan 14, 2016)</span></li>
-
+        
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
@@ -192,7 +192,7 @@ $(document).ready(function() {
 
 <h2 id="download-apache-sparktrade">Download Apache Spark&#8482;</h2>
 
-<p>Our latest version is Spark 1.6.1, released on March 9, 2016
+<p>Our latest version is Apache Spark 1.6.1, released on March 9, 2016
 <a href="/releases/spark-release-1-6-1.html">(release notes)</a>
 <a href="https://github.com/apache/spark/releases/tag/v1.6.1">(git tag)</a><br /></p>
 
@@ -255,7 +255,7 @@ git clone git://github.com/apache/spark.git -b branch-1.6
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/examples.html b/site/examples.html
index c3009ccab..e82bdd62b 100644
--- a/site/examples.html
+++ b/site/examples.html
@@ -183,7 +183,7 @@
   </div>
 
   <div class="col-md-9 col-md-pull-3">
-    <h1>Spark Examples</h1>
+    <h2>Apache Spark Examples</h2>
 
 <p>These examples give a quick overview of the Spark API.
 Spark is built on the concept of <em>distributed datasets</em>, which contain arbitrary Java or
@@ -601,7 +601,7 @@ We learn to predict the labels from feature vectors using the Logistic Regressio
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/faq.html b/site/faq.html
index 8eecccf9e..3c2b61c3e 100644
--- a/site/faq.html
+++ b/site/faq.html
@@ -183,16 +183,16 @@
   </div>
 
   <div class="col-md-9 col-md-pull-3">
-    <h2>Spark FAQ</h2>
+    <h2>Apache Spark FAQ</h2>
 
-<p class="question">How does Spark relate to Hadoop?</p>
+<p class="question">How does Spark relate to Apache Hadoop?</p>
 <p class="answer">
 Spark is a fast and general processing engine compatible with Hadoop data. It can run in Hadoop clusters through YARN or Spark's standalone mode, and it can process data in HDFS, HBase, Cassandra, Hive, and any Hadoop InputFormat. It is designed to perform both batch processing (similar to MapReduce) and new workloads like streaming, interactive queries, and machine learning.
 </p>
 
 <p class="question">Who is using Spark in production?</p>
 
-<p class="answer">As of early 2015, <a href="http://java.dzone.com/articles/apache-spark-survey-typesafe-0">surveys</a> show that more than 500 organizations are using Spark in production. Some of them are listed on the <a href="https://cwiki.apache.org/confluence/display/SPARK/Powered+By+Spark">Powered By page</a> and at the <a href="http://spark-summit.org">Spark Summit</a>.</p>
+<p class="answer">As of 2016, surveys show that more than 1000 organizations are using Spark in production. Some of them are listed on the <a href="https://cwiki.apache.org/confluence/display/SPARK/Powered+By+Spark">Powered By page</a> and at the <a href="http://spark-summit.org">Spark Summit</a>.</p>
 
 <p class="question">How large a cluster can Spark scale to?</p>
 <p class="answer">Many organizations run Spark on clusters of thousands of nodes. The largest cluster we are know has 8000. In terms of data size, Spark has been shown to work well up to petabytes. It has been used to sort 100 TB of data 3X faster than Hadoop MapReduce on 1/10th of the machines, <a href="http://databricks.com/blog/2014/11/05/spark-officially-sets-a-new-record-in-large-scale-sorting.html">winning the 2014 Daytona GraySort Benchmark</a>, as well as to <a href="https://databricks.com/blog/2014/10/10/spark-petabyte-sort.html">sort 1 PB</a>. Several production workloads <a href="http://databricks.com/blog/2014/08/14/mining-graph-data-with-spark-at-alibaba-taobao.html">use Spark to do ETL and data analysis on PBs of data</a>.</p>
@@ -225,6 +225,17 @@ Spark is a fast and general processing engine compatible with Hadoop data. It ca
 
 While Spark does use a micro-batch execution model, this does not have much impact on applications, because the batches can be as short as 0.5 seconds. In most applications of streaming big data, the analytics is done over a larger window (say 10 minutes), or the latency to get data in is higher (e.g. sensors collect readings every 10 seconds). The benefit of Spark's micro-batch model is that it enables <a href="http://people.csail.mit.edu/matei/papers/2013/sosp_spark_streaming.pdf">exactly-once semantics</a>, meaning the system can recover all intermediate state and results on failure.
 
+<p class="question">Where can I find high-resolution versions of the Spark logo?</p>
+
+<p class="answer">We provide versions here:
+  <a href="images/spark-logo.eps">black logo</a>,
+  <a href="images/spark-logo-reverse.eps">white logo</a>.
+  Please be aware that Spark, Apache Spark and the Spark logo are
+  trademarks of the Apache Software Foundation, and follow the Foundation's
+  <a href="https://www.apache.org/foundation/marks/">trademark policy</a>
+  in all uses of these logos.
+</p>
+
 <p class="question">How can I contribute to Spark?</p>
 
 <p class="answer">See the <a href="https://cwiki.apache.org/confluence/display/SPARK/Contributing+to+Spark">Contributing to Spark wiki</a> for more information.</p>
@@ -240,7 +251,7 @@ While Spark does use a micro-batch execution model, this does not have much impa
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/graphx/index.html b/site/graphx/index.html
index f55b636c2..8c2951abc 100644
--- a/site/graphx/index.html
+++ b/site/graphx/index.html
@@ -291,7 +291,7 @@
 <div class="row">
   <div class="col-sm-12 col-center">
     <a href="/downloads.html" class="btn btn-success btn-lg btn-multiline">
-      Download Spark<br /><span class="small">Includes GraphX</span>
+      Download Apache Spark<br /><span class="small">Includes GraphX</span>
     </a>
   </div>
 </div>
@@ -303,7 +303,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/images/spark-logo.png b/site/images/spark-logo.png
index 3f3dd9d98..28a7400f7 100644
--- a/site/images/spark-logo.png
+++ b/site/images/spark-logo.png
diff --git a/site/index.html b/site/index.html
index 9796de16c..5c7f29ecf 100644
--- a/site/index.html
+++ b/site/index.html
@@ -199,7 +199,7 @@
     </p>
 
     <p>
-      Spark has an advanced DAG execution engine that supports cyclic data flow and
+      Apache Spark has an advanced DAG execution engine that supports cyclic data flow and
       in-memory computing.
     </p>
   </div>
@@ -283,7 +283,7 @@
     </p>
 
     <p>
-      You can run Spark using its <a href="/docs/latest/spark-standalone.html">standalone cluster mode</a>, on <a href="/docs/latest/ec2-scripts.html">EC2</a>, on Hadoop YARN, or on <a href="http://mesos.apache.org">Apache Mesos</a>.
+      You can run Spark using its <a href="/docs/latest/spark-standalone.html">standalone cluster mode</a>, on <a href="/docs/latest/ec2-scripts.html">EC2</a>, on <a href="http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/index.html">Hadoop YARN</a>, or on <a href="http://mesos.apache.org">Apache Mesos</a>.
       Access data in <a href="http://hadoop.apache.org/docs/stable/hadoop-project-dist/hadoop-hdfs/HdfsUserGuide.html">HDFS</a>, <a href="http://cassandra.apache.org">Cassandra</a>, <a href="http://hbase.apache.org">HBase</a>,
       <a href="http://hive.apache.org">Hive</a>, <a href="http://tachyon-project.org">Tachyon</a>, and any Hadoop data source.
     </p>
@@ -316,7 +316,7 @@
     </p>
     <ul class="list-narrow">
       <li>Use the <a href="/community.html#mailing-lists">mailing lists</a> to ask questions.</li>
-      <li>In-person events include the <a href="http://www.meetup.com/spark-users/">Bay Area Spark meetup</a> and
+      <li>In-person events include numerous <a href="http://www.meetup.com/topics/apache-spark/">meetup groups</a> and
       <a href="http://spark-summit.org/">Spark Summit</a>.</li>
       <li>We use <a href="https://issues.apache.org/jira/browse/SPARK">JIRA</a> for issue tracking.</li>
     </ul>
@@ -327,13 +327,13 @@
 
     <p>
       Apache Spark is built by a wide set of developers from over 200 companies.
-      Since 2009, more than 800 developers have contributed to Spark!
+      Since 2009, more than 1000 developers have contributed to Spark!
     </p>
 
     <p>
       The project's
       <a href="https://cwiki.apache.org/confluence/display/SPARK/Committers">committers</a>
-      come from 16 organizations.
+      come from 19 organizations.
     </p>
 
     <p>
@@ -360,7 +360,7 @@
 
 <div class="row">
   <div class="col-sm-12 col-center">
-    <a href="/downloads.html" class="btn btn-success btn-lg" style="width: 262px;">Download Spark</a>
+    <a href="/downloads.html" class="btn btn-success btn-lg" style="width: 262px;">Download Apache Spark</a>
   </div>
 </div>
 
@@ -369,7 +369,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/mailing-lists.html b/site/mailing-lists.html
index 53851d48d..6cba53b25 100644
--- a/site/mailing-lists.html
+++ b/site/mailing-lists.html
@@ -195,7 +195,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/mllib/index.html b/site/mllib/index.html
index 918e44c2b..6ccd69a0e 100644
--- a/site/mllib/index.html
+++ b/site/mllib/index.html
@@ -327,7 +327,7 @@
 <div class="row">
   <div class="col-sm-12 col-center">
     <a href="/downloads.html" class="btn btn-success btn-lg btn-multiline">
-      Download Spark<br /><span class="small">Includes MLlib</span>
+      Download Apache Spark<br /><span class="small">Includes MLlib</span>
     </a>
   </div>
 </div>
@@ -337,7 +337,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/amp-camp-2013-registration-ope.html b/site/news/amp-camp-2013-registration-ope.html
index 36aa6c5a2..b1d49d6b6 100644
--- a/site/news/amp-camp-2013-registration-ope.html
+++ b/site/news/amp-camp-2013-registration-ope.html
@@ -201,7 +201,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/announcing-the-first-spark-summit.html b/site/news/announcing-the-first-spark-summit.html
index 47ea9c4fa..1d69f5b8c 100644
--- a/site/news/announcing-the-first-spark-summit.html
+++ b/site/news/announcing-the-first-spark-summit.html
@@ -205,7 +205,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/fourth-spark-screencast-published.html b/site/news/fourth-spark-screencast-published.html
index 487e3a879..91f152f95 100644
--- a/site/news/fourth-spark-screencast-published.html
+++ b/site/news/fourth-spark-screencast-published.html
@@ -205,7 +205,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/index.html b/site/news/index.html
index 5eec8beac..71b49be57 100644
--- a/site/news/index.html
+++ b/site/news/index.html
@@ -871,7 +871,7 @@ Over 450 Spark developers and enthusiasts from 13 countries and more than 180 co
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/nsdi-paper.html b/site/news/nsdi-paper.html
index eded93f96..de0c4fac7 100644
--- a/site/news/nsdi-paper.html
+++ b/site/news/nsdi-paper.html
@@ -201,7 +201,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/one-month-to-spark-summit-2015.html b/site/news/one-month-to-spark-summit-2015.html
index 9eee8a048..53455228d 100644
--- a/site/news/one-month-to-spark-summit-2015.html
+++ b/site/news/one-month-to-spark-summit-2015.html
@@ -207,7 +207,7 @@ online to attend in person. We hope you enjoy the event!</p>
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/proposals-open-for-spark-summit-east.html b/site/news/proposals-open-for-spark-summit-east.html
index 7aef61846..e4c7a6977 100644
--- a/site/news/proposals-open-for-spark-summit-east.html
+++ b/site/news/proposals-open-for-spark-summit-east.html
@@ -205,7 +205,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/registration-open-for-spark-summit-east.html b/site/news/registration-open-for-spark-summit-east.html
index 2ee972e36..bab576cff 100644
--- a/site/news/registration-open-for-spark-summit-east.html
+++ b/site/news/registration-open-for-spark-summit-east.html
@@ -205,7 +205,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/run-spark-and-shark-on-amazon-emr.html b/site/news/run-spark-and-shark-on-amazon-emr.html
index 02e78eb8a..a2271b928 100644
--- a/site/news/run-spark-and-shark-on-amazon-emr.html
+++ b/site/news/run-spark-and-shark-on-amazon-emr.html
@@ -201,7 +201,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-0-6-1-and-0-5-2-released.html b/site/news/spark-0-6-1-and-0-5-2-released.html
index 84605178b..7d024367c 100644
--- a/site/news/spark-0-6-1-and-0-5-2-released.html
+++ b/site/news/spark-0-6-1-and-0-5-2-released.html
@@ -201,7 +201,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-0-6-2-released.html b/site/news/spark-0-6-2-released.html
index 0ff79b9b9..c603161ea 100644
--- a/site/news/spark-0-6-2-released.html
+++ b/site/news/spark-0-6-2-released.html
@@ -201,7 +201,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-0-7-0-released.html b/site/news/spark-0-7-0-released.html
index 5d9c0e485..33cc0f0e7 100644
--- a/site/news/spark-0-7-0-released.html
+++ b/site/news/spark-0-7-0-released.html
@@ -201,7 +201,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-0-7-2-released.html b/site/news/spark-0-7-2-released.html
index 284047e9a..1343a0479 100644
--- a/site/news/spark-0-7-2-released.html
+++ b/site/news/spark-0-7-2-released.html
@@ -201,7 +201,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-0-7-3-released.html b/site/news/spark-0-7-3-released.html
index 297c8ef17..767ef7adc 100644
--- a/site/news/spark-0-7-3-released.html
+++ b/site/news/spark-0-7-3-released.html
@@ -201,7 +201,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-0-8-0-released.html b/site/news/spark-0-8-0-released.html
index 042a01304..5a788f9d9 100644
--- a/site/news/spark-0-8-0-released.html
+++ b/site/news/spark-0-8-0-released.html
@@ -201,7 +201,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-0-8-1-released.html b/site/news/spark-0-8-1-released.html
index 1a25162ad..f5008cb31 100644
--- a/site/news/spark-0-8-1-released.html
+++ b/site/news/spark-0-8-1-released.html
@@ -201,7 +201,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-0-9-0-released.html b/site/news/spark-0-9-0-released.html
index bec72ab81..f6ec74b37 100644
--- a/site/news/spark-0-9-0-released.html
+++ b/site/news/spark-0-9-0-released.html
@@ -208,7 +208,7 @@ to read about the new features, or <a href="/downloads.html">download</a> the re
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-0-9-1-released.html b/site/news/spark-0-9-1-released.html
index 5674ce5d0..f53fcb3b8 100644
--- a/site/news/spark-0-9-1-released.html
+++ b/site/news/spark-0-9-1-released.html
@@ -207,7 +207,7 @@ to read about the new features, or <a href="/downloads.html">download</a> the re
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-0-9-2-released.html b/site/news/spark-0-9-2-released.html
index 1653747f1..09b454d6a 100644
--- a/site/news/spark-0-9-2-released.html
+++ b/site/news/spark-0-9-2-released.html
@@ -206,7 +206,7 @@ to read about the new features, or <a href="/downloads.html">download</a> the re
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-1-0-0-released.html b/site/news/spark-1-0-0-released.html
index 4545fafda..f20dfd5cc 100644
--- a/site/news/spark-1-0-0-released.html
+++ b/site/news/spark-1-0-0-released.html
@@ -204,7 +204,7 @@ This release expands Spark&#8217;s standard libraries, introducing a new SQL pac
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-1-0-1-released.html b/site/news/spark-1-0-1-released.html
index 5fb9701af..d2478965f 100644
--- a/site/news/spark-1-0-1-released.html
+++ b/site/news/spark-1-0-1-released.html
@@ -203,7 +203,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-1-0-2-released.html b/site/news/spark-1-0-2-released.html
index 8cd475926..d805423d5 100644
--- a/site/news/spark-1-0-2-released.html
+++ b/site/news/spark-1-0-2-released.html
@@ -203,7 +203,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-1-1-0-released.html b/site/news/spark-1-1-0-released.html
index 5d0d28b66..fd740c1f0 100644
--- a/site/news/spark-1-1-0-released.html
+++ b/site/news/spark-1-1-0-released.html
@@ -205,7 +205,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-1-1-1-released.html b/site/news/spark-1-1-1-released.html
index dae2dc55e..42e22aac9 100644
--- a/site/news/spark-1-1-1-released.html
+++ b/site/news/spark-1-1-1-released.html
@@ -203,7 +203,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-1-2-0-released.html b/site/news/spark-1-2-0-released.html
index 921b7587b..e397822fc 100644
--- a/site/news/spark-1-2-0-released.html
+++ b/site/news/spark-1-2-0-released.html
@@ -205,7 +205,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-1-2-1-released.html b/site/news/spark-1-2-1-released.html
index 52d5ce0a4..eaba3f7a3 100644
--- a/site/news/spark-1-2-1-released.html
+++ b/site/news/spark-1-2-1-released.html
@@ -203,7 +203,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-1-2-2-released.html b/site/news/spark-1-2-2-released.html
index caeaf25af..abe59fffd 100644
--- a/site/news/spark-1-2-2-released.html
+++ b/site/news/spark-1-2-2-released.html
@@ -203,7 +203,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-1-3-0-released.html b/site/news/spark-1-3-0-released.html
index 9729041b2..2b804747e 100644
--- a/site/news/spark-1-3-0-released.html
+++ b/site/news/spark-1-3-0-released.html
@@ -203,7 +203,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-1-4-0-released.html b/site/news/spark-1-4-0-released.html
index 262e62376..2b836e007 100644
--- a/site/news/spark-1-4-0-released.html
+++ b/site/news/spark-1-4-0-released.html
@@ -203,7 +203,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-1-4-1-released.html b/site/news/spark-1-4-1-released.html
index 5d16dc363..526049a96 100644
--- a/site/news/spark-1-4-1-released.html
+++ b/site/news/spark-1-4-1-released.html
@@ -203,7 +203,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-1-5-0-released.html b/site/news/spark-1-5-0-released.html
index ed8a00135..94b4aff46 100644
--- a/site/news/spark-1-5-0-released.html
+++ b/site/news/spark-1-5-0-released.html
@@ -203,7 +203,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-1-5-1-released.html b/site/news/spark-1-5-1-released.html
index 15afe031d..ca042255c 100644
--- a/site/news/spark-1-5-1-released.html
+++ b/site/news/spark-1-5-1-released.html
@@ -203,7 +203,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-1-5-2-released.html b/site/news/spark-1-5-2-released.html
index 40cf6915f..3a573bf50 100644
--- a/site/news/spark-1-5-2-released.html
+++ b/site/news/spark-1-5-2-released.html
@@ -203,7 +203,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-1-6-0-released.html b/site/news/spark-1-6-0-released.html
index 9b088ea92..91efcd8fb 100644
--- a/site/news/spark-1-6-0-released.html
+++ b/site/news/spark-1-6-0-released.html
@@ -207,7 +207,7 @@ to read about the new features, or <a href="/downloads.html">download</a> the re
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-1-6-1-released.html b/site/news/spark-1-6-1-released.html
index d3503f646..93a4c780d 100644
--- a/site/news/spark-1-6-1-released.html
+++ b/site/news/spark-1-6-1-released.html
@@ -203,7 +203,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-accepted-into-apache-incubator.html b/site/news/spark-accepted-into-apache-incubator.html
index a3e3cd3f0..df89fbb20 100644
--- a/site/news/spark-accepted-into-apache-incubator.html
+++ b/site/news/spark-accepted-into-apache-incubator.html
@@ -201,7 +201,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-and-shark-in-the-news.html b/site/news/spark-and-shark-in-the-news.html
index 95a38e185..a165870ad 100644
--- a/site/news/spark-and-shark-in-the-news.html
+++ b/site/news/spark-and-shark-in-the-news.html
@@ -211,7 +211,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-becomes-tlp.html b/site/news/spark-becomes-tlp.html
index 128120306..9aabd82ed 100644
--- a/site/news/spark-becomes-tlp.html
+++ b/site/news/spark-becomes-tlp.html
@@ -203,7 +203,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-featured-in-wired.html b/site/news/spark-featured-in-wired.html
index b08eef61e..b0829ea33 100644
--- a/site/news/spark-featured-in-wired.html
+++ b/site/news/spark-featured-in-wired.html
@@ -201,7 +201,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-mailing-lists-moving-to-apache.html b/site/news/spark-mailing-lists-moving-to-apache.html
index 7da2c51d8..511d3fb95 100644
--- a/site/news/spark-mailing-lists-moving-to-apache.html
+++ b/site/news/spark-mailing-lists-moving-to-apache.html
@@ -212,7 +212,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-meetups.html b/site/news/spark-meetups.html
index de7ba9708..9a466a0d3 100644
--- a/site/news/spark-meetups.html
+++ b/site/news/spark-meetups.html
@@ -201,7 +201,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-screencasts-published.html b/site/news/spark-screencasts-published.html
index 4ee9448c5..1bca81f5b 100644
--- a/site/news/spark-screencasts-published.html
+++ b/site/news/spark-screencasts-published.html
@@ -207,7 +207,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-summit-2013-is-a-wrap.html b/site/news/spark-summit-2013-is-a-wrap.html
index 7da31fa14..7d77421bb 100644
--- a/site/news/spark-summit-2013-is-a-wrap.html
+++ b/site/news/spark-summit-2013-is-a-wrap.html
@@ -207,7 +207,7 @@ Over 450 Spark developers and enthusiasts from 13 countries and more than 180 co
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-summit-2014-videos-posted.html b/site/news/spark-summit-2014-videos-posted.html
index 985e5fc6f..0acda4bb0 100644
--- a/site/news/spark-summit-2014-videos-posted.html
+++ b/site/news/spark-summit-2014-videos-posted.html
@@ -203,7 +203,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-summit-2015-videos-posted.html b/site/news/spark-summit-2015-videos-posted.html
index b962970f1..5cb8fc997 100644
--- a/site/news/spark-summit-2015-videos-posted.html
+++ b/site/news/spark-summit-2015-videos-posted.html
@@ -201,7 +201,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-summit-agenda-posted.html b/site/news/spark-summit-agenda-posted.html
index 3ecd428ba..c8e79498d 100644
--- a/site/news/spark-summit-agenda-posted.html
+++ b/site/news/spark-summit-agenda-posted.html
@@ -209,7 +209,7 @@ about the latest happenings in Spark.</p>
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-summit-east-2015-videos-posted.html b/site/news/spark-summit-east-2015-videos-posted.html
index a7b6d242d..0a72dc892 100644
--- a/site/news/spark-summit-east-2015-videos-posted.html
+++ b/site/news/spark-summit-east-2015-videos-posted.html
@@ -203,7 +203,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-summit-east-2016-cfp-closing.html b/site/news/spark-summit-east-2016-cfp-closing.html
index a7bd4a422..7eca6ed2d 100644
--- a/site/news/spark-summit-east-2016-cfp-closing.html
+++ b/site/news/spark-summit-east-2016-cfp-closing.html
@@ -201,7 +201,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-summit-east-agenda-posted.html b/site/news/spark-summit-east-agenda-posted.html
index 32e59a154..db08894cc 100644
--- a/site/news/spark-summit-east-agenda-posted.html
+++ b/site/news/spark-summit-east-agenda-posted.html
@@ -201,7 +201,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-summit-europe-agenda-posted.html b/site/news/spark-summit-europe-agenda-posted.html
index 39c1df0c2..12213d32a 100644
--- a/site/news/spark-summit-europe-agenda-posted.html
+++ b/site/news/spark-summit-europe-agenda-posted.html
@@ -201,7 +201,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-summit-europe.html b/site/news/spark-summit-europe.html
index c63f62387..1fb1e695c 100644
--- a/site/news/spark-summit-europe.html
+++ b/site/news/spark-summit-europe.html
@@ -201,7 +201,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-summit-june-2016-agenda-posted.html b/site/news/spark-summit-june-2016-agenda-posted.html
index 966e0f66c..4e7436bf4 100644
--- a/site/news/spark-summit-june-2016-agenda-posted.html
+++ b/site/news/spark-summit-june-2016-agenda-posted.html
@@ -201,7 +201,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-tips-from-quantifind.html b/site/news/spark-tips-from-quantifind.html
index cdb65f12f..6b9b83989 100644
--- a/site/news/spark-tips-from-quantifind.html
+++ b/site/news/spark-tips-from-quantifind.html
@@ -206,7 +206,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-user-survey-and-powered-by-page.html b/site/news/spark-user-survey-and-powered-by-page.html
index 1abda86b2..61a516beb 100644
--- a/site/news/spark-user-survey-and-powered-by-page.html
+++ b/site/news/spark-user-survey-and-powered-by-page.html
@@ -205,7 +205,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-version-0-6-0-released.html b/site/news/spark-version-0-6-0-released.html
index 1589e6ec5..9260402a4 100644
--- a/site/news/spark-version-0-6-0-released.html
+++ b/site/news/spark-version-0-6-0-released.html
@@ -201,7 +201,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/spark-wins-daytona-gray-sort-100tb-benchmark.html b/site/news/spark-wins-daytona-gray-sort-100tb-benchmark.html
index fc9d9c9e4..f950cb5f2 100644
--- a/site/news/spark-wins-daytona-gray-sort-100tb-benchmark.html
+++ b/site/news/spark-wins-daytona-gray-sort-100tb-benchmark.html
@@ -207,7 +207,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/strata-exercises-now-available-online.html b/site/news/strata-exercises-now-available-online.html
index b1c9a8370..81fa932b0 100644
--- a/site/news/strata-exercises-now-available-online.html
+++ b/site/news/strata-exercises-now-available-online.html
@@ -201,7 +201,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/submit-talks-to-spark-summit-2014.html b/site/news/submit-talks-to-spark-summit-2014.html
index b377a26fe..7327d6210 100644
--- a/site/news/submit-talks-to-spark-summit-2014.html
+++ b/site/news/submit-talks-to-spark-summit-2014.html
@@ -210,7 +210,7 @@ on Spark.</p>
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/submit-talks-to-spark-summit-2016.html b/site/news/submit-talks-to-spark-summit-2016.html
index fc3eac020..a3fbc3e29 100644
--- a/site/news/submit-talks-to-spark-summit-2016.html
+++ b/site/news/submit-talks-to-spark-summit-2016.html
@@ -202,7 +202,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/submit-talks-to-spark-summit-east-2016.html b/site/news/submit-talks-to-spark-summit-east-2016.html
index 1aa708ffe..0d176e609 100644
--- a/site/news/submit-talks-to-spark-summit-east-2016.html
+++ b/site/news/submit-talks-to-spark-summit-east-2016.html
@@ -201,7 +201,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/two-weeks-to-spark-summit-2014.html b/site/news/two-weeks-to-spark-summit-2014.html
index 5961dc317..e9dcba663 100644
--- a/site/news/two-weeks-to-spark-summit-2014.html
+++ b/site/news/two-weeks-to-spark-summit-2014.html
@@ -211,7 +211,7 @@ online to attend in person. Otherwise, the Summit will offer a free live video s
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/news/video-from-first-spark-development-meetup.html b/site/news/video-from-first-spark-development-meetup.html
index be64c8ddd..b89f68ed0 100644
--- a/site/news/video-from-first-spark-development-meetup.html
+++ b/site/news/video-from-first-spark-development-meetup.html
@@ -201,7 +201,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-0-3.html b/site/releases/spark-release-0-3.html
index 8bd0dd990..819dabad8 100644
--- a/site/releases/spark-release-0-3.html
+++ b/site/releases/spark-release-0-3.html
@@ -252,7 +252,7 @@ squares.saveAsSequenceFile(<span class="string">"hdfs://..."</span>)
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-0-5-0.html b/site/releases/spark-release-0-5-0.html
index f0c3ba2e6..f8dcf084e 100644
--- a/site/releases/spark-release-0-5-0.html
+++ b/site/releases/spark-release-0-5-0.html
@@ -224,7 +224,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-0-5-1.html b/site/releases/spark-release-0-5-1.html
index 26a5872b4..b7469c889 100644
--- a/site/releases/spark-release-0-5-1.html
+++ b/site/releases/spark-release-0-5-1.html
@@ -234,7 +234,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-0-5-2.html b/site/releases/spark-release-0-5-2.html
index 1aea3f96c..9360f26a4 100644
--- a/site/releases/spark-release-0-5-2.html
+++ b/site/releases/spark-release-0-5-2.html
@@ -203,7 +203,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-0-6-0.html b/site/releases/spark-release-0-6-0.html
index 65d8ab972..074d3b154 100644
--- a/site/releases/spark-release-0-6-0.html
+++ b/site/releases/spark-release-0-6-0.html
@@ -278,7 +278,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-0-6-1.html b/site/releases/spark-release-0-6-1.html
index e6f75526f..f623cfc2d 100644
--- a/site/releases/spark-release-0-6-1.html
+++ b/site/releases/spark-release-0-6-1.html
@@ -218,7 +218,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-0-6-2.html b/site/releases/spark-release-0-6-2.html
index 8490b51b4..43f0d2b26 100644
--- a/site/releases/spark-release-0-6-2.html
+++ b/site/releases/spark-release-0-6-2.html
@@ -232,7 +232,7 @@ In total, eleven people contributed to this release:
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-0-7-0.html b/site/releases/spark-release-0-7-0.html
index 14641162d..b4ad944f6 100644
--- a/site/releases/spark-release-0-7-0.html
+++ b/site/releases/spark-release-0-7-0.html
@@ -300,7 +300,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-0-7-2.html b/site/releases/spark-release-0-7-2.html
index 9fb44bb6b..71e0466e1 100644
--- a/site/releases/spark-release-0-7-2.html
+++ b/site/releases/spark-release-0-7-2.html
@@ -242,7 +242,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-0-7-3.html b/site/releases/spark-release-0-7-3.html
index ef9398cc2..5411efa8b 100644
--- a/site/releases/spark-release-0-7-3.html
+++ b/site/releases/spark-release-0-7-3.html
@@ -236,7 +236,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-0-8-0.html b/site/releases/spark-release-0-8-0.html
index 0c64d7f3b..e93b50fa9 100644
--- a/site/releases/spark-release-0-8-0.html
+++ b/site/releases/spark-release-0-8-0.html
@@ -331,7 +331,7 @@ We’d especially like to thank Patrick Wendell for acting as the release manage
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-0-8-1.html b/site/releases/spark-release-0-8-1.html
index 738fbed50..03deb78b9 100644
--- a/site/releases/spark-release-0-8-1.html
+++ b/site/releases/spark-release-0-8-1.html
@@ -295,7 +295,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-0-9-0.html b/site/releases/spark-release-0-9-0.html
index ab61b297a..3ea156cca 100644
--- a/site/releases/spark-release-0-9-0.html
+++ b/site/releases/spark-release-0-9-0.html
@@ -389,7 +389,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-0-9-1.html b/site/releases/spark-release-0-9-1.html
index 1d29d5a26..eefb28452 100644
--- a/site/releases/spark-release-0-9-1.html
+++ b/site/releases/spark-release-0-9-1.html
@@ -307,7 +307,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-0-9-2.html b/site/releases/spark-release-0-9-2.html
index 99c67913a..0af345356 100644
--- a/site/releases/spark-release-0-9-2.html
+++ b/site/releases/spark-release-0-9-2.html
@@ -280,7 +280,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-1-0-0.html b/site/releases/spark-release-1-0-0.html
index 6cb088335..e2cb8de0b 100644
--- a/site/releases/spark-release-1-0-0.html
+++ b/site/releases/spark-release-1-0-0.html
@@ -373,7 +373,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-1-0-1.html b/site/releases/spark-release-1-0-1.html
index 5415b6dcb..206bcc4be 100644
--- a/site/releases/spark-release-1-0-1.html
+++ b/site/releases/spark-release-1-0-1.html
@@ -331,7 +331,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-1-0-2.html b/site/releases/spark-release-1-0-2.html
index 01e5fc6d2..efead40b5 100644
--- a/site/releases/spark-release-1-0-2.html
+++ b/site/releases/spark-release-1-0-2.html
@@ -288,7 +288,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-1-1-0.html b/site/releases/spark-release-1-1-0.html
index 6ad416891..8f7deef05 100644
--- a/site/releases/spark-release-1-1-0.html
+++ b/site/releases/spark-release-1-1-0.html
@@ -424,7 +424,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-1-1-1.html b/site/releases/spark-release-1-1-1.html
index 8da000644..7e3f2ab10 100644
--- a/site/releases/spark-release-1-1-1.html
+++ b/site/releases/spark-release-1-1-1.html
@@ -310,7 +310,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-1-2-0.html b/site/releases/spark-release-1-2-0.html
index 4f33db137..46cabc101 100644
--- a/site/releases/spark-release-1-2-0.html
+++ b/site/releases/spark-release-1-2-0.html
@@ -438,7 +438,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-1-2-1.html b/site/releases/spark-release-1-2-1.html
index 8391007f4..dd27f11a4 100644
--- a/site/releases/spark-release-1-2-1.html
+++ b/site/releases/spark-release-1-2-1.html
@@ -310,7 +310,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-1-2-2.html b/site/releases/spark-release-1-2-2.html
index 91d0c3be0..3e0026365 100644
--- a/site/releases/spark-release-1-2-2.html
+++ b/site/releases/spark-release-1-2-2.html
@@ -270,7 +270,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-1-3-0.html b/site/releases/spark-release-1-3-0.html
index d434f58ae..b5d486519 100644
--- a/site/releases/spark-release-1-3-0.html
+++ b/site/releases/spark-release-1-3-0.html
@@ -415,7 +415,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-1-3-1.html b/site/releases/spark-release-1-3-1.html
index b94523cc4..cf7147f29 100644
--- a/site/releases/spark-release-1-3-1.html
+++ b/site/releases/spark-release-1-3-1.html
@@ -302,7 +302,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-1-4-0.html b/site/releases/spark-release-1-4-0.html
index 7fe3e72a0..98274278b 100644
--- a/site/releases/spark-release-1-4-0.html
+++ b/site/releases/spark-release-1-4-0.html
@@ -529,7 +529,7 @@ Python coverage. MLlib also adds several new algorithms.</p>
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-1-4-1.html b/site/releases/spark-release-1-4-1.html
index 8164ef456..89634bfb7 100644
--- a/site/releases/spark-release-1-4-1.html
+++ b/site/releases/spark-release-1-4-1.html
@@ -334,7 +334,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-1-5-0.html b/site/releases/spark-release-1-5-0.html
index 3c96176a4..51958de15 100644
--- a/site/releases/spark-release-1-5-0.html
+++ b/site/releases/spark-release-1-5-0.html
@@ -467,7 +467,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-1-5-1.html b/site/releases/spark-release-1-5-1.html
index 30e995acf..b41dc1bec 100644
--- a/site/releases/spark-release-1-5-1.html
+++ b/site/releases/spark-release-1-5-1.html
@@ -206,7 +206,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-1-5-2.html b/site/releases/spark-release-1-5-2.html
index f4add64f7..5846a699c 100644
--- a/site/releases/spark-release-1-5-2.html
+++ b/site/releases/spark-release-1-5-2.html
@@ -205,7 +205,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-1-6-0.html b/site/releases/spark-release-1-6-0.html
index 143043bd4..d86344651 100644
--- a/site/releases/spark-release-1-6-0.html
+++ b/site/releases/spark-release-1-6-0.html
@@ -343,7 +343,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/releases/spark-release-1-6-1.html b/site/releases/spark-release-1-6-1.html
index 8a4ee724b..5694165aa 100644
--- a/site/releases/spark-release-1-6-1.html
+++ b/site/releases/spark-release-1-6-1.html
@@ -205,7 +205,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/research.html b/site/research.html
index 83c6d6ff9..75f46fa5b 100644
--- a/site/research.html
+++ b/site/research.html
@@ -243,7 +243,7 @@ Spark offers an abstraction called <a href="http://www.cs.berkeley.edu/~matei/pa
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/screencasts/1-first-steps-with-spark.html b/site/screencasts/1-first-steps-with-spark.html
index d3e2d899d..9991c7271 100644
--- a/site/screencasts/1-first-steps-with-spark.html
+++ b/site/screencasts/1-first-steps-with-spark.html
@@ -211,7 +211,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/screencasts/2-spark-documentation-overview.html b/site/screencasts/2-spark-documentation-overview.html
index d20664506..41c1f069f 100644
--- a/site/screencasts/2-spark-documentation-overview.html
+++ b/site/screencasts/2-spark-documentation-overview.html
@@ -211,7 +211,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/screencasts/3-transformations-and-caching.html b/site/screencasts/3-transformations-and-caching.html
index 3ad91ad2f..ec1da3534 100644
--- a/site/screencasts/3-transformations-and-caching.html
+++ b/site/screencasts/3-transformations-and-caching.html
@@ -207,7 +207,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/screencasts/4-a-standalone-job-in-spark.html b/site/screencasts/4-a-standalone-job-in-spark.html
index 12e3a96ce..44edf1cdc 100644
--- a/site/screencasts/4-a-standalone-job-in-spark.html
+++ b/site/screencasts/4-a-standalone-job-in-spark.html
@@ -205,7 +205,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/screencasts/index.html b/site/screencasts/index.html
index e3f094bd4..be832309f 100644
--- a/site/screencasts/index.html
+++ b/site/screencasts/index.html
@@ -237,7 +237,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/sql/index.html b/site/sql/index.html
index 61b5167d2..a93e79ea9 100644
--- a/site/sql/index.html
+++ b/site/sql/index.html
@@ -187,7 +187,7 @@
 
   <div class="col-md-9 col-md-pull-3">
     <div class="jumbotron">
-  <b>Spark SQL</b> is Spark's module for working with structured data.
+  <b>Spark SQL</b> is Apache Spark's module for working with structured data.
 </div>
 
 <div class="row row-padded">
@@ -343,7 +343,7 @@
 <div class="row">
   <div class="col-sm-12 col-center">
     <a href="/downloads.html" class="btn btn-success btn-lg btn-multiline">
-      Download Spark<br /><span class="small">Includes Spark SQL</span>
+      Download Apache Spark<br /><span class="small">Includes Spark SQL</span>
     </a>
   </div>
 </div>
@@ -353,7 +353,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/site/streaming/index.html b/site/streaming/index.html
index 8506bfabc..a8e785738 100644
--- a/site/streaming/index.html
+++ b/site/streaming/index.html
@@ -198,7 +198,7 @@
       Build applications through high-level operators.
     </p>
     <p>
-      Spark Streaming brings Spark's
+      Spark Streaming brings Apache Spark's
       <a href="/docs/latest/streaming-programming-guide.html">language-integrated API</a>
       to stream processing, letting you write streaming jobs the same way you write batch jobs.
       It supports Java, Scala and Python.
@@ -321,7 +321,7 @@
 <div class="row">
   <div class="col-sm-12 col-center">
     <a href="/downloads.html" class="btn btn-success btn-lg btn-multiline">
-      Download Spark<br /><span class="small">Includes Spark Streaming</span>
+      Download Apache Spark<br /><span class="small">Includes Spark Streaming</span>
     </a>
   </div>
 </div>
@@ -331,7 +331,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="https://www.apache.org/foundation/marks/">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/sql/index.md b/sql/index.md
index 890da322e..077c9efe4 100644
--- a/sql/index.md
+++ b/sql/index.md
@@ -8,7 +8,7 @@ subproject: SQL
 
 
 <div class="jumbotron">
-  <b>Spark SQL</b> is Spark's module for working with structured data.
+  <b>Spark SQL</b> is Apache Spark's module for working with structured data.
 </div>
 
 
@@ -162,7 +162,7 @@ subproject: SQL
 <div class="row">
   <div class="col-sm-12 col-center">
     <a href="{{site.url}}downloads.html" class="btn btn-success btn-lg btn-multiline">
-      Download Spark<br/><span class="small">Includes Spark SQL</span>
+      Download Apache Spark<br/><span class="small">Includes Spark SQL</span>
     </a>
   </div>
 </div>
diff --git a/streaming/index.md b/streaming/index.md
index eeb32f30b..2971a6c91 100644
--- a/streaming/index.md
+++ b/streaming/index.md
@@ -21,7 +21,7 @@ subproject: Streaming
       Build applications through high-level operators.
     </p>
     <p>
-      Spark Streaming brings Spark's
+      Spark Streaming brings Apache Spark's
       <a href="{{site.url}}docs/latest/streaming-programming-guide.html">language-integrated API</a>
       to stream processing, letting you write streaming jobs the same way you write batch jobs.
       It supports Java, Scala and Python.
@@ -142,7 +142,7 @@ subproject: Streaming
 <div class="row">
   <div class="col-sm-12 col-center">
     <a href="{{site.url}}downloads.html" class="btn btn-success btn-lg btn-multiline">
-      Download Spark<br/><span class="small">Includes Spark Streaming</span>
+      Download Apache Spark<br/><span class="small">Includes Spark Streaming</span>
     </a>
   </div>
 </div>