diff options
| author | Matei Zaharia <matei@databricks.com> | 2016-08-03 19:12:55 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@databricks.com> | 2016-08-03 19:12:55 -0700 |
| commit | 9700f2f4afe566412bdb73b443b3aad99b375af1 (patch) | |
| tree | 34e05bf37c3951c1308db06673e982e0cae20509 /site/documentation.html | |
| parent | 612383440bfa727a9980cf83460b8f32df8d666c (diff) | |
| download | spark-website-9700f2f4afe566412bdb73b443b3aad99b375af1.tar.gz spark-website-9700f2f4afe566412bdb73b443b3aad99b375af1.tar.bz2 spark-website-9700f2f4afe566412bdb73b443b3aad99b375af1.zip | |
Trademarks page and some FAQ cleanup
Diffstat (limited to 'site/documentation.html')
| -rw-r--r-- | site/documentation.html | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/site/documentation.html b/site/documentation.html index 4290b04bf..652281d11 100644 --- a/site/documentation.html +++ b/site/documentation.html @@ -253,13 +253,12 @@ </ul> <h4><a name="meetup-videos"></a>Meetup Talk Videos</h4> -<p>In addition to the videos listed below, you can also view <a href="http://www.meetup.com/spark-users/files/">all slides from Bay Area meetups here</a>.</p> +<p>In addition to the videos listed below, you can also view <a href="http://www.meetup.com/spark-users/files/">all slides from Bay Area meetups here</a>. <style type="text/css"> .video-meta-info { font-size: 0.95em; } -</style> - +</style></p> <ul> <li><a href="http://www.youtube.com/watch?v=NUQ-8to2XAk&list=PL-x35fyliRwiP3YteXbnhk0QGOtYLBT3a">Spark 1.0 and Beyond</a> (<a href="http://files.meetup.com/3138542/Spark%201.0%20Meetup.ppt">slides</a>) <span class="video-meta-info">by Patrick Wendell, at Cisco in San Jose, 2014-04-23</span></li> @@ -369,7 +368,7 @@ 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="https://www.apache.org/foundation/marks/">trademarks</a> of + Apache Spark, Spark, Apache, and the Spark logo are <a href="/trademarks.html">trademarks</a> of <a href="http://www.apache.org">The Apache Software Foundation</a>. </footer> |