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:03 UTC

[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

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