Repository: spark-website Updated Branches: refs/heads/asf-site 7cb093853 -> b75134190
http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/releases/spark-release-2-3-0.html ---------------------------------------------------------------------- diff --git a/site/releases/spark-release-2-3-0.html b/site/releases/spark-release-2-3-0.html index a42019c..58e27cd 100644 --- a/site/releases/spark-release-2-3-0.html +++ b/site/releases/spark-release-2-3-0.html @@ -177,6 +177,11 @@ </ul> <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p> </div> + <div style="text-align:center; margin-bottom: 20px;"> + <a href="https://www.apache.org/events/current-event.html"> + <img src="https://www.apache.org/events/current-event-234x60.png"/> + </a> + </div> <div class="hidden-xs hidden-sm"> <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;"> Download Spark @@ -439,10 +444,12 @@ ALeksander Eskilson, Adrian Ionescu, Ajay Saini, Ala Luszczak, Albert Jang, Albe <footer class="small"> <hr> - Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of - <a href="https://www.apache.org">The Apache Software Foundation</a>. + Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered + trademarks or trademarks of The Apache Software Foundation in the United States and other countries. + See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>. + All other marks mentioned may be trademarks or registered trademarks of their respective owners. Copyright © 2018 The Apache Software Foundation, Licensed under the - <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>. + <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>. </footer> </div> http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/research.html ---------------------------------------------------------------------- diff --git a/site/research.html b/site/research.html index a7af8e9..5c94d11 100644 --- a/site/research.html +++ b/site/research.html @@ -177,6 +177,11 @@ </ul> <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p> </div> + <div style="text-align:center; margin-bottom: 20px;"> + <a href="https://www.apache.org/events/current-event.html"> + <img src="https://www.apache.org/events/current-event-234x60.png"/> + </a> + </div> <div class="hidden-xs hidden-sm"> <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;"> Download Spark @@ -261,10 +266,12 @@ Spark offers an abstraction called <a href="http://people.csail.mit.edu/matei/pa <footer class="small"> <hr> - Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of - <a href="https://www.apache.org">The Apache Software Foundation</a>. + Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered + trademarks or trademarks of The Apache Software Foundation in the United States and other countries. + See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>. + All other marks mentioned may be trademarks or registered trademarks of their respective owners. Copyright © 2018 The Apache Software Foundation, Licensed under the - <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>. + <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>. </footer> </div> http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/screencasts/1-first-steps-with-spark.html ---------------------------------------------------------------------- diff --git a/site/screencasts/1-first-steps-with-spark.html b/site/screencasts/1-first-steps-with-spark.html index 2e59923..bc92e5b 100644 --- a/site/screencasts/1-first-steps-with-spark.html +++ b/site/screencasts/1-first-steps-with-spark.html @@ -177,6 +177,11 @@ </ul> <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p> </div> + <div style="text-align:center; margin-bottom: 20px;"> + <a href="https://www.apache.org/events/current-event.html"> + <img src="https://www.apache.org/events/current-event-234x60.png"/> + </a> + </div> <div class="hidden-xs hidden-sm"> <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;"> Download Spark @@ -223,10 +228,12 @@ <footer class="small"> <hr> - Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of - <a href="https://www.apache.org">The Apache Software Foundation</a>. + Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered + trademarks or trademarks of The Apache Software Foundation in the United States and other countries. + See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>. + All other marks mentioned may be trademarks or registered trademarks of their respective owners. Copyright © 2018 The Apache Software Foundation, Licensed under the - <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>. + <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>. </footer> </div> http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/screencasts/2-spark-documentation-overview.html ---------------------------------------------------------------------- diff --git a/site/screencasts/2-spark-documentation-overview.html b/site/screencasts/2-spark-documentation-overview.html index 42b36fd..a4d9730 100644 --- a/site/screencasts/2-spark-documentation-overview.html +++ b/site/screencasts/2-spark-documentation-overview.html @@ -177,6 +177,11 @@ </ul> <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p> </div> + <div style="text-align:center; margin-bottom: 20px;"> + <a href="https://www.apache.org/events/current-event.html"> + <img src="https://www.apache.org/events/current-event-234x60.png"/> + </a> + </div> <div class="hidden-xs hidden-sm"> <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;"> Download Spark @@ -223,10 +228,12 @@ <footer class="small"> <hr> - Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of - <a href="https://www.apache.org">The Apache Software Foundation</a>. + Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered + trademarks or trademarks of The Apache Software Foundation in the United States and other countries. + See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>. + All other marks mentioned may be trademarks or registered trademarks of their respective owners. Copyright © 2018 The Apache Software Foundation, Licensed under the - <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>. + <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>. </footer> </div> http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/screencasts/3-transformations-and-caching.html ---------------------------------------------------------------------- diff --git a/site/screencasts/3-transformations-and-caching.html b/site/screencasts/3-transformations-and-caching.html index 6ea17ab..94e143e 100644 --- a/site/screencasts/3-transformations-and-caching.html +++ b/site/screencasts/3-transformations-and-caching.html @@ -177,6 +177,11 @@ </ul> <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p> </div> + <div style="text-align:center; margin-bottom: 20px;"> + <a href="https://www.apache.org/events/current-event.html"> + <img src="https://www.apache.org/events/current-event-234x60.png"/> + </a> + </div> <div class="hidden-xs hidden-sm"> <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;"> Download Spark @@ -219,10 +224,12 @@ <footer class="small"> <hr> - Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of - <a href="https://www.apache.org">The Apache Software Foundation</a>. + Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered + trademarks or trademarks of The Apache Software Foundation in the United States and other countries. + See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>. + All other marks mentioned may be trademarks or registered trademarks of their respective owners. Copyright © 2018 The Apache Software Foundation, Licensed under the - <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>. + <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>. </footer> </div> http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/screencasts/4-a-standalone-job-in-spark.html ---------------------------------------------------------------------- diff --git a/site/screencasts/4-a-standalone-job-in-spark.html b/site/screencasts/4-a-standalone-job-in-spark.html index a3d4873..65a613d 100644 --- a/site/screencasts/4-a-standalone-job-in-spark.html +++ b/site/screencasts/4-a-standalone-job-in-spark.html @@ -177,6 +177,11 @@ </ul> <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p> </div> + <div style="text-align:center; margin-bottom: 20px;"> + <a href="https://www.apache.org/events/current-event.html"> + <img src="https://www.apache.org/events/current-event-234x60.png"/> + </a> + </div> <div class="hidden-xs hidden-sm"> <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;"> Download Spark @@ -217,10 +222,12 @@ <footer class="small"> <hr> - Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of - <a href="https://www.apache.org">The Apache Software Foundation</a>. + Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered + trademarks or trademarks of The Apache Software Foundation in the United States and other countries. + See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>. + All other marks mentioned may be trademarks or registered trademarks of their respective owners. Copyright © 2018 The Apache Software Foundation, Licensed under the - <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>. + <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>. </footer> </div> http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/screencasts/index.html ---------------------------------------------------------------------- diff --git a/site/screencasts/index.html b/site/screencasts/index.html index bc55ba2..4e067c8 100644 --- a/site/screencasts/index.html +++ b/site/screencasts/index.html @@ -177,6 +177,11 @@ </ul> <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p> </div> + <div style="text-align:center; margin-bottom: 20px;"> + <a href="https://www.apache.org/events/current-event.html"> + <img src="https://www.apache.org/events/current-event-234x60.png"/> + </a> + </div> <div class="hidden-xs hidden-sm"> <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;"> Download Spark @@ -249,10 +254,12 @@ <footer class="small"> <hr> - Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of - <a href="https://www.apache.org">The Apache Software Foundation</a>. + Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered + trademarks or trademarks of The Apache Software Foundation in the United States and other countries. + See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>. + All other marks mentioned may be trademarks or registered trademarks of their respective owners. Copyright © 2018 The Apache Software Foundation, Licensed under the - <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>. + <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>. </footer> </div> http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/security.html ---------------------------------------------------------------------- diff --git a/site/security.html b/site/security.html index ef9638b..1ddaeb1 100644 --- a/site/security.html +++ b/site/security.html @@ -177,6 +177,11 @@ </ul> <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p> </div> + <div style="text-align:center; margin-bottom: 20px;"> + <a href="https://www.apache.org/events/current-event.html"> + <img src="https://www.apache.org/events/current-event-234x60.png"/> + </a> + </div> <div class="hidden-xs hidden-sm"> <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;"> Download Spark @@ -291,10 +296,12 @@ PGh0bWw+PHNjcmlwdD5hbGVydCgiWFNTIik8L3NjcmlwdD48L2h0bWw+ <footer class="small"> <hr> - Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of - <a href="https://www.apache.org">The Apache Software Foundation</a>. + Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered + trademarks or trademarks of The Apache Software Foundation in the United States and other countries. + See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>. + All other marks mentioned may be trademarks or registered trademarks of their respective owners. Copyright © 2018 The Apache Software Foundation, Licensed under the - <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>. + <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>. </footer> </div> http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/sitemap.xml ---------------------------------------------------------------------- diff --git a/site/sitemap.xml b/site/sitemap.xml index b54b754..863b9e0 100644 --- a/site/sitemap.xml +++ b/site/sitemap.xml @@ -139,613 +139,613 @@ </url> <!-- Auto-generate sitemap for rest of site content --> <url> - <loc>http://localhost:4000/news/spark-summit-june-2018-agenda-posted.html</loc> + <loc>https://spark.apache.org/news/spark-summit-june-2018-agenda-posted.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-2-3-0.html</loc> + <loc>https://spark.apache.org/releases/spark-release-2-3-0.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-2-3-0-released.html</loc> + <loc>https://spark.apache.org/news/spark-2-3-0-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-2-2-1.html</loc> + <loc>https://spark.apache.org/releases/spark-release-2-2-1.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-2-2-1-released.html</loc> + <loc>https://spark.apache.org/news/spark-2-2-1-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-2-1-2.html</loc> + <loc>https://spark.apache.org/releases/spark-release-2-1-2.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-2-1-2-released.html</loc> + <loc>https://spark.apache.org/news/spark-2-1-2-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-summit-eu-2017-agenda-posted.html</loc> + <loc>https://spark.apache.org/news/spark-summit-eu-2017-agenda-posted.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-2-2-0.html</loc> + <loc>https://spark.apache.org/releases/spark-release-2-2-0.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-2-2-0-released.html</loc> + <loc>https://spark.apache.org/news/spark-2-2-0-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-2-1-1.html</loc> + <loc>https://spark.apache.org/releases/spark-release-2-1-1.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-2-1-1-released.html</loc> + <loc>https://spark.apache.org/news/spark-2-1-1-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-summit-june-2017-agenda-posted.html</loc> + <loc>https://spark.apache.org/news/spark-summit-june-2017-agenda-posted.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-summit-east-2017-agenda-posted.html</loc> + <loc>https://spark.apache.org/news/spark-summit-east-2017-agenda-posted.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-2-1-0.html</loc> + <loc>https://spark.apache.org/releases/spark-release-2-1-0.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-2-1-0-released.html</loc> + <loc>https://spark.apache.org/news/spark-2-1-0-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-wins-cloudsort-100tb-benchmark.html</loc> + <loc>https://spark.apache.org/news/spark-wins-cloudsort-100tb-benchmark.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-2-0-2.html</loc> + <loc>https://spark.apache.org/releases/spark-release-2-0-2.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-2-0-2-released.html</loc> + <loc>https://spark.apache.org/news/spark-2-0-2-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-1-6-3.html</loc> + <loc>https://spark.apache.org/releases/spark-release-1-6-3.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-1-6-3-released.html</loc> + <loc>https://spark.apache.org/news/spark-1-6-3-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-2-0-1.html</loc> + <loc>https://spark.apache.org/releases/spark-release-2-0-1.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-2-0-1-released.html</loc> + <loc>https://spark.apache.org/news/spark-2-0-1-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-2-0-0.html</loc> + <loc>https://spark.apache.org/releases/spark-release-2-0-0.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-2-0-0-released.html</loc> + <loc>https://spark.apache.org/news/spark-2-0-0-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-1-6-2.html</loc> + <loc>https://spark.apache.org/releases/spark-release-1-6-2.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-1-6-2-released.html</loc> + <loc>https://spark.apache.org/news/spark-1-6-2-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/submit-talks-to-spark-summit-eu-2016.html</loc> + <loc>https://spark.apache.org/news/submit-talks-to-spark-summit-eu-2016.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-2.0.0-preview.html</loc> + <loc>https://spark.apache.org/news/spark-2.0.0-preview.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-summit-june-2016-agenda-posted.html</loc> + <loc>https://spark.apache.org/news/spark-summit-june-2016-agenda-posted.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-1-6-1.html</loc> + <loc>https://spark.apache.org/releases/spark-release-1-6-1.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-1-6-1-released.html</loc> + <loc>https://spark.apache.org/news/spark-1-6-1-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/submit-talks-to-spark-summit-2016.html</loc> + <loc>https://spark.apache.org/news/submit-talks-to-spark-summit-2016.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-summit-east-agenda-posted.html</loc> + <loc>https://spark.apache.org/news/spark-summit-east-agenda-posted.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-1-6-0.html</loc> + <loc>https://spark.apache.org/releases/spark-release-1-6-0.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-1-6-0-released.html</loc> + <loc>https://spark.apache.org/news/spark-1-6-0-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-summit-east-2016-cfp-closing.html</loc> + <loc>https://spark.apache.org/news/spark-summit-east-2016-cfp-closing.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-1-5-2.html</loc> + <loc>https://spark.apache.org/releases/spark-release-1-5-2.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-1-5-2-released.html</loc> + <loc>https://spark.apache.org/news/spark-1-5-2-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/submit-talks-to-spark-summit-east-2016.html</loc> + <loc>https://spark.apache.org/news/submit-talks-to-spark-summit-east-2016.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-1-5-1.html</loc> + <loc>https://spark.apache.org/releases/spark-release-1-5-1.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-1-5-1-released.html</loc> + <loc>https://spark.apache.org/news/spark-1-5-1-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-1-5-0.html</loc> + <loc>https://spark.apache.org/releases/spark-release-1-5-0.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-1-5-0-released.html</loc> + <loc>https://spark.apache.org/news/spark-1-5-0-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-summit-europe-agenda-posted.html</loc> + <loc>https://spark.apache.org/news/spark-summit-europe-agenda-posted.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-1-4-1.html</loc> + <loc>https://spark.apache.org/releases/spark-release-1-4-1.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-1-4-1-released.html</loc> + <loc>https://spark.apache.org/news/spark-1-4-1-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-summit-2015-videos-posted.html</loc> + <loc>https://spark.apache.org/news/spark-summit-2015-videos-posted.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-1-4-0.html</loc> + <loc>https://spark.apache.org/releases/spark-release-1-4-0.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-1-4-0-released.html</loc> + <loc>https://spark.apache.org/news/spark-1-4-0-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-summit-europe.html</loc> + <loc>https://spark.apache.org/news/spark-summit-europe.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/one-month-to-spark-summit-2015.html</loc> + <loc>https://spark.apache.org/news/one-month-to-spark-summit-2015.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-summit-east-2015-videos-posted.html</loc> + <loc>https://spark.apache.org/news/spark-summit-east-2015-videos-posted.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-1-3-1.html</loc> + <loc>https://spark.apache.org/releases/spark-release-1-3-1.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-1-2-2.html</loc> + <loc>https://spark.apache.org/releases/spark-release-1-2-2.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-1-2-2-released.html</loc> + <loc>https://spark.apache.org/news/spark-1-2-2-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-1-3-0.html</loc> + <loc>https://spark.apache.org/releases/spark-release-1-3-0.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-1-3-0-released.html</loc> + <loc>https://spark.apache.org/news/spark-1-3-0-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-1-2-1.html</loc> + <loc>https://spark.apache.org/releases/spark-release-1-2-1.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-1-2-1-released.html</loc> + <loc>https://spark.apache.org/news/spark-1-2-1-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-summit-east-agenda-posted.html</loc> + <loc>https://spark.apache.org/news/spark-summit-east-agenda-posted.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-1-2-0.html</loc> + <loc>https://spark.apache.org/releases/spark-release-1-2-0.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-1-2-0-released.html</loc> + <loc>https://spark.apache.org/news/spark-1-2-0-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-1-1-1.html</loc> + <loc>https://spark.apache.org/releases/spark-release-1-1-1.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-1-1-1-released.html</loc> + <loc>https://spark.apache.org/news/spark-1-1-1-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/registration-open-for-spark-summit-east.html</loc> + <loc>https://spark.apache.org/news/registration-open-for-spark-summit-east.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-wins-daytona-gray-sort-100tb-benchmark.html</loc> + <loc>https://spark.apache.org/news/spark-wins-daytona-gray-sort-100tb-benchmark.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/proposals-open-for-spark-summit-east.html</loc> + <loc>https://spark.apache.org/news/proposals-open-for-spark-summit-east.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-1-1-0.html</loc> + <loc>https://spark.apache.org/releases/spark-release-1-1-0.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-1-1-0-released.html</loc> + <loc>https://spark.apache.org/news/spark-1-1-0-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-1-0-2.html</loc> + <loc>https://spark.apache.org/releases/spark-release-1-0-2.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-1-0-2-released.html</loc> + <loc>https://spark.apache.org/news/spark-1-0-2-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-0-9-2.html</loc> + <loc>https://spark.apache.org/releases/spark-release-0-9-2.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-0-9-2-released.html</loc> + <loc>https://spark.apache.org/news/spark-0-9-2-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-summit-2014-videos-posted.html</loc> + <loc>https://spark.apache.org/news/spark-summit-2014-videos-posted.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-1-0-1.html</loc> + <loc>https://spark.apache.org/releases/spark-release-1-0-1.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-1-0-1-released.html</loc> + <loc>https://spark.apache.org/news/spark-1-0-1-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/two-weeks-to-spark-summit-2014.html</loc> + <loc>https://spark.apache.org/news/two-weeks-to-spark-summit-2014.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-1-0-0.html</loc> + <loc>https://spark.apache.org/releases/spark-release-1-0-0.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-1-0-0-released.html</loc> + <loc>https://spark.apache.org/news/spark-1-0-0-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-summit-agenda-posted.html</loc> + <loc>https://spark.apache.org/news/spark-summit-agenda-posted.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-0-9-1.html</loc> + <loc>https://spark.apache.org/releases/spark-release-0-9-1.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-0-9-1-released.html</loc> + <loc>https://spark.apache.org/news/spark-0-9-1-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/submit-talks-to-spark-summit-2014.html</loc> + <loc>https://spark.apache.org/news/submit-talks-to-spark-summit-2014.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-becomes-tlp.html</loc> + <loc>https://spark.apache.org/news/spark-becomes-tlp.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-0-9-0.html</loc> + <loc>https://spark.apache.org/releases/spark-release-0-9-0.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-0-9-0-released.html</loc> + <loc>https://spark.apache.org/news/spark-0-9-0-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-0-8-1.html</loc> + <loc>https://spark.apache.org/releases/spark-release-0-8-1.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-0-8-1-released.html</loc> + <loc>https://spark.apache.org/news/spark-0-8-1-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-summit-2013-is-a-wrap.html</loc> + <loc>https://spark.apache.org/news/spark-summit-2013-is-a-wrap.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/announcing-the-first-spark-summit.html</loc> + <loc>https://spark.apache.org/news/announcing-the-first-spark-summit.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-0-8-0.html</loc> + <loc>https://spark.apache.org/releases/spark-release-0-8-0.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-0-8-0-released.html</loc> + <loc>https://spark.apache.org/news/spark-0-8-0-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-user-survey-and-powered-by-page.html</loc> + <loc>https://spark.apache.org/news/spark-user-survey-and-powered-by-page.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/fourth-spark-screencast-published.html</loc> + <loc>https://spark.apache.org/news/fourth-spark-screencast-published.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/screencasts/4-a-standalone-job-in-spark.html</loc> + <loc>https://spark.apache.org/screencasts/4-a-standalone-job-in-spark.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/amp-camp-2013-registration-ope.html</loc> + <loc>https://spark.apache.org/news/amp-camp-2013-registration-ope.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-mailing-lists-moving-to-apache.html</loc> + <loc>https://spark.apache.org/news/spark-mailing-lists-moving-to-apache.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-0-7-3.html</loc> + <loc>https://spark.apache.org/releases/spark-release-0-7-3.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-0-7-3-released.html</loc> + <loc>https://spark.apache.org/news/spark-0-7-3-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-featured-in-wired.html</loc> + <loc>https://spark.apache.org/news/spark-featured-in-wired.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-accepted-into-apache-incubator.html</loc> + <loc>https://spark.apache.org/news/spark-accepted-into-apache-incubator.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-0-7-2.html</loc> + <loc>https://spark.apache.org/releases/spark-release-0-7-2.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-0-7-2-released.html</loc> + <loc>https://spark.apache.org/news/spark-0-7-2-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/screencasts/3-transformations-and-caching.html</loc> + <loc>https://spark.apache.org/screencasts/3-transformations-and-caching.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-screencasts-published.html</loc> + <loc>https://spark.apache.org/news/spark-screencasts-published.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/screencasts/2-spark-documentation-overview.html</loc> + <loc>https://spark.apache.org/screencasts/2-spark-documentation-overview.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/screencasts/1-first-steps-with-spark.html</loc> + <loc>https://spark.apache.org/screencasts/1-first-steps-with-spark.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/strata-exercises-now-available-online.html</loc> + <loc>https://spark.apache.org/news/strata-exercises-now-available-online.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-0-7-0.html</loc> + <loc>https://spark.apache.org/releases/spark-release-0-7-0.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-0-7-0-released.html</loc> + <loc>https://spark.apache.org/news/spark-0-7-0-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/run-spark-and-shark-on-amazon-emr.html</loc> + <loc>https://spark.apache.org/news/run-spark-and-shark-on-amazon-emr.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-0-6-2.html</loc> + <loc>https://spark.apache.org/releases/spark-release-0-6-2.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-0-6-2-released.html</loc> + <loc>https://spark.apache.org/news/spark-0-6-2-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-tips-from-quantifind.html</loc> + <loc>https://spark.apache.org/news/spark-tips-from-quantifind.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/video-from-first-spark-development-meetup.html</loc> + <loc>https://spark.apache.org/news/video-from-first-spark-development-meetup.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-and-shark-in-the-news.html</loc> + <loc>https://spark.apache.org/news/spark-and-shark-in-the-news.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-0-6-1.html</loc> + <loc>https://spark.apache.org/releases/spark-release-0-6-1.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-0-5-2.html</loc> + <loc>https://spark.apache.org/releases/spark-release-0-5-2.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-0-6-1-and-0-5-2-released.html</loc> + <loc>https://spark.apache.org/news/spark-0-6-1-and-0-5-2-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-0-6-0.html</loc> + <loc>https://spark.apache.org/releases/spark-release-0-6-0.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-version-0-6-0-released.html</loc> + <loc>https://spark.apache.org/news/spark-version-0-6-0-released.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-0-5-1.html</loc> + <loc>https://spark.apache.org/releases/spark-release-0-5-1.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-0-5-0.html</loc> + <loc>https://spark.apache.org/releases/spark-release-0-5-0.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/nsdi-paper.html</loc> + <loc>https://spark.apache.org/news/nsdi-paper.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/spark-meetups.html</loc> + <loc>https://spark.apache.org/news/spark-meetups.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/releases/spark-release-0-3.html</loc> + <loc>https://spark.apache.org/releases/spark-release-0-3.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/committers.html</loc> + <loc>https://spark.apache.org/committers.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/community.html</loc> + <loc>https://spark.apache.org/community.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/contributing.html</loc> + <loc>https://spark.apache.org/contributing.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/developer-tools.html</loc> + <loc>https://spark.apache.org/developer-tools.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/documentation.html</loc> + <loc>https://spark.apache.org/documentation.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/downloads.html</loc> + <loc>https://spark.apache.org/downloads.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/examples.html</loc> + <loc>https://spark.apache.org/examples.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/faq.html</loc> + <loc>https://spark.apache.org/faq.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/history.html</loc> + <loc>https://spark.apache.org/history.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/improvement-proposals.html</loc> + <loc>https://spark.apache.org/improvement-proposals.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/graphx/</loc> + <loc>https://spark.apache.org/graphx/</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/mllib/</loc> + <loc>https://spark.apache.org/mllib/</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/streaming/</loc> + <loc>https://spark.apache.org/streaming/</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/news/</loc> + <loc>https://spark.apache.org/news/</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/screencasts/</loc> + <loc>https://spark.apache.org/screencasts/</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/sql/</loc> + <loc>https://spark.apache.org/sql/</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/</loc> + <loc>https://spark.apache.org/</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/mailing-lists.html</loc> + <loc>https://spark.apache.org/mailing-lists.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/powered-by.html</loc> + <loc>https://spark.apache.org/powered-by.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/release-process.html</loc> + <loc>https://spark.apache.org/release-process.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/research.html</loc> + <loc>https://spark.apache.org/research.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/security.html</loc> + <loc>https://spark.apache.org/security.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/third-party-projects.html</loc> + <loc>https://spark.apache.org/third-party-projects.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/trademarks.html</loc> + <loc>https://spark.apache.org/trademarks.html</loc> <changefreq>weekly</changefreq> </url> <url> - <loc>http://localhost:4000/versioning-policy.html</loc> + <loc>https://spark.apache.org/versioning-policy.html</loc> <changefreq>weekly</changefreq> </url> http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/sql/index.html ---------------------------------------------------------------------- diff --git a/site/sql/index.html b/site/sql/index.html index f1f5856..46457b5 100644 --- a/site/sql/index.html +++ b/site/sql/index.html @@ -180,6 +180,11 @@ </ul> <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p> </div> + <div style="text-align:center; margin-bottom: 20px;"> + <a href="https://www.apache.org/events/current-event.html"> + <img src="https://www.apache.org/events/current-event-234x60.png"/> + </a> + </div> <div class="hidden-xs hidden-sm"> <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;"> Download Spark @@ -361,10 +366,12 @@ <footer class="small"> <hr> - Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of - <a href="https://www.apache.org">The Apache Software Foundation</a>. + Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered + trademarks or trademarks of The Apache Software Foundation in the United States and other countries. + See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>. + All other marks mentioned may be trademarks or registered trademarks of their respective owners. Copyright © 2018 The Apache Software Foundation, Licensed under the - <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>. + <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>. </footer> </div> http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/streaming/index.html ---------------------------------------------------------------------- diff --git a/site/streaming/index.html b/site/streaming/index.html index d67aeb2..0f051e8 100644 --- a/site/streaming/index.html +++ b/site/streaming/index.html @@ -180,6 +180,11 @@ </ul> <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p> </div> + <div style="text-align:center; margin-bottom: 20px;"> + <a href="https://www.apache.org/events/current-event.html"> + <img src="https://www.apache.org/events/current-event-234x60.png"/> + </a> + </div> <div class="hidden-xs hidden-sm"> <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;"> Download Spark @@ -339,10 +344,12 @@ <footer class="small"> <hr> - Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of - <a href="https://www.apache.org">The Apache Software Foundation</a>. + Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered + trademarks or trademarks of The Apache Software Foundation in the United States and other countries. + See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>. + All other marks mentioned may be trademarks or registered trademarks of their respective owners. Copyright © 2018 The Apache Software Foundation, Licensed under the - <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>. + <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>. </footer> </div> http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/third-party-projects.html ---------------------------------------------------------------------- diff --git a/site/third-party-projects.html b/site/third-party-projects.html index 353a00a..22e3740 100644 --- a/site/third-party-projects.html +++ b/site/third-party-projects.html @@ -177,6 +177,11 @@ </ul> <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p> </div> + <div style="text-align:center; margin-bottom: 20px;"> + <a href="https://www.apache.org/events/current-event.html"> + <img src="https://www.apache.org/events/current-event-234x60.png"/> + </a> + </div> <div class="hidden-xs hidden-sm"> <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;"> Download Spark @@ -294,10 +299,12 @@ transforming, and analyzing genomic data using Apache Spark</li> <footer class="small"> <hr> - Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of - <a href="https://www.apache.org">The Apache Software Foundation</a>. + Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered + trademarks or trademarks of The Apache Software Foundation in the United States and other countries. + See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>. + All other marks mentioned may be trademarks or registered trademarks of their respective owners. Copyright © 2018 The Apache Software Foundation, Licensed under the - <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>. + <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>. </footer> </div> http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/trademarks.html ---------------------------------------------------------------------- diff --git a/site/trademarks.html b/site/trademarks.html index f98a99c..3937b3c 100644 --- a/site/trademarks.html +++ b/site/trademarks.html @@ -177,6 +177,11 @@ </ul> <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p> </div> + <div style="text-align:center; margin-bottom: 20px;"> + <a href="https://www.apache.org/events/current-event.html"> + <img src="https://www.apache.org/events/current-event-234x60.png"/> + </a> + </div> <div class="hidden-xs hidden-sm"> <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;"> Download Spark @@ -263,10 +268,12 @@ If you have any questions about the Apache trademark policy, please email <footer class="small"> <hr> - Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of - <a href="https://www.apache.org">The Apache Software Foundation</a>. + Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered + trademarks or trademarks of The Apache Software Foundation in the United States and other countries. + See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>. + All other marks mentioned may be trademarks or registered trademarks of their respective owners. Copyright © 2018 The Apache Software Foundation, Licensed under the - <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>. + <a href="https://www.apache.org/licenses/">Apache License, Version 2.0</a>. </footer> </div> http://git-wip-us.apache.org/repos/asf/spark-website/blob/b7513419/site/versioning-policy.html ---------------------------------------------------------------------- diff --git a/site/versioning-policy.html b/site/versioning-policy.html index 3269609..a51414c 100644 --- a/site/versioning-policy.html +++ b/site/versioning-policy.html @@ -177,6 +177,11 @@ </ul> <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p> </div> + <div style="text-align:center; margin-bottom: 20px;"> + <a href="https://www.apache.org/events/current-event.html"> + <img src="https://www.apache.org/events/current-event-234x60.png"/> + </a> + </div> <div class="hidden-xs hidden-sm"> <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;"> Download Spark @@ -283,10 +288,12 @@ release. Major releases do not happen according to a fixed schedule.</p> <footer class="small"> <hr> - Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of - <a href="https://www.apache.org">The Apache Software Foundation</a>. + Apache Spark, Spark, Apache, the Apache feather logo, and the Apache Spark project logo are either registered + trademarks or trademarks of The Apache Software Foundation in the United States and other countries. + See guidance on use of Apache Spark <a href="/trademarks.html">trademarks</a>. + All other marks mentioned may be trademarks or registered trademarks of their respective owners. Copyright © 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: [email protected] For additional commands, e-mail: [email protected]
