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 <sro...@gmail.com>
Authored: Mon Apr 9 11:52:25 2018 -0500
Committer: Sean Owen <sro...@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 `d...@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>d...@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-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to