You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2018/04/10 00:50:01 UTC

[1/4] spark-website git commit: Add link to ApacheCon per Branding; fix a few other branding standards issues; fix sitemap.xml refs to localhost

Repository: spark-website
Updated Branches:
  refs/heads/asf-site 7cb093853 -> b75134190


http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-2-3-0.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-2-3-0.html b/site/releases/spark-release-2-3-0.html
index a42019c..58e27cd 100644
--- a/site/releases/spark-release-2-3-0.html
+++ b/site/releases/spark-release-2-3-0.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -439,10 +444,12 @@ ALeksander Eskilson, Adrian Ionescu, Ajay Saini, Ala Luszczak, Albert Jang, Albe
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/research.html
----------------------------------------------------------------------
diff --git a/site/research.html b/site/research.html
index a7af8e9..5c94d11 100644
--- a/site/research.html
+++ b/site/research.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -261,10 +266,12 @@ Spark offers an abstraction called <a href="http://people.csail.mit.edu/matei/pa
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/screencasts/1-first-steps-with-spark.html
----------------------------------------------------------------------
diff --git a/site/screencasts/1-first-steps-with-spark.html b/site/screencasts/1-first-steps-with-spark.html
index 2e59923..bc92e5b 100644
--- a/site/screencasts/1-first-steps-with-spark.html
+++ b/site/screencasts/1-first-steps-with-spark.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -223,10 +228,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/screencasts/2-spark-documentation-overview.html
----------------------------------------------------------------------
diff --git a/site/screencasts/2-spark-documentation-overview.html b/site/screencasts/2-spark-documentation-overview.html
index 42b36fd..a4d9730 100644
--- a/site/screencasts/2-spark-documentation-overview.html
+++ b/site/screencasts/2-spark-documentation-overview.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -223,10 +228,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/screencasts/3-transformations-and-caching.html
----------------------------------------------------------------------
diff --git a/site/screencasts/3-transformations-and-caching.html b/site/screencasts/3-transformations-and-caching.html
index 6ea17ab..94e143e 100644
--- a/site/screencasts/3-transformations-and-caching.html
+++ b/site/screencasts/3-transformations-and-caching.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -219,10 +224,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/screencasts/4-a-standalone-job-in-spark.html
----------------------------------------------------------------------
diff --git a/site/screencasts/4-a-standalone-job-in-spark.html b/site/screencasts/4-a-standalone-job-in-spark.html
index a3d4873..65a613d 100644
--- a/site/screencasts/4-a-standalone-job-in-spark.html
+++ b/site/screencasts/4-a-standalone-job-in-spark.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -217,10 +222,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/screencasts/index.html
----------------------------------------------------------------------
diff --git a/site/screencasts/index.html b/site/screencasts/index.html
index bc55ba2..4e067c8 100644
--- a/site/screencasts/index.html
+++ b/site/screencasts/index.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -249,10 +254,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/security.html
----------------------------------------------------------------------
diff --git a/site/security.html b/site/security.html
index ef9638b..1ddaeb1 100644
--- a/site/security.html
+++ b/site/security.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -291,10 +296,12 @@ PGh0bWw+PHNjcmlwdD5hbGVydCgiWFNTIik8L3NjcmlwdD48L2h0bWw+
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/sitemap.xml
----------------------------------------------------------------------
diff --git a/site/sitemap.xml b/site/sitemap.xml
index b54b754..863b9e0 100644
--- a/site/sitemap.xml
+++ b/site/sitemap.xml
@@ -139,613 +139,613 @@
 </url>
 <!-- Auto-generate sitemap for rest of site content -->
 <url>
-  <loc>http://localhost:4000/news/spark-summit-june-2018-agenda-posted.html</loc>
+  <loc>https://spark.apache.org/news/spark-summit-june-2018-agenda-posted.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-2-3-0.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-2-3-0.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-2-3-0-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-2-3-0-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-2-2-1.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-2-2-1.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-2-2-1-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-2-2-1-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-2-1-2.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-2-1-2.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-2-1-2-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-2-1-2-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-summit-eu-2017-agenda-posted.html</loc>
+  <loc>https://spark.apache.org/news/spark-summit-eu-2017-agenda-posted.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-2-2-0.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-2-2-0.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-2-2-0-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-2-2-0-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-2-1-1.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-2-1-1.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-2-1-1-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-2-1-1-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-summit-june-2017-agenda-posted.html</loc>
+  <loc>https://spark.apache.org/news/spark-summit-june-2017-agenda-posted.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-summit-east-2017-agenda-posted.html</loc>
+  <loc>https://spark.apache.org/news/spark-summit-east-2017-agenda-posted.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-2-1-0.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-2-1-0.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-2-1-0-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-2-1-0-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-wins-cloudsort-100tb-benchmark.html</loc>
+  <loc>https://spark.apache.org/news/spark-wins-cloudsort-100tb-benchmark.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-2-0-2.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-2-0-2.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-2-0-2-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-2-0-2-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-1-6-3.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-1-6-3.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-1-6-3-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-1-6-3-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-2-0-1.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-2-0-1.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-2-0-1-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-2-0-1-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-2-0-0.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-2-0-0.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-2-0-0-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-2-0-0-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-1-6-2.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-1-6-2.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-1-6-2-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-1-6-2-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/submit-talks-to-spark-summit-eu-2016.html</loc>
+  <loc>https://spark.apache.org/news/submit-talks-to-spark-summit-eu-2016.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-2.0.0-preview.html</loc>
+  <loc>https://spark.apache.org/news/spark-2.0.0-preview.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-summit-june-2016-agenda-posted.html</loc>
+  <loc>https://spark.apache.org/news/spark-summit-june-2016-agenda-posted.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-1-6-1.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-1-6-1.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-1-6-1-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-1-6-1-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/submit-talks-to-spark-summit-2016.html</loc>
+  <loc>https://spark.apache.org/news/submit-talks-to-spark-summit-2016.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-summit-east-agenda-posted.html</loc>
+  <loc>https://spark.apache.org/news/spark-summit-east-agenda-posted.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-1-6-0.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-1-6-0.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-1-6-0-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-1-6-0-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-summit-east-2016-cfp-closing.html</loc>
+  <loc>https://spark.apache.org/news/spark-summit-east-2016-cfp-closing.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-1-5-2.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-1-5-2.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-1-5-2-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-1-5-2-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/submit-talks-to-spark-summit-east-2016.html</loc>
+  <loc>https://spark.apache.org/news/submit-talks-to-spark-summit-east-2016.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-1-5-1.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-1-5-1.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-1-5-1-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-1-5-1-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-1-5-0.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-1-5-0.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-1-5-0-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-1-5-0-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-summit-europe-agenda-posted.html</loc>
+  <loc>https://spark.apache.org/news/spark-summit-europe-agenda-posted.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-1-4-1.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-1-4-1.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-1-4-1-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-1-4-1-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-summit-2015-videos-posted.html</loc>
+  <loc>https://spark.apache.org/news/spark-summit-2015-videos-posted.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-1-4-0.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-1-4-0.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-1-4-0-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-1-4-0-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-summit-europe.html</loc>
+  <loc>https://spark.apache.org/news/spark-summit-europe.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/one-month-to-spark-summit-2015.html</loc>
+  <loc>https://spark.apache.org/news/one-month-to-spark-summit-2015.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-summit-east-2015-videos-posted.html</loc>
+  <loc>https://spark.apache.org/news/spark-summit-east-2015-videos-posted.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-1-3-1.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-1-3-1.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-1-2-2.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-1-2-2.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-1-2-2-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-1-2-2-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-1-3-0.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-1-3-0.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-1-3-0-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-1-3-0-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-1-2-1.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-1-2-1.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-1-2-1-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-1-2-1-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-summit-east-agenda-posted.html</loc>
+  <loc>https://spark.apache.org/news/spark-summit-east-agenda-posted.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-1-2-0.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-1-2-0.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-1-2-0-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-1-2-0-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-1-1-1.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-1-1-1.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-1-1-1-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-1-1-1-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/registration-open-for-spark-summit-east.html</loc>
+  <loc>https://spark.apache.org/news/registration-open-for-spark-summit-east.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-wins-daytona-gray-sort-100tb-benchmark.html</loc>
+  <loc>https://spark.apache.org/news/spark-wins-daytona-gray-sort-100tb-benchmark.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/proposals-open-for-spark-summit-east.html</loc>
+  <loc>https://spark.apache.org/news/proposals-open-for-spark-summit-east.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-1-1-0.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-1-1-0.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-1-1-0-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-1-1-0-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-1-0-2.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-1-0-2.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-1-0-2-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-1-0-2-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-0-9-2.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-0-9-2.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-0-9-2-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-0-9-2-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-summit-2014-videos-posted.html</loc>
+  <loc>https://spark.apache.org/news/spark-summit-2014-videos-posted.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-1-0-1.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-1-0-1.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-1-0-1-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-1-0-1-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/two-weeks-to-spark-summit-2014.html</loc>
+  <loc>https://spark.apache.org/news/two-weeks-to-spark-summit-2014.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-1-0-0.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-1-0-0.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-1-0-0-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-1-0-0-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-summit-agenda-posted.html</loc>
+  <loc>https://spark.apache.org/news/spark-summit-agenda-posted.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-0-9-1.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-0-9-1.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-0-9-1-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-0-9-1-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/submit-talks-to-spark-summit-2014.html</loc>
+  <loc>https://spark.apache.org/news/submit-talks-to-spark-summit-2014.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-becomes-tlp.html</loc>
+  <loc>https://spark.apache.org/news/spark-becomes-tlp.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-0-9-0.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-0-9-0.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-0-9-0-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-0-9-0-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-0-8-1.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-0-8-1.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-0-8-1-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-0-8-1-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-summit-2013-is-a-wrap.html</loc>
+  <loc>https://spark.apache.org/news/spark-summit-2013-is-a-wrap.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/announcing-the-first-spark-summit.html</loc>
+  <loc>https://spark.apache.org/news/announcing-the-first-spark-summit.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-0-8-0.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-0-8-0.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-0-8-0-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-0-8-0-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-user-survey-and-powered-by-page.html</loc>
+  <loc>https://spark.apache.org/news/spark-user-survey-and-powered-by-page.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/fourth-spark-screencast-published.html</loc>
+  <loc>https://spark.apache.org/news/fourth-spark-screencast-published.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/screencasts/4-a-standalone-job-in-spark.html</loc>
+  <loc>https://spark.apache.org/screencasts/4-a-standalone-job-in-spark.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/amp-camp-2013-registration-ope.html</loc>
+  <loc>https://spark.apache.org/news/amp-camp-2013-registration-ope.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-mailing-lists-moving-to-apache.html</loc>
+  <loc>https://spark.apache.org/news/spark-mailing-lists-moving-to-apache.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-0-7-3.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-0-7-3.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-0-7-3-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-0-7-3-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-featured-in-wired.html</loc>
+  <loc>https://spark.apache.org/news/spark-featured-in-wired.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-accepted-into-apache-incubator.html</loc>
+  <loc>https://spark.apache.org/news/spark-accepted-into-apache-incubator.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-0-7-2.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-0-7-2.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-0-7-2-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-0-7-2-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/screencasts/3-transformations-and-caching.html</loc>
+  <loc>https://spark.apache.org/screencasts/3-transformations-and-caching.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-screencasts-published.html</loc>
+  <loc>https://spark.apache.org/news/spark-screencasts-published.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/screencasts/2-spark-documentation-overview.html</loc>
+  <loc>https://spark.apache.org/screencasts/2-spark-documentation-overview.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/screencasts/1-first-steps-with-spark.html</loc>
+  <loc>https://spark.apache.org/screencasts/1-first-steps-with-spark.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/strata-exercises-now-available-online.html</loc>
+  <loc>https://spark.apache.org/news/strata-exercises-now-available-online.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-0-7-0.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-0-7-0.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-0-7-0-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-0-7-0-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/run-spark-and-shark-on-amazon-emr.html</loc>
+  <loc>https://spark.apache.org/news/run-spark-and-shark-on-amazon-emr.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-0-6-2.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-0-6-2.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-0-6-2-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-0-6-2-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-tips-from-quantifind.html</loc>
+  <loc>https://spark.apache.org/news/spark-tips-from-quantifind.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/video-from-first-spark-development-meetup.html</loc>
+  <loc>https://spark.apache.org/news/video-from-first-spark-development-meetup.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-and-shark-in-the-news.html</loc>
+  <loc>https://spark.apache.org/news/spark-and-shark-in-the-news.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-0-6-1.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-0-6-1.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-0-5-2.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-0-5-2.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-0-6-1-and-0-5-2-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-0-6-1-and-0-5-2-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-0-6-0.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-0-6-0.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-version-0-6-0-released.html</loc>
+  <loc>https://spark.apache.org/news/spark-version-0-6-0-released.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-0-5-1.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-0-5-1.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-0-5-0.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-0-5-0.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/nsdi-paper.html</loc>
+  <loc>https://spark.apache.org/news/nsdi-paper.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/spark-meetups.html</loc>
+  <loc>https://spark.apache.org/news/spark-meetups.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/releases/spark-release-0-3.html</loc>
+  <loc>https://spark.apache.org/releases/spark-release-0-3.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 
 <url>
-  <loc>http://localhost:4000/committers.html</loc>
+  <loc>https://spark.apache.org/committers.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/community.html</loc>
+  <loc>https://spark.apache.org/community.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/contributing.html</loc>
+  <loc>https://spark.apache.org/contributing.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/developer-tools.html</loc>
+  <loc>https://spark.apache.org/developer-tools.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/documentation.html</loc>
+  <loc>https://spark.apache.org/documentation.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/downloads.html</loc>
+  <loc>https://spark.apache.org/downloads.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/examples.html</loc>
+  <loc>https://spark.apache.org/examples.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/faq.html</loc>
+  <loc>https://spark.apache.org/faq.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/history.html</loc>
+  <loc>https://spark.apache.org/history.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/improvement-proposals.html</loc>
+  <loc>https://spark.apache.org/improvement-proposals.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/graphx/</loc>
+  <loc>https://spark.apache.org/graphx/</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/mllib/</loc>
+  <loc>https://spark.apache.org/mllib/</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/streaming/</loc>
+  <loc>https://spark.apache.org/streaming/</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/news/</loc>
+  <loc>https://spark.apache.org/news/</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/screencasts/</loc>
+  <loc>https://spark.apache.org/screencasts/</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/sql/</loc>
+  <loc>https://spark.apache.org/sql/</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/</loc>
+  <loc>https://spark.apache.org/</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/mailing-lists.html</loc>
+  <loc>https://spark.apache.org/mailing-lists.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/powered-by.html</loc>
+  <loc>https://spark.apache.org/powered-by.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/release-process.html</loc>
+  <loc>https://spark.apache.org/release-process.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/research.html</loc>
+  <loc>https://spark.apache.org/research.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/security.html</loc>
+  <loc>https://spark.apache.org/security.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 
 <url>
-  <loc>http://localhost:4000/third-party-projects.html</loc>
+  <loc>https://spark.apache.org/third-party-projects.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/trademarks.html</loc>
+  <loc>https://spark.apache.org/trademarks.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>http://localhost:4000/versioning-policy.html</loc>
+  <loc>https://spark.apache.org/versioning-policy.html</loc>
   <changefreq>weekly</changefreq>
 </url>
 

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/sql/index.html
----------------------------------------------------------------------
diff --git a/site/sql/index.html b/site/sql/index.html
index f1f5856..46457b5 100644
--- a/site/sql/index.html
+++ b/site/sql/index.html
@@ -180,6 +180,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -361,10 +366,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/streaming/index.html
----------------------------------------------------------------------
diff --git a/site/streaming/index.html b/site/streaming/index.html
index d67aeb2..0f051e8 100644
--- a/site/streaming/index.html
+++ b/site/streaming/index.html
@@ -180,6 +180,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -339,10 +344,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/third-party-projects.html
----------------------------------------------------------------------
diff --git a/site/third-party-projects.html b/site/third-party-projects.html
index 353a00a..22e3740 100644
--- a/site/third-party-projects.html
+++ b/site/third-party-projects.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -294,10 +299,12 @@ transforming, and analyzing genomic data using Apache Spark</li>
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/trademarks.html
----------------------------------------------------------------------
diff --git a/site/trademarks.html b/site/trademarks.html
index f98a99c..3937b3c 100644
--- a/site/trademarks.html
+++ b/site/trademarks.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -263,10 +268,12 @@ If you have any questions about the Apache trademark policy, please email
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/versioning-policy.html
----------------------------------------------------------------------
diff --git a/site/versioning-policy.html b/site/versioning-policy.html
index 3269609..a51414c 100644
--- a/site/versioning-policy.html
+++ b/site/versioning-policy.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -283,10 +288,12 @@ release. Major releases do not happen according to a fixed schedule.</p>
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


[3/4] spark-website git commit: Add link to ApacheCon per Branding; fix a few other branding standards issues; fix sitemap.xml refs to localhost

Posted by sr...@apache.org.
http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-1-4-0-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-1-4-0-released.html b/site/news/spark-1-4-0-released.html
index 0bc4d7d..a72a856 100644
--- a/site/news/spark-1-4-0-released.html
+++ b/site/news/spark-1-4-0-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -215,10 +220,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-1-4-1-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-1-4-1-released.html b/site/news/spark-1-4-1-released.html
index 1e39e2e..371ccfa 100644
--- a/site/news/spark-1-4-1-released.html
+++ b/site/news/spark-1-4-1-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -215,10 +220,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-1-5-0-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-1-5-0-released.html b/site/news/spark-1-5-0-released.html
index 7529c54..e88bb96 100644
--- a/site/news/spark-1-5-0-released.html
+++ b/site/news/spark-1-5-0-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -215,10 +220,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-1-5-1-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-1-5-1-released.html b/site/news/spark-1-5-1-released.html
index e916119..c66239f 100644
--- a/site/news/spark-1-5-1-released.html
+++ b/site/news/spark-1-5-1-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -215,10 +220,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-1-5-2-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-1-5-2-released.html b/site/news/spark-1-5-2-released.html
index 316caa4..f9738e7 100644
--- a/site/news/spark-1-5-2-released.html
+++ b/site/news/spark-1-5-2-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -215,10 +220,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-1-6-0-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-1-6-0-released.html b/site/news/spark-1-6-0-released.html
index bd3bfe3..4abbf26 100644
--- a/site/news/spark-1-6-0-released.html
+++ b/site/news/spark-1-6-0-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -219,10 +224,12 @@ 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 <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-1-6-1-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-1-6-1-released.html b/site/news/spark-1-6-1-released.html
index e8dc201..83b90ac 100644
--- a/site/news/spark-1-6-1-released.html
+++ b/site/news/spark-1-6-1-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -215,10 +220,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-1-6-2-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-1-6-2-released.html b/site/news/spark-1-6-2-released.html
index bf872eb..b378dab 100644
--- a/site/news/spark-1-6-2-released.html
+++ b/site/news/spark-1-6-2-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -215,10 +220,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-1-6-3-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-1-6-3-released.html b/site/news/spark-1-6-3-released.html
index 9baa910..2f8b913 100644
--- a/site/news/spark-1-6-3-released.html
+++ b/site/news/spark-1-6-3-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -215,10 +220,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-2-0-0-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-2-0-0-released.html b/site/news/spark-2-0-0-released.html
index eeee82f..20452ce 100644
--- a/site/news/spark-2-0-0-released.html
+++ b/site/news/spark-2-0-0-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-2-0-1-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-2-0-1-released.html b/site/news/spark-2-0-1-released.html
index 075cdd2..650a017 100644
--- a/site/news/spark-2-0-1-released.html
+++ b/site/news/spark-2-0-1-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-2-0-2-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-2-0-2-released.html b/site/news/spark-2-0-2-released.html
index 86c8731..1ab7d7e 100644
--- a/site/news/spark-2-0-2-released.html
+++ b/site/news/spark-2-0-2-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -215,10 +220,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-2-1-0-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-2-1-0-released.html b/site/news/spark-2-1-0-released.html
index 0598dc9..437395b 100644
--- a/site/news/spark-2-1-0-released.html
+++ b/site/news/spark-2-1-0-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-2-1-1-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-2-1-1-released.html b/site/news/spark-2-1-1-released.html
index d6438af..01a1a5c 100644
--- a/site/news/spark-2-1-1-released.html
+++ b/site/news/spark-2-1-1-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -214,10 +219,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-2-1-2-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-2-1-2-released.html b/site/news/spark-2-1-2-released.html
index 49b5307..cdc9dda 100644
--- a/site/news/spark-2-1-2-released.html
+++ b/site/news/spark-2-1-2-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -214,10 +219,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-2-2-0-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-2-2-0-released.html b/site/news/spark-2-2-0-released.html
index a653397..82e55ab 100644
--- a/site/news/spark-2-2-0-released.html
+++ b/site/news/spark-2-2-0-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-2-2-1-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-2-2-1-released.html b/site/news/spark-2-2-1-released.html
index 848c184..94f656f 100644
--- a/site/news/spark-2-2-1-released.html
+++ b/site/news/spark-2-2-1-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -214,10 +219,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-2-3-0-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-2-3-0-released.html b/site/news/spark-2-3-0-released.html
index b7f6195..50abf43 100644
--- a/site/news/spark-2-3-0-released.html
+++ b/site/news/spark-2-3-0-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-2.0.0-preview.html
----------------------------------------------------------------------
diff --git a/site/news/spark-2.0.0-preview.html b/site/news/spark-2.0.0-preview.html
index 4062c83..ae5d533 100644
--- a/site/news/spark-2.0.0-preview.html
+++ b/site/news/spark-2.0.0-preview.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -215,10 +220,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-accepted-into-apache-incubator.html
----------------------------------------------------------------------
diff --git a/site/news/spark-accepted-into-apache-incubator.html b/site/news/spark-accepted-into-apache-incubator.html
index f54645c..fcc8215 100644
--- a/site/news/spark-accepted-into-apache-incubator.html
+++ b/site/news/spark-accepted-into-apache-incubator.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-and-shark-in-the-news.html
----------------------------------------------------------------------
diff --git a/site/news/spark-and-shark-in-the-news.html b/site/news/spark-and-shark-in-the-news.html
index bf19642..f4041ba 100644
--- a/site/news/spark-and-shark-in-the-news.html
+++ b/site/news/spark-and-shark-in-the-news.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -223,10 +228,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-becomes-tlp.html
----------------------------------------------------------------------
diff --git a/site/news/spark-becomes-tlp.html b/site/news/spark-becomes-tlp.html
index dcaf093..ab4b72f 100644
--- a/site/news/spark-becomes-tlp.html
+++ b/site/news/spark-becomes-tlp.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -215,10 +220,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-featured-in-wired.html
----------------------------------------------------------------------
diff --git a/site/news/spark-featured-in-wired.html b/site/news/spark-featured-in-wired.html
index da4f106..f3272d6 100644
--- a/site/news/spark-featured-in-wired.html
+++ b/site/news/spark-featured-in-wired.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-mailing-lists-moving-to-apache.html
----------------------------------------------------------------------
diff --git a/site/news/spark-mailing-lists-moving-to-apache.html b/site/news/spark-mailing-lists-moving-to-apache.html
index 108a433..b91e6a3 100644
--- a/site/news/spark-mailing-lists-moving-to-apache.html
+++ b/site/news/spark-mailing-lists-moving-to-apache.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -224,10 +229,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-meetups.html
----------------------------------------------------------------------
diff --git a/site/news/spark-meetups.html b/site/news/spark-meetups.html
index 9367a0b..3a94791 100644
--- a/site/news/spark-meetups.html
+++ b/site/news/spark-meetups.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-screencasts-published.html
----------------------------------------------------------------------
diff --git a/site/news/spark-screencasts-published.html b/site/news/spark-screencasts-published.html
index 3ef85c3..fd8bd4e 100644
--- a/site/news/spark-screencasts-published.html
+++ b/site/news/spark-screencasts-published.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -219,10 +224,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-summit-2013-is-a-wrap.html
----------------------------------------------------------------------
diff --git a/site/news/spark-summit-2013-is-a-wrap.html b/site/news/spark-summit-2013-is-a-wrap.html
index a5b7b55..d86df19 100644
--- a/site/news/spark-summit-2013-is-a-wrap.html
+++ b/site/news/spark-summit-2013-is-a-wrap.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -219,10 +224,12 @@ 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 <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-summit-2014-videos-posted.html
----------------------------------------------------------------------
diff --git a/site/news/spark-summit-2014-videos-posted.html b/site/news/spark-summit-2014-videos-posted.html
index 22373d4..b5908df 100644
--- a/site/news/spark-summit-2014-videos-posted.html
+++ b/site/news/spark-summit-2014-videos-posted.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -215,10 +220,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-summit-2015-videos-posted.html
----------------------------------------------------------------------
diff --git a/site/news/spark-summit-2015-videos-posted.html b/site/news/spark-summit-2015-videos-posted.html
index 1f553fb..aa9408f 100644
--- a/site/news/spark-summit-2015-videos-posted.html
+++ b/site/news/spark-summit-2015-videos-posted.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-summit-agenda-posted.html
----------------------------------------------------------------------
diff --git a/site/news/spark-summit-agenda-posted.html b/site/news/spark-summit-agenda-posted.html
index e58b0fe..92c27b4 100644
--- a/site/news/spark-summit-agenda-posted.html
+++ b/site/news/spark-summit-agenda-posted.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -221,10 +226,12 @@ about the latest happenings in Spark.</p>
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-summit-east-2015-videos-posted.html
----------------------------------------------------------------------
diff --git a/site/news/spark-summit-east-2015-videos-posted.html b/site/news/spark-summit-east-2015-videos-posted.html
index 8d3e73f..24efeed 100644
--- a/site/news/spark-summit-east-2015-videos-posted.html
+++ b/site/news/spark-summit-east-2015-videos-posted.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -215,10 +220,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-summit-east-2016-cfp-closing.html
----------------------------------------------------------------------
diff --git a/site/news/spark-summit-east-2016-cfp-closing.html b/site/news/spark-summit-east-2016-cfp-closing.html
index 1fc5e11..b3284d5 100644
--- a/site/news/spark-summit-east-2016-cfp-closing.html
+++ b/site/news/spark-summit-east-2016-cfp-closing.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-summit-east-2017-agenda-posted.html
----------------------------------------------------------------------
diff --git a/site/news/spark-summit-east-2017-agenda-posted.html b/site/news/spark-summit-east-2017-agenda-posted.html
index bd8a8fa..2fc7900 100644
--- a/site/news/spark-summit-east-2017-agenda-posted.html
+++ b/site/news/spark-summit-east-2017-agenda-posted.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-summit-east-agenda-posted.html
----------------------------------------------------------------------
diff --git a/site/news/spark-summit-east-agenda-posted.html b/site/news/spark-summit-east-agenda-posted.html
index d4aef9b..17bdf9d 100644
--- a/site/news/spark-summit-east-agenda-posted.html
+++ b/site/news/spark-summit-east-agenda-posted.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-summit-eu-2017-agenda-posted.html
----------------------------------------------------------------------
diff --git a/site/news/spark-summit-eu-2017-agenda-posted.html b/site/news/spark-summit-eu-2017-agenda-posted.html
index d662109..3c8978c 100644
--- a/site/news/spark-summit-eu-2017-agenda-posted.html
+++ b/site/news/spark-summit-eu-2017-agenda-posted.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -214,10 +219,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-summit-europe-agenda-posted.html
----------------------------------------------------------------------
diff --git a/site/news/spark-summit-europe-agenda-posted.html b/site/news/spark-summit-europe-agenda-posted.html
index 6d95309..a80d1d8 100644
--- a/site/news/spark-summit-europe-agenda-posted.html
+++ b/site/news/spark-summit-europe-agenda-posted.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-summit-europe.html
----------------------------------------------------------------------
diff --git a/site/news/spark-summit-europe.html b/site/news/spark-summit-europe.html
index f8ae097..723086e 100644
--- a/site/news/spark-summit-europe.html
+++ b/site/news/spark-summit-europe.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-summit-june-2016-agenda-posted.html
----------------------------------------------------------------------
diff --git a/site/news/spark-summit-june-2016-agenda-posted.html b/site/news/spark-summit-june-2016-agenda-posted.html
index 7947354..8a64f39 100644
--- a/site/news/spark-summit-june-2016-agenda-posted.html
+++ b/site/news/spark-summit-june-2016-agenda-posted.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-summit-june-2017-agenda-posted.html
----------------------------------------------------------------------
diff --git a/site/news/spark-summit-june-2017-agenda-posted.html b/site/news/spark-summit-june-2017-agenda-posted.html
index e4055c3..56e821c 100644
--- a/site/news/spark-summit-june-2017-agenda-posted.html
+++ b/site/news/spark-summit-june-2017-agenda-posted.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-summit-june-2018-agenda-posted.html
----------------------------------------------------------------------
diff --git a/site/news/spark-summit-june-2018-agenda-posted.html b/site/news/spark-summit-june-2018-agenda-posted.html
index 9b2f739..fd08738 100644
--- a/site/news/spark-summit-june-2018-agenda-posted.html
+++ b/site/news/spark-summit-june-2018-agenda-posted.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-tips-from-quantifind.html
----------------------------------------------------------------------
diff --git a/site/news/spark-tips-from-quantifind.html b/site/news/spark-tips-from-quantifind.html
index 00c71c2..cb0ca52 100644
--- a/site/news/spark-tips-from-quantifind.html
+++ b/site/news/spark-tips-from-quantifind.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -218,10 +223,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-user-survey-and-powered-by-page.html
----------------------------------------------------------------------
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 c015e5c..3702ef4 100644
--- a/site/news/spark-user-survey-and-powered-by-page.html
+++ b/site/news/spark-user-survey-and-powered-by-page.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -217,10 +222,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-version-0-6-0-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-version-0-6-0-released.html b/site/news/spark-version-0-6-0-released.html
index d9120b0..7297b4b 100644
--- a/site/news/spark-version-0-6-0-released.html
+++ b/site/news/spark-version-0-6-0-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-wins-cloudsort-100tb-benchmark.html
----------------------------------------------------------------------
diff --git a/site/news/spark-wins-cloudsort-100tb-benchmark.html b/site/news/spark-wins-cloudsort-100tb-benchmark.html
index 8bef605..2cfed30 100644
--- a/site/news/spark-wins-cloudsort-100tb-benchmark.html
+++ b/site/news/spark-wins-cloudsort-100tb-benchmark.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -220,10 +225,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-wins-daytona-gray-sort-100tb-benchmark.html
----------------------------------------------------------------------
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 32f53e9..29589d9 100644
--- a/site/news/spark-wins-daytona-gray-sort-100tb-benchmark.html
+++ b/site/news/spark-wins-daytona-gray-sort-100tb-benchmark.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -219,10 +224,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/strata-exercises-now-available-online.html
----------------------------------------------------------------------
diff --git a/site/news/strata-exercises-now-available-online.html b/site/news/strata-exercises-now-available-online.html
index bd02733..916f242 100644
--- a/site/news/strata-exercises-now-available-online.html
+++ b/site/news/strata-exercises-now-available-online.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/submit-talks-to-spark-summit-2014.html
----------------------------------------------------------------------
diff --git a/site/news/submit-talks-to-spark-summit-2014.html b/site/news/submit-talks-to-spark-summit-2014.html
index 366678b..4f43c23 100644
--- a/site/news/submit-talks-to-spark-summit-2014.html
+++ b/site/news/submit-talks-to-spark-summit-2014.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -222,10 +227,12 @@ on Spark.</p>
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/submit-talks-to-spark-summit-2016.html
----------------------------------------------------------------------
diff --git a/site/news/submit-talks-to-spark-summit-2016.html b/site/news/submit-talks-to-spark-summit-2016.html
index 142ef66..3163bab 100644
--- a/site/news/submit-talks-to-spark-summit-2016.html
+++ b/site/news/submit-talks-to-spark-summit-2016.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -214,10 +219,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


[4/4] spark-website git commit: Add link to ApacheCon per Branding; fix a few other branding standards issues; fix sitemap.xml refs to localhost

Posted by sr...@apache.org.
Add link to ApacheCon per Branding; fix a few other branding standards issues; fix sitemap.xml refs to localhost


Project: http://git-wip-us.apache.org/repos/asf/spark-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark-website/commit/b7513419
Tree: http://git-wip-us.apache.org/repos/asf/spark-website/tree/b7513419
Diff: http://git-wip-us.apache.org/repos/asf/spark-website/diff/b7513419

Branch: refs/heads/asf-site
Commit: b751341903f8060ce229db8e4a85bca33baacc03
Parents: 7cb0938
Author: Sean Owen <sr...@gmail.com>
Authored: Mon Apr 9 11:52:25 2018 -0500
Committer: Sean Owen <sr...@gmail.com>
Committed: Mon Apr 9 11:52:25 2018 -0500

----------------------------------------------------------------------
 _layouts/global.html                            |  13 +-
 index.md                                        |   6 -
 site/committers.html                            |  13 +-
 site/community.html                             |  13 +-
 site/contributing.html                          |  13 +-
 site/developer-tools.html                       |  13 +-
 site/documentation.html                         |  13 +-
 site/downloads.html                             |  13 +-
 site/examples.html                              |  13 +-
 site/faq.html                                   |  13 +-
 site/graphx/index.html                          |  13 +-
 site/history.html                               |  13 +-
 site/improvement-proposals.html                 |  13 +-
 site/index.html                                 |  19 +-
 site/mailing-lists.html                         |  15 +-
 site/mllib/index.html                           |  13 +-
 site/news/amp-camp-2013-registration-ope.html   |  13 +-
 .../news/announcing-the-first-spark-summit.html |  13 +-
 .../news/fourth-spark-screencast-published.html |  13 +-
 site/news/index.html                            |  13 +-
 site/news/nsdi-paper.html                       |  13 +-
 site/news/one-month-to-spark-summit-2015.html   |  13 +-
 .../proposals-open-for-spark-summit-east.html   |  13 +-
 ...registration-open-for-spark-summit-east.html |  13 +-
 .../news/run-spark-and-shark-on-amazon-emr.html |  13 +-
 site/news/spark-0-6-1-and-0-5-2-released.html   |  13 +-
 site/news/spark-0-6-2-released.html             |  13 +-
 site/news/spark-0-7-0-released.html             |  13 +-
 site/news/spark-0-7-2-released.html             |  13 +-
 site/news/spark-0-7-3-released.html             |  13 +-
 site/news/spark-0-8-0-released.html             |  13 +-
 site/news/spark-0-8-1-released.html             |  13 +-
 site/news/spark-0-9-0-released.html             |  13 +-
 site/news/spark-0-9-1-released.html             |  13 +-
 site/news/spark-0-9-2-released.html             |  13 +-
 site/news/spark-1-0-0-released.html             |  13 +-
 site/news/spark-1-0-1-released.html             |  13 +-
 site/news/spark-1-0-2-released.html             |  13 +-
 site/news/spark-1-1-0-released.html             |  13 +-
 site/news/spark-1-1-1-released.html             |  13 +-
 site/news/spark-1-2-0-released.html             |  13 +-
 site/news/spark-1-2-1-released.html             |  13 +-
 site/news/spark-1-2-2-released.html             |  13 +-
 site/news/spark-1-3-0-released.html             |  13 +-
 site/news/spark-1-4-0-released.html             |  13 +-
 site/news/spark-1-4-1-released.html             |  13 +-
 site/news/spark-1-5-0-released.html             |  13 +-
 site/news/spark-1-5-1-released.html             |  13 +-
 site/news/spark-1-5-2-released.html             |  13 +-
 site/news/spark-1-6-0-released.html             |  13 +-
 site/news/spark-1-6-1-released.html             |  13 +-
 site/news/spark-1-6-2-released.html             |  13 +-
 site/news/spark-1-6-3-released.html             |  13 +-
 site/news/spark-2-0-0-released.html             |  13 +-
 site/news/spark-2-0-1-released.html             |  13 +-
 site/news/spark-2-0-2-released.html             |  13 +-
 site/news/spark-2-1-0-released.html             |  13 +-
 site/news/spark-2-1-1-released.html             |  13 +-
 site/news/spark-2-1-2-released.html             |  13 +-
 site/news/spark-2-2-0-released.html             |  13 +-
 site/news/spark-2-2-1-released.html             |  13 +-
 site/news/spark-2-3-0-released.html             |  13 +-
 site/news/spark-2.0.0-preview.html              |  13 +-
 .../spark-accepted-into-apache-incubator.html   |  13 +-
 site/news/spark-and-shark-in-the-news.html      |  13 +-
 site/news/spark-becomes-tlp.html                |  13 +-
 site/news/spark-featured-in-wired.html          |  13 +-
 .../spark-mailing-lists-moving-to-apache.html   |  13 +-
 site/news/spark-meetups.html                    |  13 +-
 site/news/spark-screencasts-published.html      |  13 +-
 site/news/spark-summit-2013-is-a-wrap.html      |  13 +-
 site/news/spark-summit-2014-videos-posted.html  |  13 +-
 site/news/spark-summit-2015-videos-posted.html  |  13 +-
 site/news/spark-summit-agenda-posted.html       |  13 +-
 .../spark-summit-east-2015-videos-posted.html   |  13 +-
 .../spark-summit-east-2016-cfp-closing.html     |  13 +-
 .../spark-summit-east-2017-agenda-posted.html   |  13 +-
 site/news/spark-summit-east-agenda-posted.html  |  13 +-
 .../spark-summit-eu-2017-agenda-posted.html     |  13 +-
 .../news/spark-summit-europe-agenda-posted.html |  13 +-
 site/news/spark-summit-europe.html              |  13 +-
 .../spark-summit-june-2016-agenda-posted.html   |  13 +-
 .../spark-summit-june-2017-agenda-posted.html   |  13 +-
 .../spark-summit-june-2018-agenda-posted.html   |  13 +-
 site/news/spark-tips-from-quantifind.html       |  13 +-
 .../spark-user-survey-and-powered-by-page.html  |  13 +-
 site/news/spark-version-0-6-0-released.html     |  13 +-
 .../spark-wins-cloudsort-100tb-benchmark.html   |  13 +-
 ...-wins-daytona-gray-sort-100tb-benchmark.html |  13 +-
 .../strata-exercises-now-available-online.html  |  13 +-
 .../news/submit-talks-to-spark-summit-2014.html |  13 +-
 .../news/submit-talks-to-spark-summit-2016.html |  13 +-
 .../submit-talks-to-spark-summit-east-2016.html |  13 +-
 .../submit-talks-to-spark-summit-eu-2016.html   |  13 +-
 site/news/two-weeks-to-spark-summit-2014.html   |  13 +-
 ...deo-from-first-spark-development-meetup.html |  13 +-
 site/powered-by.html                            |  13 +-
 site/release-process.html                       |  13 +-
 site/releases/spark-release-0-3.html            |  13 +-
 site/releases/spark-release-0-5-0.html          |  13 +-
 site/releases/spark-release-0-5-1.html          |  13 +-
 site/releases/spark-release-0-5-2.html          |  13 +-
 site/releases/spark-release-0-6-0.html          |  13 +-
 site/releases/spark-release-0-6-1.html          |  13 +-
 site/releases/spark-release-0-6-2.html          |  13 +-
 site/releases/spark-release-0-7-0.html          |  13 +-
 site/releases/spark-release-0-7-2.html          |  13 +-
 site/releases/spark-release-0-7-3.html          |  13 +-
 site/releases/spark-release-0-8-0.html          |  13 +-
 site/releases/spark-release-0-8-1.html          |  13 +-
 site/releases/spark-release-0-9-0.html          |  13 +-
 site/releases/spark-release-0-9-1.html          |  13 +-
 site/releases/spark-release-0-9-2.html          |  13 +-
 site/releases/spark-release-1-0-0.html          |  13 +-
 site/releases/spark-release-1-0-1.html          |  13 +-
 site/releases/spark-release-1-0-2.html          |  13 +-
 site/releases/spark-release-1-1-0.html          |  13 +-
 site/releases/spark-release-1-1-1.html          |  13 +-
 site/releases/spark-release-1-2-0.html          |  13 +-
 site/releases/spark-release-1-2-1.html          |  13 +-
 site/releases/spark-release-1-2-2.html          |  13 +-
 site/releases/spark-release-1-3-0.html          |  13 +-
 site/releases/spark-release-1-3-1.html          |  13 +-
 site/releases/spark-release-1-4-0.html          |  13 +-
 site/releases/spark-release-1-4-1.html          |  13 +-
 site/releases/spark-release-1-5-0.html          |  13 +-
 site/releases/spark-release-1-5-1.html          |  13 +-
 site/releases/spark-release-1-5-2.html          |  13 +-
 site/releases/spark-release-1-6-0.html          |  13 +-
 site/releases/spark-release-1-6-1.html          |  13 +-
 site/releases/spark-release-1-6-2.html          |  13 +-
 site/releases/spark-release-1-6-3.html          |  13 +-
 site/releases/spark-release-2-0-0.html          |  13 +-
 site/releases/spark-release-2-0-1.html          |  13 +-
 site/releases/spark-release-2-0-2.html          |  13 +-
 site/releases/spark-release-2-1-0.html          |  13 +-
 site/releases/spark-release-2-1-1.html          |  13 +-
 site/releases/spark-release-2-1-2.html          |  13 +-
 site/releases/spark-release-2-2-0.html          |  13 +-
 site/releases/spark-release-2-2-1.html          |  13 +-
 site/releases/spark-release-2-3-0.html          |  13 +-
 site/research.html                              |  13 +-
 site/screencasts/1-first-steps-with-spark.html  |  13 +-
 .../2-spark-documentation-overview.html         |  13 +-
 .../3-transformations-and-caching.html          |  13 +-
 .../4-a-standalone-job-in-spark.html            |  13 +-
 site/screencasts/index.html                     |  13 +-
 site/security.html                              |  13 +-
 site/sitemap.xml                                | 304 +++++++++----------
 site/sql/index.html                             |  13 +-
 site/streaming/index.html                       |  13 +-
 site/third-party-projects.html                  |  13 +-
 site/trademarks.html                            |  13 +-
 site/versioning-policy.html                     |  13 +-
 154 files changed, 1673 insertions(+), 621 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/_layouts/global.html
----------------------------------------------------------------------
diff --git a/_layouts/global.html b/_layouts/global.html
index 3e83e0c..3cae73f 100644
--- a/_layouts/global.html
+++ b/_layouts/global.html
@@ -183,6 +183,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="{{site.baseurl}}/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="{{site.baseurl}}/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -211,10 +216,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="{{site.baseurl}}/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="{{site.baseurl}}/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/index.md
----------------------------------------------------------------------
diff --git a/index.md b/index.md
index 26a2521..8d7525e 100644
--- a/index.md
+++ b/index.md
@@ -181,9 +181,3 @@ navigation:
     </ul>
   </div>
 </div>
-
-<div class="row">
-  <div class="col-sm-12 col-center">
-    <a href="{{site.baseurl}}/downloads.html" class="btn btn-success btn-lg" style="width: 262px;">Download Apache Spark</a>
-  </div>
-</div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/committers.html
----------------------------------------------------------------------
diff --git a/site/committers.html b/site/committers.html
index ffca33e..6264e46 100644
--- a/site/committers.html
+++ b/site/committers.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -579,10 +584,12 @@ of the immediate bug being fixed.</li>
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/community.html
----------------------------------------------------------------------
diff --git a/site/community.html b/site/community.html
index c886a8e..3cfa408 100644
--- a/site/community.html
+++ b/site/community.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -433,10 +438,12 @@ Add yours by emailing `dev@spark.apache.org`.
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/contributing.html
----------------------------------------------------------------------
diff --git a/site/contributing.html b/site/contributing.html
index 400371a..ea4a5e8 100644
--- a/site/contributing.html
+++ b/site/contributing.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -782,10 +787,12 @@ to ask on the <code>dev@spark.apache.org</code> list as well.</p>
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/developer-tools.html
----------------------------------------------------------------------
diff --git a/site/developer-tools.html b/site/developer-tools.html
index 13de402..417401d 100644
--- a/site/developer-tools.html
+++ b/site/developer-tools.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -614,10 +619,12 @@ The platform-specific paths to the profiler agents are listed in the
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/documentation.html
----------------------------------------------------------------------
diff --git a/site/documentation.html b/site/documentation.html
index d2e9f78..ae71612 100644
--- a/site/documentation.html
+++ b/site/documentation.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -381,10 +386,12 @@ The <a href="/research.html">research page</a> lists some of the original motiva
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/downloads.html
----------------------------------------------------------------------
diff --git a/site/downloads.html b/site/downloads.html
index 19178d8..7da6693 100644
--- a/site/downloads.html
+++ b/site/downloads.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -280,10 +285,12 @@ git clone git://github.com/apache/spark.git -b branch-2.3
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/examples.html
----------------------------------------------------------------------
diff --git a/site/examples.html b/site/examples.html
index 3310723..ff9cbb8 100644
--- a/site/examples.html
+++ b/site/examples.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -601,10 +606,12 @@ 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 <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/faq.html
----------------------------------------------------------------------
diff --git a/site/faq.html b/site/faq.html
index a9f1e08..b0a1ddf 100644
--- a/site/faq.html
+++ b/site/faq.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -269,10 +274,12 @@ Please also refer to our
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/graphx/index.html
----------------------------------------------------------------------
diff --git a/site/graphx/index.html b/site/graphx/index.html
index c32a251..24fe972 100644
--- a/site/graphx/index.html
+++ b/site/graphx/index.html
@@ -180,6 +180,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -315,10 +320,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/history.html
----------------------------------------------------------------------
diff --git a/site/history.html b/site/history.html
index 464b431..77e6486 100644
--- a/site/history.html
+++ b/site/history.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -223,10 +228,12 @@ You can get involved in Apache Spark development by reading
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/improvement-proposals.html
----------------------------------------------------------------------
diff --git a/site/improvement-proposals.html b/site/improvement-proposals.html
index 748e21d..96d8d2c 100644
--- a/site/improvement-proposals.html
+++ b/site/improvement-proposals.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -287,10 +292,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/index.html
----------------------------------------------------------------------
diff --git a/site/index.html b/site/index.html
index 79ff569..9486546 100644
--- a/site/index.html
+++ b/site/index.html
@@ -179,6 +179,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -364,12 +369,6 @@
   </div>
 </div>
 
-<div class="row">
-  <div class="col-sm-12 col-center">
-    <a href="/downloads.html" class="btn btn-success btn-lg" style="width: 262px;">Download Apache Spark</a>
-  </div>
-</div>
-
   </div>
 </div>
 
@@ -377,10 +376,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/mailing-lists.html
----------------------------------------------------------------------
diff --git a/site/mailing-lists.html b/site/mailing-lists.html
index 49a86d5..b1768cf 100644
--- a/site/mailing-lists.html
+++ b/site/mailing-lists.html
@@ -12,7 +12,7 @@
 
   
     <meta http-equiv="refresh" content="0; url=/community.html">
-    <link rel="canonical" href="http://localhost:4000/community.html" />
+    <link rel="canonical" href="https://spark.apache.org/community.html" />
   
 
   
@@ -180,6 +180,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -207,10 +212,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/mllib/index.html
----------------------------------------------------------------------
diff --git a/site/mllib/index.html b/site/mllib/index.html
index 52b2a3f..96ed496 100644
--- a/site/mllib/index.html
+++ b/site/mllib/index.html
@@ -180,6 +180,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -355,10 +360,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/amp-camp-2013-registration-ope.html
----------------------------------------------------------------------
diff --git a/site/news/amp-camp-2013-registration-ope.html b/site/news/amp-camp-2013-registration-ope.html
index 8a6532b..a859206 100644
--- a/site/news/amp-camp-2013-registration-ope.html
+++ b/site/news/amp-camp-2013-registration-ope.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/announcing-the-first-spark-summit.html
----------------------------------------------------------------------
diff --git a/site/news/announcing-the-first-spark-summit.html b/site/news/announcing-the-first-spark-summit.html
index 8dcfc32..343ef2c 100644
--- a/site/news/announcing-the-first-spark-summit.html
+++ b/site/news/announcing-the-first-spark-summit.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -217,10 +222,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/fourth-spark-screencast-published.html
----------------------------------------------------------------------
diff --git a/site/news/fourth-spark-screencast-published.html b/site/news/fourth-spark-screencast-published.html
index 0a6207b..53510d2 100644
--- a/site/news/fourth-spark-screencast-published.html
+++ b/site/news/fourth-spark-screencast-published.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -217,10 +222,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/index.html
----------------------------------------------------------------------
diff --git a/site/news/index.html b/site/news/index.html
index 564c390..0a9411d 100644
--- a/site/news/index.html
+++ b/site/news/index.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -1018,10 +1023,12 @@ 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 <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/nsdi-paper.html
----------------------------------------------------------------------
diff --git a/site/news/nsdi-paper.html b/site/news/nsdi-paper.html
index b731610..d0f5862 100644
--- a/site/news/nsdi-paper.html
+++ b/site/news/nsdi-paper.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/one-month-to-spark-summit-2015.html
----------------------------------------------------------------------
diff --git a/site/news/one-month-to-spark-summit-2015.html b/site/news/one-month-to-spark-summit-2015.html
index 429ab46..06ac5b2 100644
--- a/site/news/one-month-to-spark-summit-2015.html
+++ b/site/news/one-month-to-spark-summit-2015.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -219,10 +224,12 @@ 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 <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/proposals-open-for-spark-summit-east.html
----------------------------------------------------------------------
diff --git a/site/news/proposals-open-for-spark-summit-east.html b/site/news/proposals-open-for-spark-summit-east.html
index 375fbff..869bf20 100644
--- a/site/news/proposals-open-for-spark-summit-east.html
+++ b/site/news/proposals-open-for-spark-summit-east.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -217,10 +222,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/registration-open-for-spark-summit-east.html
----------------------------------------------------------------------
diff --git a/site/news/registration-open-for-spark-summit-east.html b/site/news/registration-open-for-spark-summit-east.html
index 66e0c0a..3a1abf0 100644
--- a/site/news/registration-open-for-spark-summit-east.html
+++ b/site/news/registration-open-for-spark-summit-east.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -217,10 +222,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/run-spark-and-shark-on-amazon-emr.html
----------------------------------------------------------------------
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 4c94f56..4cf5c84 100644
--- a/site/news/run-spark-and-shark-on-amazon-emr.html
+++ b/site/news/run-spark-and-shark-on-amazon-emr.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-0-6-1-and-0-5-2-released.html
----------------------------------------------------------------------
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 80a1aeb..155219f 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
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-0-6-2-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-0-6-2-released.html b/site/news/spark-0-6-2-released.html
index 289e60a..06c242e 100644
--- a/site/news/spark-0-6-2-released.html
+++ b/site/news/spark-0-6-2-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-0-7-0-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-0-7-0-released.html b/site/news/spark-0-7-0-released.html
index 418702e..4fb60bc 100644
--- a/site/news/spark-0-7-0-released.html
+++ b/site/news/spark-0-7-0-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-0-7-2-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-0-7-2-released.html b/site/news/spark-0-7-2-released.html
index 6158b18..b6e8ffe 100644
--- a/site/news/spark-0-7-2-released.html
+++ b/site/news/spark-0-7-2-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-0-7-3-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-0-7-3-released.html b/site/news/spark-0-7-3-released.html
index 0a57054..c632dfe 100644
--- a/site/news/spark-0-7-3-released.html
+++ b/site/news/spark-0-7-3-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-0-8-0-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-0-8-0-released.html b/site/news/spark-0-8-0-released.html
index 1715afe..c945a4e 100644
--- a/site/news/spark-0-8-0-released.html
+++ b/site/news/spark-0-8-0-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-0-8-1-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-0-8-1-released.html b/site/news/spark-0-8-1-released.html
index 9b179ef..1550bbc 100644
--- a/site/news/spark-0-8-1-released.html
+++ b/site/news/spark-0-8-1-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-0-9-0-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-0-9-0-released.html b/site/news/spark-0-9-0-released.html
index 43c0b2e..7cd82d1 100644
--- a/site/news/spark-0-9-0-released.html
+++ b/site/news/spark-0-9-0-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -220,10 +225,12 @@ 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 <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-0-9-1-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-0-9-1-released.html b/site/news/spark-0-9-1-released.html
index 4161e8c..5375124 100644
--- a/site/news/spark-0-9-1-released.html
+++ b/site/news/spark-0-9-1-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -219,10 +224,12 @@ 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 <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-0-9-2-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-0-9-2-released.html b/site/news/spark-0-9-2-released.html
index f90f62c..8db2686 100644
--- a/site/news/spark-0-9-2-released.html
+++ b/site/news/spark-0-9-2-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -218,10 +223,12 @@ 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 <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-1-0-0-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-1-0-0-released.html b/site/news/spark-1-0-0-released.html
index 0c38602..b7cf91b 100644
--- a/site/news/spark-1-0-0-released.html
+++ b/site/news/spark-1-0-0-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -216,10 +221,12 @@ 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 <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-1-0-1-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-1-0-1-released.html b/site/news/spark-1-0-1-released.html
index cefb7fc..7a35cad 100644
--- a/site/news/spark-1-0-1-released.html
+++ b/site/news/spark-1-0-1-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -215,10 +220,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-1-0-2-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-1-0-2-released.html b/site/news/spark-1-0-2-released.html
index 67df444..7c862b1 100644
--- a/site/news/spark-1-0-2-released.html
+++ b/site/news/spark-1-0-2-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -215,10 +220,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-1-1-0-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-1-1-0-released.html b/site/news/spark-1-1-0-released.html
index e36aa5d..61eceb2 100644
--- a/site/news/spark-1-1-0-released.html
+++ b/site/news/spark-1-1-0-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -217,10 +222,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-1-1-1-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-1-1-1-released.html b/site/news/spark-1-1-1-released.html
index fea4b10..5f551e5 100644
--- a/site/news/spark-1-1-1-released.html
+++ b/site/news/spark-1-1-1-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -215,10 +220,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-1-2-0-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-1-2-0-released.html b/site/news/spark-1-2-0-released.html
index 0cdb5cc..fca58b5 100644
--- a/site/news/spark-1-2-0-released.html
+++ b/site/news/spark-1-2-0-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -217,10 +222,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-1-2-1-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-1-2-1-released.html b/site/news/spark-1-2-1-released.html
index fe322db..4de13a3 100644
--- a/site/news/spark-1-2-1-released.html
+++ b/site/news/spark-1-2-1-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -215,10 +220,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-1-2-2-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-1-2-2-released.html b/site/news/spark-1-2-2-released.html
index 27d22f0..382ae3e 100644
--- a/site/news/spark-1-2-2-released.html
+++ b/site/news/spark-1-2-2-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -215,10 +220,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/spark-1-3-0-released.html
----------------------------------------------------------------------
diff --git a/site/news/spark-1-3-0-released.html b/site/news/spark-1-3-0-released.html
index 43fb488..fea8b3f 100644
--- a/site/news/spark-1-3-0-released.html
+++ b/site/news/spark-1-3-0-released.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -215,10 +220,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


[2/4] spark-website git commit: Add link to ApacheCon per Branding; fix a few other branding standards issues; fix sitemap.xml refs to localhost

Posted by sr...@apache.org.
http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/submit-talks-to-spark-summit-east-2016.html
----------------------------------------------------------------------
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 40cd008..1984db7 100644
--- a/site/news/submit-talks-to-spark-summit-east-2016.html
+++ b/site/news/submit-talks-to-spark-summit-east-2016.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/submit-talks-to-spark-summit-eu-2016.html
----------------------------------------------------------------------
diff --git a/site/news/submit-talks-to-spark-summit-eu-2016.html b/site/news/submit-talks-to-spark-summit-eu-2016.html
index 6820e17..8e33a17 100644
--- a/site/news/submit-talks-to-spark-summit-eu-2016.html
+++ b/site/news/submit-talks-to-spark-summit-eu-2016.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/two-weeks-to-spark-summit-2014.html
----------------------------------------------------------------------
diff --git a/site/news/two-weeks-to-spark-summit-2014.html b/site/news/two-weeks-to-spark-summit-2014.html
index 7e5beb6..3863298 100644
--- a/site/news/two-weeks-to-spark-summit-2014.html
+++ b/site/news/two-weeks-to-spark-summit-2014.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -223,10 +228,12 @@ 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 <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/news/video-from-first-spark-development-meetup.html
----------------------------------------------------------------------
diff --git a/site/news/video-from-first-spark-development-meetup.html b/site/news/video-from-first-spark-development-meetup.html
index f22e8fe..2be7f50 100644
--- a/site/news/video-from-first-spark-development-meetup.html
+++ b/site/news/video-from-first-spark-development-meetup.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -213,10 +218,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/powered-by.html
----------------------------------------------------------------------
diff --git a/site/powered-by.html b/site/powered-by.html
index fb85543..3449782 100644
--- a/site/powered-by.html
+++ b/site/powered-by.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -556,10 +561,12 @@ to process islands identified from a search robor</li>
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/release-process.html
----------------------------------------------------------------------
diff --git a/site/release-process.html b/site/release-process.html
index ed00524..e022e6e 100644
--- a/site/release-process.html
+++ b/site/release-process.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -509,10 +514,12 @@ and then send an e-mail to the mailing list. To create an announcement, create a
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-0-3.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-0-3.html b/site/releases/spark-release-0-3.html
index 0d0eef2..8659322 100644
--- a/site/releases/spark-release-0-3.html
+++ b/site/releases/spark-release-0-3.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -264,10 +269,12 @@ squares.saveAsSequenceFile(<span class="string">"hdfs://..."</span>)
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-0-5-0.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-0-5-0.html b/site/releases/spark-release-0-5-0.html
index f4f5926..639dd72 100644
--- a/site/releases/spark-release-0-5-0.html
+++ b/site/releases/spark-release-0-5-0.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -236,10 +241,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-0-5-1.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-0-5-1.html b/site/releases/spark-release-0-5-1.html
index c467dd7..0f5fa96 100644
--- a/site/releases/spark-release-0-5-1.html
+++ b/site/releases/spark-release-0-5-1.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -246,10 +251,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-0-5-2.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-0-5-2.html b/site/releases/spark-release-0-5-2.html
index d055015..4a85437 100644
--- a/site/releases/spark-release-0-5-2.html
+++ b/site/releases/spark-release-0-5-2.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -215,10 +220,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-0-6-0.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-0-6-0.html b/site/releases/spark-release-0-6-0.html
index c1043bf..0a41f1c 100644
--- a/site/releases/spark-release-0-6-0.html
+++ b/site/releases/spark-release-0-6-0.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -290,10 +295,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-0-6-1.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-0-6-1.html b/site/releases/spark-release-0-6-1.html
index 0e9d180..b224cc1 100644
--- a/site/releases/spark-release-0-6-1.html
+++ b/site/releases/spark-release-0-6-1.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -230,10 +235,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-0-6-2.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-0-6-2.html b/site/releases/spark-release-0-6-2.html
index 376a0af..83ffaa5 100644
--- a/site/releases/spark-release-0-6-2.html
+++ b/site/releases/spark-release-0-6-2.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -243,10 +248,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-0-7-0.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-0-7-0.html b/site/releases/spark-release-0-7-0.html
index d2541dd..3e5d81d 100644
--- a/site/releases/spark-release-0-7-0.html
+++ b/site/releases/spark-release-0-7-0.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -312,10 +317,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-0-7-2.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-0-7-2.html b/site/releases/spark-release-0-7-2.html
index ca812fb..d4f0ae5 100644
--- a/site/releases/spark-release-0-7-2.html
+++ b/site/releases/spark-release-0-7-2.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -254,10 +259,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-0-7-3.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-0-7-3.html b/site/releases/spark-release-0-7-3.html
index 3ecabd8..800600b 100644
--- a/site/releases/spark-release-0-7-3.html
+++ b/site/releases/spark-release-0-7-3.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -248,10 +253,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-0-8-0.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-0-8-0.html b/site/releases/spark-release-0-8-0.html
index 6b21098..adfd3f6 100644
--- a/site/releases/spark-release-0-8-0.html
+++ b/site/releases/spark-release-0-8-0.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -343,10 +348,12 @@ 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 <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-0-8-1.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-0-8-1.html b/site/releases/spark-release-0-8-1.html
index 64878e1..cada8f6 100644
--- a/site/releases/spark-release-0-8-1.html
+++ b/site/releases/spark-release-0-8-1.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -307,10 +312,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-0-9-0.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-0-9-0.html b/site/releases/spark-release-0-9-0.html
index ed5c612..176edd7 100644
--- a/site/releases/spark-release-0-9-0.html
+++ b/site/releases/spark-release-0-9-0.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -401,10 +406,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-0-9-1.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-0-9-1.html b/site/releases/spark-release-0-9-1.html
index db69927..65a730a 100644
--- a/site/releases/spark-release-0-9-1.html
+++ b/site/releases/spark-release-0-9-1.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -319,10 +324,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-0-9-2.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-0-9-2.html b/site/releases/spark-release-0-9-2.html
index b522909..a58c7ff 100644
--- a/site/releases/spark-release-0-9-2.html
+++ b/site/releases/spark-release-0-9-2.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -292,10 +297,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-1-0-0.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-0-0.html b/site/releases/spark-release-1-0-0.html
index 1e2ad37..9a3a9f0 100644
--- a/site/releases/spark-release-1-0-0.html
+++ b/site/releases/spark-release-1-0-0.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -385,10 +390,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-1-0-1.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-0-1.html b/site/releases/spark-release-1-0-1.html
index 9f3ccb2..a5c611e 100644
--- a/site/releases/spark-release-1-0-1.html
+++ b/site/releases/spark-release-1-0-1.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -343,10 +348,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-1-0-2.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-0-2.html b/site/releases/spark-release-1-0-2.html
index 98ce0e9..5ce7e9d 100644
--- a/site/releases/spark-release-1-0-2.html
+++ b/site/releases/spark-release-1-0-2.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -300,10 +305,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-1-1-0.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-1-0.html b/site/releases/spark-release-1-1-0.html
index 924835c..5941ebf 100644
--- a/site/releases/spark-release-1-1-0.html
+++ b/site/releases/spark-release-1-1-0.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -436,10 +441,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-1-1-1.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-1-1.html b/site/releases/spark-release-1-1-1.html
index 418a43b..82cc71a 100644
--- a/site/releases/spark-release-1-1-1.html
+++ b/site/releases/spark-release-1-1-1.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -322,10 +327,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-1-2-0.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-2-0.html b/site/releases/spark-release-1-2-0.html
index 4c3ea33..6d89163 100644
--- a/site/releases/spark-release-1-2-0.html
+++ b/site/releases/spark-release-1-2-0.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -450,10 +455,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-1-2-1.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-2-1.html b/site/releases/spark-release-1-2-1.html
index 3aa3379..815a6bb 100644
--- a/site/releases/spark-release-1-2-1.html
+++ b/site/releases/spark-release-1-2-1.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -322,10 +327,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-1-2-2.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-2-2.html b/site/releases/spark-release-1-2-2.html
index edc2d2c..40c1039 100644
--- a/site/releases/spark-release-1-2-2.html
+++ b/site/releases/spark-release-1-2-2.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -282,10 +287,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-1-3-0.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-3-0.html b/site/releases/spark-release-1-3-0.html
index 3573109..a1fc793 100644
--- a/site/releases/spark-release-1-3-0.html
+++ b/site/releases/spark-release-1-3-0.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -427,10 +432,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-1-3-1.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-3-1.html b/site/releases/spark-release-1-3-1.html
index 59f8569..5c355af 100644
--- a/site/releases/spark-release-1-3-1.html
+++ b/site/releases/spark-release-1-3-1.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -314,10 +319,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-1-4-0.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-4-0.html b/site/releases/spark-release-1-4-0.html
index ec099f8..9029ec1 100644
--- a/site/releases/spark-release-1-4-0.html
+++ b/site/releases/spark-release-1-4-0.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -541,10 +546,12 @@ Python coverage. MLlib also adds several new algorithms.</p>
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-1-4-1.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-4-1.html b/site/releases/spark-release-1-4-1.html
index b7497f4..198902b 100644
--- a/site/releases/spark-release-1-4-1.html
+++ b/site/releases/spark-release-1-4-1.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -346,10 +351,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-1-5-0.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-5-0.html b/site/releases/spark-release-1-5-0.html
index 60b97eb..beb452e 100644
--- a/site/releases/spark-release-1-5-0.html
+++ b/site/releases/spark-release-1-5-0.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -479,10 +484,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-1-5-1.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-5-1.html b/site/releases/spark-release-1-5-1.html
index db0f7e2..9501099 100644
--- a/site/releases/spark-release-1-5-1.html
+++ b/site/releases/spark-release-1-5-1.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -218,10 +223,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-1-5-2.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-5-2.html b/site/releases/spark-release-1-5-2.html
index 9106fed..ae0f379 100644
--- a/site/releases/spark-release-1-5-2.html
+++ b/site/releases/spark-release-1-5-2.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -217,10 +222,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-1-6-0.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-6-0.html b/site/releases/spark-release-1-6-0.html
index c45f230..329bc58 100644
--- a/site/releases/spark-release-1-6-0.html
+++ b/site/releases/spark-release-1-6-0.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -355,10 +360,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-1-6-1.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-6-1.html b/site/releases/spark-release-1-6-1.html
index 78c8530..1401a11 100644
--- a/site/releases/spark-release-1-6-1.html
+++ b/site/releases/spark-release-1-6-1.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -217,10 +222,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-1-6-2.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-6-2.html b/site/releases/spark-release-1-6-2.html
index d6501e8..d0970b3 100644
--- a/site/releases/spark-release-1-6-2.html
+++ b/site/releases/spark-release-1-6-2.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -217,10 +222,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-1-6-3.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-6-3.html b/site/releases/spark-release-1-6-3.html
index ae5a547..2135ba6 100644
--- a/site/releases/spark-release-1-6-3.html
+++ b/site/releases/spark-release-1-6-3.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -217,10 +222,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-2-0-0.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-2-0-0.html b/site/releases/spark-release-2-0-0.html
index bf52ac8..fe4a2bb 100644
--- a/site/releases/spark-release-2-0-0.html
+++ b/site/releases/spark-release-2-0-0.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -451,10 +456,12 @@ yzhou2001, zhonghaihua, zhuol, zlpmichelle, Örjan Lundberg, Łukasz Gieroń</p>
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-2-0-1.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-2-0-1.html b/site/releases/spark-release-2-0-1.html
index 5398588..d20085f 100644
--- a/site/releases/spark-release-2-0-1.html
+++ b/site/releases/spark-release-2-0-1.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -217,10 +222,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-2-0-2.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-2-0-2.html b/site/releases/spark-release-2-0-2.html
index e5d6e55..fbdd9e9 100644
--- a/site/releases/spark-release-2-0-2.html
+++ b/site/releases/spark-release-2-0-2.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -219,10 +224,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-2-1-0.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-2-1-0.html b/site/releases/spark-release-2-1-0.html
index 6318c14..f712a59 100644
--- a/site/releases/spark-release-2-1-0.html
+++ b/site/releases/spark-release-2-1-0.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -363,10 +368,12 @@ ALeksander Eskilson, Aaditya Ramesh, Adam Roberts, Adrian Petrescu, Ahmed Mahran
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-2-1-1.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-2-1-1.html b/site/releases/spark-release-2-1-1.html
index 750ae69..5ec54fb 100644
--- a/site/releases/spark-release-2-1-1.html
+++ b/site/releases/spark-release-2-1-1.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -217,10 +222,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-2-1-2.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-2-1-2.html b/site/releases/spark-release-2-1-2.html
index c7d1594..f402a11 100644
--- a/site/releases/spark-release-2-1-2.html
+++ b/site/releases/spark-release-2-1-2.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -217,10 +222,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-2-2-0.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-2-2-0.html b/site/releases/spark-release-2-2-0.html
index d3b6f2c..c02cc7f 100644
--- a/site/releases/spark-release-2-2-0.html
+++ b/site/releases/spark-release-2-2-0.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -429,10 +434,12 @@ ALeksander Eskilson, Aaditya Ramesh, Adam Budde, Adam Roberts, Adrian Ionescu, A
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-2-2-1.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-2-2-1.html b/site/releases/spark-release-2-2-1.html
index 8107e09..39aa9a4 100644
--- a/site/releases/spark-release-2-2-1.html
+++ b/site/releases/spark-release-2-2-1.html
@@ -177,6 +177,11 @@
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
+    <div style="text-align:center; margin-bottom: 20px;">
+      <a href="https://www.apache.org/events/current-event.html">
+        <img src="https://www.apache.org/events/current-event-234x60.png"/>
+      </a>
+    </div>
     <div class="hidden-xs hidden-sm">
       <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
         Download Spark
@@ -227,10 +232,12 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of
-  <a href="https://www.apache.org">The Apache Software Foundation</a>.
+  Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered
+  trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+  See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>.
+  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
   Copyright &copy; 2018 The Apache Software Foundation, Licensed under the
-  <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>.
+  <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>.
 </footer>
 
 </div>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org