Repository: spark-website
Updated Branches:
  refs/heads/asf-site 612383440 -> 9700f2f4a


http://git-wip-us.apache.org/repos/asf/spark-website/blob/9700f2f4/site/releases/spark-release-1-2-1.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-2-1.html 
b/site/releases/spark-release-1-2-1.html
index 3fbd588..e9e3bd6 100644
--- a/site/releases/spark-release-1-2-1.html
+++ b/site/releases/spark-release-1-2-1.html
@@ -310,7 +310,7 @@
 
 <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>
 

http://git-wip-us.apache.org/repos/asf/spark-website/blob/9700f2f4/site/releases/spark-release-1-2-2.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-2-2.html 
b/site/releases/spark-release-1-2-2.html
index b23ee12..ad2e109 100644
--- a/site/releases/spark-release-1-2-2.html
+++ b/site/releases/spark-release-1-2-2.html
@@ -270,7 +270,7 @@
 
 <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>
 

http://git-wip-us.apache.org/repos/asf/spark-website/blob/9700f2f4/site/releases/spark-release-1-3-0.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-3-0.html 
b/site/releases/spark-release-1-3-0.html
index aaf8486..f37a59d 100644
--- a/site/releases/spark-release-1-3-0.html
+++ b/site/releases/spark-release-1-3-0.html
@@ -191,7 +191,7 @@
 <p>To download Spark 1.3 visit the <a href="/downloads.html">downloads</a> 
page.</p>
 
 <h3 id="spark-core">Spark Core</h3>
-<p>Spark 1.3 sees a handful of usability improvements in the core engine. The 
core API now supports <a 
href="https://issues.apache.org/jira/browse/SPARK-5430";>multi level aggregation 
trees</a> to help speed up expensive reduce operations. <a 
href="https://issues.apache.org/jira/browse/SPARK-5063";>Improved error 
reporting</a> has been added for certain gotcha operations. Spark&#8217;s Jetty 
dependency is <a href="https://issues.apache.org/jira/browse/SPARK-3996";>now 
shaded</a> to help avoid conflicts with user programs. Spark now supports <a 
href="https://issues.apache.org/jira/browse/SPARK-3883";>SSL encryption</a> for 
some communication endpoints. Finaly, realtime <a 
href="https://issues.apache.org/jira/browse/SPARK-3428";>GC metrics</a> and <a 
href="https://issues.apache.org/jira/browse/SPARK-4874";>record counts</a> have 
been added to the UI.</p>
+<p>Spark 1.3 sees a handful of usability improvements in the core engine. The 
core API now supports <a 
href="https://issues.apache.org/jira/browse/SPARK-5430";>multi level aggregation 
trees</a> to help speed up expensive reduce operations. <a 
href="https://issues.apache.org/jira/browse/SPARK-5063";>Improved error 
reporting</a> has been added for certain gotcha operations. Spark&#8217;s Jetty 
dependency is <a href="https://issues.apache.org/jira/browse/SPARK-3996";>now 
shaded</a> to help avoid conflicts with user programs. Spark now supports <a 
href="https://issues.apache.org/jira/browse/SPARK-3883";>SSL encryption</a> for 
some communication endpoints. Finaly, realtime <a 
href="https://issues.apache.org/jira/browse/SPARK-3428";>GC metrics</a> and <a 
href="https://issues.apache.org/jira/browse/SPARK-4874";>record counts</a> have 
been added to the UI. </p>
 
 <h3 id="dataframe-api">DataFrame API</h3>
 <p>Spark 1.3 adds a new <a 
href="/docs/1.3.0/sql-programming-guide.html#dataframes">DataFrames API</a> 
that provides powerful and convenient operators when working with structured 
datasets. The DataFrame is an evolution of the base RDD API that includes named 
fields along with schema information. It’s easy to construct a DataFrame from 
sources such as Hive tables, JSON data, a JDBC database, or any implementation 
of Spark’s new data source API. Data frames will become a common interchange 
format between Spark components and when importing and exporting data to other 
systems. Data frames are supported in Python, Scala, and Java.</p>
@@ -203,7 +203,7 @@
 <p>In this release Spark MLlib introduces several new algorithms: latent 
Dirichlet allocation (LDA) for <a 
href="https://issues.apache.org/jira/browse/SPARK-1405";>topic modeling</a>, <a 
href="https://issues.apache.org/jira/browse/SPARK-2309";>multinomial logistic 
regression</a> for multiclass classification, <a 
href="https://issues.apache.org/jira/browse/SPARK-5012";>Gaussian mixture model 
(GMM)</a> and <a href="https://issues.apache.org/jira/browse/SPARK-4259";>power 
iteration clustering</a> for clustering, <a 
href="https://issues.apache.org/jira/browse/SPARK-4001";>FP-growth</a> for 
frequent pattern mining, and <a 
href="https://issues.apache.org/jira/browse/SPARK-4409";>block matrix 
abstraction</a> for distributed linear algebra. Initial support has been added 
for <a href="https://issues.apache.org/jira/browse/SPARK-4587";>model 
import/export</a> in exchangeable format, which will be expanded in future 
versions to cover more model types in Java/Python/Scala. The implementations of 
k-mea
 ns and ALS receive <a href="https://issues.apache.org/jira/browse/SPARK-3424, 
https://issues.apache.org/jira/browse/SPARK-3541";>updates</a> that lead to 
significant performance gain. PySpark now supports the <a 
href="https://issues.apache.org/jira/browse/SPARK-4586";>ML pipeline API</a> 
added in Spark 1.2, and <a 
href="https://issues.apache.org/jira/browse/SPARK-5094";>gradient boosted 
trees</a> and <a 
href="https://issues.apache.org/jira/browse/SPARK-5012";>Gaussian mixture 
model</a>. Finally, the ML pipeline API has been ported to support the new 
DataFrames abstraction.</p>
 
 <h3 id="spark-streaming">Spark Streaming</h3>
-<p>Spark 1.3 introduces a new <a 
href="https://issues.apache.org/jira/browse/SPARK-4964";><em>direct</em> Kafka 
API</a> (<a 
href="http://spark.apache.org/docs/1.3.0/streaming-kafka-integration.html";>docs</a>)
 which enables exactly-once delivery without the use of write ahead logs. It 
also adds a <a href="https://issues.apache.org/jira/browse/SPARK-5047";>Python 
Kafka API</a> along with infrastructure for additional Python API’s in future 
releases. An online version of <a 
href="https://issues.apache.org/jira/browse/SPARK-4979";>logistic regression</a> 
and the ability to read <a 
href="https://issues.apache.org/jira/browse/SPARK-4969";>binary records</a> have 
also been added. For stateful operations, support has been added for loading of 
an <a href="https://issues.apache.org/jira/browse/SPARK-3660";>initial state 
RDD</a>. Finally, the streaming programming guide has been updated to include 
information about SQL and DataFrame operations within streaming applications, 
and important clarific
 ations to the fault-tolerance semantics.</p>
+<p>Spark 1.3 introduces a new <a 
href="https://issues.apache.org/jira/browse/SPARK-4964";><em>direct</em> Kafka 
API</a> (<a 
href="http://spark.apache.org/docs/1.3.0/streaming-kafka-integration.html";>docs</a>)
 which enables exactly-once delivery without the use of write ahead logs. It 
also adds a <a href="https://issues.apache.org/jira/browse/SPARK-5047";>Python 
Kafka API</a> along with infrastructure for additional Python API’s in future 
releases. An online version of <a 
href="https://issues.apache.org/jira/browse/SPARK-4979";>logistic regression</a> 
and the ability to read <a 
href="https://issues.apache.org/jira/browse/SPARK-4969";>binary records</a> have 
also been added. For stateful operations, support has been added for loading of 
an <a href="https://issues.apache.org/jira/browse/SPARK-3660";>initial state 
RDD</a>. Finally, the streaming programming guide has been updated to include 
information about SQL and DataFrame operations within streaming applications, 
and important clarific
 ations to the fault-tolerance semantics. </p>
 
 <h3 id="graphx">GraphX</h3>
 <p>GraphX adds a handful of utility functions in this release, including 
conversion into a <a 
href="https://issues.apache.org/jira/browse/SPARK-4917";>canonical edge 
graph</a>.</p>
@@ -219,7 +219,7 @@
 <ul>
   <li><a 
href="https://issues.apache.org/jira/browse/SPARK-6194";>SPARK-6194</a>: A 
memory leak in PySPark&#8217;s <code>collect()</code>.</li>
   <li><a 
href="https://issues.apache.org/jira/browse/SPARK-6222";>SPARK-6222</a>: An 
issue with failure recovery in Spark Streaming.</li>
-  <li><a 
href="https://issues.apache.org/jira/browse/SPARK-6315";>SPARK-6315</a>: Spark 
SQL can&#8217;t read parquet data generated with Spark 1.1.</li>
+  <li><a 
href="https://issues.apache.org/jira/browse/SPARK-6315";>SPARK-6315</a>: Spark 
SQL can&#8217;t read parquet data generated with Spark 1.1. </li>
   <li><a 
href="https://issues.apache.org/jira/browse/SPARK-6247";>SPARK-6247</a>: Errors 
analyzing certain join types in Spark SQL.</li>
 </ul>
 
@@ -415,7 +415,7 @@
 
 <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>
 

http://git-wip-us.apache.org/repos/asf/spark-website/blob/9700f2f4/site/releases/spark-release-1-3-1.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-3-1.html 
b/site/releases/spark-release-1-3-1.html
index e13b6ac..5c444b6 100644
--- a/site/releases/spark-release-1-3-1.html
+++ b/site/releases/spark-release-1-3-1.html
@@ -196,10 +196,10 @@
 <h4 id="spark-sql">Spark SQL</h4>
 <ul>
   <li>Unable to use reserved words in DDL (<a 
href="http://issues.apache.org/jira/browse/SPARK-6250";>SPARK-6250</a>)</li>
-  <li>Parquet no longer caches metadata (<a 
href="http://issues.apache.org/jira/browse/SPARK-6575";>SPARK-6575</a>)</li>
+  <li>Parquet no longer caches metadata (<a 
href="http://issues.apache.org/jira/browse/SPARK-6575";>SPARK-6575</a>) </li>
   <li>Bug when joining two Parquet tables (<a 
href="http://issues.apache.org/jira/browse/SPARK-6851";>SPARK-6851</a>)</li>
-  <li>Unable to read parquet data generated by Spark 1.1.1 (<a 
href="http://issues.apache.org/jira/browse/SPARK-6315";>SPARK-6315</a>)</li>
-  <li>Parquet data source may use wrong Hadoop FileSystem (<a 
href="http://issues.apache.org/jira/browse/SPARK-6330";>SPARK-6330</a>)</li>
+  <li>Unable to read parquet data generated by Spark 1.1.1 (<a 
href="http://issues.apache.org/jira/browse/SPARK-6315";>SPARK-6315</a>) </li>
+  <li>Parquet data source may use wrong Hadoop FileSystem (<a 
href="http://issues.apache.org/jira/browse/SPARK-6330";>SPARK-6330</a>) </li>
 </ul>
 
 <h4 id="spark-streaming">Spark Streaming</h4>
@@ -302,7 +302,7 @@
 
 <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>
 

http://git-wip-us.apache.org/repos/asf/spark-website/blob/9700f2f4/site/releases/spark-release-1-4-0.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-4-0.html 
b/site/releases/spark-release-1-4-0.html
index c5ba820..e6e1f02 100644
--- a/site/releases/spark-release-1-4-0.html
+++ b/site/releases/spark-release-1-4-0.html
@@ -250,7 +250,7 @@ Python coverage. MLlib also adds several new algorithms.</p>
 </ul>
 
 <h3 id="spark-streaming">Spark Streaming</h3>
-<p>Spark streaming adds visual instrumentation graphs and significantly 
improved debugging information in the UI. It also enhances support for both 
Kafka and Kinesis.</p>
+<p>Spark streaming adds visual instrumentation graphs and significantly 
improved debugging information in the UI. It also enhances support for both 
Kafka and Kinesis. </p>
 
 <ul>
   <li><a 
href="https://issues.apache.org/jira/browse/SPARK-7602";>SPARK-7602</a>: 
Visualization and monitoring in the streaming UI including batch drill down (<a 
href="https://issues.apache.org/jira/browse/SPARK-6796";>SPARK-6796</a>, <a 
href="https://issues.apache.org/jira/browse/SPARK-6862";>SPARK-6862</a>)</li>
@@ -276,7 +276,7 @@ Python coverage. MLlib also adds several new algorithms.</p>
 
 <h4 id="test-partners">Test Partners</h4>
 
-<p>Thanks to The following organizations, who helped benchmark or integration 
test release candidates: <br /> Intel, Palantir, Cloudera, Mesosphere, Huawei, 
Shopify, Netflix, Yahoo, UC Berkeley and Databricks.</p>
+<p>Thanks to The following organizations, who helped benchmark or integration 
test release candidates: <br /> Intel, Palantir, Cloudera, Mesosphere, Huawei, 
Shopify, Netflix, Yahoo, UC Berkeley and Databricks. </p>
 
 <h4 id="contributors">Contributors</h4>
 <ul>
@@ -529,7 +529,7 @@ Python coverage. MLlib also adds several new algorithms.</p>
 
 <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>
 

http://git-wip-us.apache.org/repos/asf/spark-website/blob/9700f2f4/site/releases/spark-release-1-4-1.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-4-1.html 
b/site/releases/spark-release-1-4-1.html
index 78815d3..a22ed35 100644
--- a/site/releases/spark-release-1-4-1.html
+++ b/site/releases/spark-release-1-4-1.html
@@ -334,7 +334,7 @@
 
 <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>
 

http://git-wip-us.apache.org/repos/asf/spark-website/blob/9700f2f4/site/releases/spark-release-1-5-0.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-5-0.html 
b/site/releases/spark-release-1-5-0.html
index 4198515..9cd7351 100644
--- a/site/releases/spark-release-1-5-0.html
+++ b/site/releases/spark-release-1-5-0.html
@@ -191,25 +191,25 @@
 <p>You can consult JIRA for the <a 
href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315420&amp;version=12332078";>detailed
 changes</a>. We have curated a list of high level changes here:</p>
 
 <ul id="markdown-toc">
-  <li><a href="#apis-rdd-dataframe-and-sql" 
id="markdown-toc-apis-rdd-dataframe-and-sql">APIs: RDD, DataFrame and 
SQL</a></li>
-  <li><a href="#backend-execution-dataframe-and-sql" 
id="markdown-toc-backend-execution-dataframe-and-sql">Backend Execution: 
DataFrame and SQL</a></li>
-  <li><a 
href="#integrations-data-sources-hive-hadoop-mesos-and-cluster-management" 
id="markdown-toc-integrations-data-sources-hive-hadoop-mesos-and-cluster-management">Integrations:
 Data Sources, Hive, Hadoop, Mesos and Cluster Management</a></li>
-  <li><a href="#r-language" id="markdown-toc-r-language">R Language</a></li>
-  <li><a href="#machine-learning-and-advanced-analytics" 
id="markdown-toc-machine-learning-and-advanced-analytics">Machine Learning and 
Advanced Analytics</a></li>
-  <li><a href="#spark-streaming" id="markdown-toc-spark-streaming">Spark 
Streaming</a></li>
-  <li><a href="#deprecations-removals-configs-and-behavior-changes" 
id="markdown-toc-deprecations-removals-configs-and-behavior-changes">Deprecations,
 Removals, Configs, and Behavior Changes</a>    <ul>
-      <li><a href="#spark-core" id="markdown-toc-spark-core">Spark 
Core</a></li>
-      <li><a href="#spark-sql--dataframes" 
id="markdown-toc-spark-sql--dataframes">Spark SQL &amp; DataFrames</a></li>
-      <li><a href="#spark-streaming-1" 
id="markdown-toc-spark-streaming-1">Spark Streaming</a></li>
-      <li><a href="#mllib" id="markdown-toc-mllib">MLlib</a></li>
+  <li><a href="#apis-rdd-dataframe-and-sql">APIs: RDD, DataFrame and 
SQL</a></li>
+  <li><a href="#backend-execution-dataframe-and-sql">Backend Execution: 
DataFrame and SQL</a></li>
+  <li><a 
href="#integrations-data-sources-hive-hadoop-mesos-and-cluster-management">Integrations:
 Data Sources, Hive, Hadoop, Mesos and Cluster Management</a></li>
+  <li><a href="#r-language">R Language</a></li>
+  <li><a href="#machine-learning-and-advanced-analytics">Machine Learning and 
Advanced Analytics</a></li>
+  <li><a href="#spark-streaming">Spark Streaming</a></li>
+  <li><a 
href="#deprecations-removals-configs-and-behavior-changes">Deprecations, 
Removals, Configs, and Behavior Changes</a>    <ul>
+      <li><a href="#spark-core">Spark Core</a></li>
+      <li><a href="#spark-sql--dataframes">Spark SQL &amp; DataFrames</a></li>
+      <li><a href="#spark-streaming-1">Spark Streaming</a></li>
+      <li><a href="#mllib">MLlib</a></li>
     </ul>
   </li>
-  <li><a href="#known-issues" id="markdown-toc-known-issues">Known Issues</a>  
  <ul>
-      <li><a href="#sqldataframe" 
id="markdown-toc-sqldataframe">SQL/DataFrame</a></li>
-      <li><a href="#streaming" id="markdown-toc-streaming">Streaming</a></li>
+  <li><a href="#known-issues">Known Issues</a>    <ul>
+      <li><a href="#sqldataframe">SQL/DataFrame</a></li>
+      <li><a href="#streaming">Streaming</a></li>
     </ul>
   </li>
-  <li><a href="#credits" id="markdown-toc-credits">Credits</a></li>
+  <li><a href="#credits">Credits</a></li>
 </ul>
 
 <h3 id="apis-rdd-dataframe-and-sql">APIs: RDD, DataFrame and SQL</h3>
@@ -467,7 +467,7 @@
 
 <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>
 

http://git-wip-us.apache.org/repos/asf/spark-website/blob/9700f2f4/site/releases/spark-release-1-5-1.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-5-1.html 
b/site/releases/spark-release-1-5-1.html
index 8ad0494..41e7ad3 100644
--- a/site/releases/spark-release-1-5-1.html
+++ b/site/releases/spark-release-1-5-1.html
@@ -206,7 +206,7 @@
 
 <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>
 

http://git-wip-us.apache.org/repos/asf/spark-website/blob/9700f2f4/site/releases/spark-release-1-5-2.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-5-2.html 
b/site/releases/spark-release-1-5-2.html
index d6571d0..506be62 100644
--- a/site/releases/spark-release-1-5-2.html
+++ b/site/releases/spark-release-1-5-2.html
@@ -205,7 +205,7 @@
 
 <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>
 

http://git-wip-us.apache.org/repos/asf/spark-website/blob/9700f2f4/site/releases/spark-release-1-6-0.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-6-0.html 
b/site/releases/spark-release-1-6-0.html
index 225c109..64b56c3 100644
--- a/site/releases/spark-release-1-6-0.html
+++ b/site/releases/spark-release-1-6-0.html
@@ -191,13 +191,13 @@
 <p>You can consult JIRA for the <a 
href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12333083&amp;projectId=12315420";>detailed
 changes</a>. We have curated a list of high level changes here:</p>
 
 <ul id="markdown-toc">
-  <li><a href="#spark-coresql" id="markdown-toc-spark-coresql">Spark 
Core/SQL</a></li>
-  <li><a href="#spark-streaming" id="markdown-toc-spark-streaming">Spark 
Streaming</a></li>
-  <li><a href="#mllib" id="markdown-toc-mllib">MLlib</a></li>
-  <li><a href="#deprecations" 
id="markdown-toc-deprecations">Deprecations</a></li>
-  <li><a href="#changes-of-behavior" 
id="markdown-toc-changes-of-behavior">Changes of behavior</a></li>
-  <li><a href="#known-issues" id="markdown-toc-known-issues">Known 
issues</a></li>
-  <li><a href="#credits" id="markdown-toc-credits">Credits</a></li>
+  <li><a href="#spark-coresql">Spark Core/SQL</a></li>
+  <li><a href="#spark-streaming">Spark Streaming</a></li>
+  <li><a href="#mllib">MLlib</a></li>
+  <li><a href="#deprecations">Deprecations</a></li>
+  <li><a href="#changes-of-behavior">Changes of behavior</a></li>
+  <li><a href="#known-issues">Known issues</a></li>
+  <li><a href="#credits">Credits</a></li>
 </ul>
 
 <h3 id="spark-coresql">Spark Core/SQL</h3>
@@ -220,7 +220,7 @@
     <ul>
       <li><a 
href="https://issues.apache.org/jira/browse/SPARK-10000";>SPARK-10000</a> 
<strong>Unified Memory Management</strong>  - Shared memory for execution and 
caching instead of exclusive division of the regions.</li>
       <li><a 
href="https://issues.apache.org/jira/browse/SPARK-11787";>SPARK-11787</a> 
<strong>Parquet Performance</strong> - Improve Parquet scan performance when 
using flat schemas.</li>
-      <li><a 
href="https://issues.apache.org/jira/browse/SPARK-9241";>SPARK-9241&#160;</a> 
<strong>Improved query planner for queries having distinct 
aggregations</strong> - Query plans of distinct aggregations are more robust 
when distinct columns have high cardinality.</li>
+      <li><a 
href="https://issues.apache.org/jira/browse/SPARK-9241";>SPARK-9241&#160;</a> 
<strong>Improved query planner for queries having distinct 
aggregations</strong> - Query plans of distinct aggregations are more robust 
when distinct columns have high cardinality. </li>
       <li><a 
href="https://issues.apache.org/jira/browse/SPARK-9858";>SPARK-9858&#160;</a> 
<strong>Adaptive query execution</strong> - Initial support for automatically 
selecting the number of reducers for joins and aggregations.</li>
       <li><a 
href="https://issues.apache.org/jira/browse/SPARK-10978";>SPARK-10978</a> 
<strong>Avoiding double filters in Data Source API</strong> - When implementing 
a data source with filter pushdown, developers can now tell Spark SQL to avoid 
double evaluating a pushed-down filter.</li>
       <li><a 
href="https://issues.apache.org/jira/browse/SPARK-11111";>SPARK-11111</a> 
<strong>Fast null-safe joins</strong> - Joins using null-safe equality 
(<code>&lt;=&gt;</code>) will now execute using SortMergeJoin instead of 
computing a cartisian product.</li>
@@ -233,7 +233,7 @@
 <h3 id="spark-streaming">Spark Streaming</h3>
 
 <ul>
-  <li><strong>API Updates</strong>
+  <li><strong>API Updates</strong> 
     <ul>
       <li><a 
href="https://issues.apache.org/jira/browse/SPARK-2629";>SPARK-2629&#160;</a> 
<strong>New improved state management</strong> - <code>mapWithState</code> - a 
DStream transformation for stateful stream processing, supercedes 
<code>updateStateByKey</code> in functionality and performance.</li>
       <li><a 
href="https://issues.apache.org/jira/browse/SPARK-11198";>SPARK-11198</a> 
<strong>Kinesis record deaggregation</strong> - Kinesis streams have been 
upgraded to use KCL 1.4.0 and supports transparent deaggregation of 
KPL-aggregated records.</li>
@@ -244,7 +244,7 @@
   <li><strong>UI Improvements</strong>
     <ul>
       <li>Made failures visible in the streaming tab, in the timelines, batch 
list, and batch details page.</li>
-      <li>Made output operations visible in the streaming tab as progress 
bars.</li>
+      <li>Made output operations visible in the streaming tab as progress 
bars. </li>
     </ul>
   </li>
 </ul>
@@ -343,7 +343,7 @@
 
 <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>
 

http://git-wip-us.apache.org/repos/asf/spark-website/blob/9700f2f4/site/releases/spark-release-1-6-1.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-6-1.html 
b/site/releases/spark-release-1-6-1.html
index 13a5bab..72e418b 100644
--- a/site/releases/spark-release-1-6-1.html
+++ b/site/releases/spark-release-1-6-1.html
@@ -205,7 +205,7 @@
 
 <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>
 

http://git-wip-us.apache.org/repos/asf/spark-website/blob/9700f2f4/site/releases/spark-release-1-6-2.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-1-6-2.html 
b/site/releases/spark-release-1-6-2.html
index 6729366..2283ffb 100644
--- a/site/releases/spark-release-1-6-2.html
+++ b/site/releases/spark-release-1-6-2.html
@@ -205,7 +205,7 @@
 
 <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>
 

http://git-wip-us.apache.org/repos/asf/spark-website/blob/9700f2f4/site/releases/spark-release-2-0-0.html
----------------------------------------------------------------------
diff --git a/site/releases/spark-release-2-0-0.html 
b/site/releases/spark-release-2-0-0.html
index d8f18f4..ddd979a 100644
--- a/site/releases/spark-release-2-0-0.html
+++ b/site/releases/spark-release-2-0-0.html
@@ -191,30 +191,30 @@
 <p>To download Apache Spark 2.0.0, visit the <a 
href="http://spark.apache.org/downloads.html";>downloads</a> page. You can 
consult JIRA for the <a 
href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315420&amp;version=12329449";>detailed
 changes</a>. We have curated a list of high level changes here, grouped by 
major modules.</p>
 
 <ul id="markdown-toc">
-  <li><a href="#api-stability" id="markdown-toc-api-stability">API 
Stability</a></li>
-  <li><a href="#core-and-spark-sql" id="markdown-toc-core-and-spark-sql">Core 
and Spark SQL</a>    <ul>
-      <li><a href="#programming-apis" 
id="markdown-toc-programming-apis">Programming APIs</a></li>
-      <li><a href="#sql" id="markdown-toc-sql">SQL</a></li>
-      <li><a href="#new-features" id="markdown-toc-new-features">New 
Features</a></li>
-      <li><a href="#performance-and-runtime" 
id="markdown-toc-performance-and-runtime">Performance and Runtime</a></li>
+  <li><a href="#api-stability">API Stability</a></li>
+  <li><a href="#core-and-spark-sql">Core and Spark SQL</a>    <ul>
+      <li><a href="#programming-apis">Programming APIs</a></li>
+      <li><a href="#sql">SQL</a></li>
+      <li><a href="#new-features">New Features</a></li>
+      <li><a href="#performance-and-runtime">Performance and Runtime</a></li>
     </ul>
   </li>
-  <li><a href="#mllib" id="markdown-toc-mllib">MLlib</a>    <ul>
-      <li><a href="#new-features-1" id="markdown-toc-new-features-1">New 
features</a></li>
-      <li><a href="#speedscaling" 
id="markdown-toc-speedscaling">Speed/scaling</a></li>
+  <li><a href="#mllib">MLlib</a>    <ul>
+      <li><a href="#new-features-1">New features</a></li>
+      <li><a href="#speedscaling">Speed/scaling</a></li>
     </ul>
   </li>
-  <li><a href="#sparkr" id="markdown-toc-sparkr">SparkR</a></li>
-  <li><a href="#streaming" id="markdown-toc-streaming">Streaming</a></li>
-  <li><a href="#dependency-packaging-and-operations" 
id="markdown-toc-dependency-packaging-and-operations">Dependency, Packaging, 
and Operations</a></li>
-  <li><a href="#removals-behavior-changes-and-deprecations" 
id="markdown-toc-removals-behavior-changes-and-deprecations">Removals, Behavior 
Changes and Deprecations</a>    <ul>
-      <li><a href="#removals" id="markdown-toc-removals">Removals</a></li>
-      <li><a href="#behavior-changes" 
id="markdown-toc-behavior-changes">Behavior Changes</a></li>
-      <li><a href="#deprecations" 
id="markdown-toc-deprecations">Deprecations</a></li>
+  <li><a href="#sparkr">SparkR</a></li>
+  <li><a href="#streaming">Streaming</a></li>
+  <li><a href="#dependency-packaging-and-operations">Dependency, Packaging, 
and Operations</a></li>
+  <li><a href="#removals-behavior-changes-and-deprecations">Removals, Behavior 
Changes and Deprecations</a>    <ul>
+      <li><a href="#removals">Removals</a></li>
+      <li><a href="#behavior-changes">Behavior Changes</a></li>
+      <li><a href="#deprecations">Deprecations</a></li>
     </ul>
   </li>
-  <li><a href="#known-issues" id="markdown-toc-known-issues">Known 
Issues</a></li>
-  <li><a href="#credits" id="markdown-toc-credits">Credits</a></li>
+  <li><a href="#known-issues">Known Issues</a></li>
+  <li><a href="#credits">Credits</a></li>
 </ul>
 
 <h3 id="api-stability">API Stability</h3>
@@ -394,7 +394,7 @@
 
 <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>
 

http://git-wip-us.apache.org/repos/asf/spark-website/blob/9700f2f4/site/research.html
----------------------------------------------------------------------
diff --git a/site/research.html b/site/research.html
index e873042..556d610 100644
--- a/site/research.html
+++ b/site/research.html
@@ -249,7 +249,7 @@ Spark offers an abstraction called <a 
href="http://www.cs.berkeley.edu/~matei/pa
 
 <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>
 

http://git-wip-us.apache.org/repos/asf/spark-website/blob/9700f2f4/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 23fb602..e9d2a94 100644
--- a/site/screencasts/1-first-steps-with-spark.html
+++ b/site/screencasts/1-first-steps-with-spark.html
@@ -211,7 +211,7 @@
 
 <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>
 

http://git-wip-us.apache.org/repos/asf/spark-website/blob/9700f2f4/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 0f350ec..6ddb1d0 100644
--- a/site/screencasts/2-spark-documentation-overview.html
+++ b/site/screencasts/2-spark-documentation-overview.html
@@ -211,7 +211,7 @@
 
 <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>
 

http://git-wip-us.apache.org/repos/asf/spark-website/blob/9700f2f4/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 7baa6be..ced15fe 100644
--- a/site/screencasts/3-transformations-and-caching.html
+++ b/site/screencasts/3-transformations-and-caching.html
@@ -207,7 +207,7 @@
 
 <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>
 

http://git-wip-us.apache.org/repos/asf/spark-website/blob/9700f2f4/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 43e6d74..35cc188 100644
--- a/site/screencasts/4-a-standalone-job-in-spark.html
+++ b/site/screencasts/4-a-standalone-job-in-spark.html
@@ -205,7 +205,7 @@
 
 <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>
 

http://git-wip-us.apache.org/repos/asf/spark-website/blob/9700f2f4/site/screencasts/index.html
----------------------------------------------------------------------
diff --git a/site/screencasts/index.html b/site/screencasts/index.html
index 499129d..472b303 100644
--- a/site/screencasts/index.html
+++ b/site/screencasts/index.html
@@ -237,7 +237,7 @@
 
 <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>
 

http://git-wip-us.apache.org/repos/asf/spark-website/blob/9700f2f4/site/sql/index.html
----------------------------------------------------------------------
diff --git a/site/sql/index.html b/site/sql/index.html
index eb9eb52..2e3dbf3 100644
--- a/site/sql/index.html
+++ b/site/sql/index.html
@@ -349,7 +349,7 @@
 
 <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>
 

http://git-wip-us.apache.org/repos/asf/spark-website/blob/9700f2f4/site/streaming/index.html
----------------------------------------------------------------------
diff --git a/site/streaming/index.html b/site/streaming/index.html
index 85f9c8b..7b4ef55 100644
--- a/site/streaming/index.html
+++ b/site/streaming/index.html
@@ -327,7 +327,7 @@
 
 <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>
 

http://git-wip-us.apache.org/repos/asf/spark-website/blob/9700f2f4/site/trademarks.html
----------------------------------------------------------------------
diff --git a/site/trademarks.html b/site/trademarks.html
new file mode 100644
index 0000000..86d7812
--- /dev/null
+++ b/site/trademarks.html
@@ -0,0 +1,261 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+  <title>
+     Trademark Guidelines | Apache Spark
+    
+  </title>
+
+  
+
+  
+
+  <!-- Bootstrap core CSS -->
+  <link href="/css/cerulean.min.css" rel="stylesheet">
+  <link href="/css/custom.css" rel="stylesheet">
+
+  <!-- Code highlighter CSS -->
+  <link href="/css/pygments-default.css" rel="stylesheet">
+
+  <script type="text/javascript">
+  <!-- Google Analytics initialization -->
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-32518208-2']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; 
ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
+  })();
+
+  <!-- Adds slight delay to links to allow async reporting -->
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
+    } catch(err){}
+
+    setTimeout(function() {
+      document.location.href = link.href;
+    }, 100);
+  }
+  </script>
+
+  <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media 
queries -->
+  <!--[if lt IE 9]>
+  <script 
src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js";></script>
+  <script 
src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js";></script>
+  <![endif]-->
+</head>
+
+<body>
+
+<script src="https://code.jquery.com/jquery.js";></script>
+<script 
src="//netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js"></script>
+<script src="/js/lang-tabs.js"></script>
+<script src="/js/downloads.js"></script>
+
+<div class="container" style="max-width: 1200px;">
+
+<div class="masthead">
+  
+    <p class="lead">
+      <a href="/">
+      <img src="/images/spark-logo-trademark.png"
+        style="height:100px; width:auto; vertical-align: bottom; margin-top: 
20px;"></a><span class="tagline">
+          Lightning-fast cluster computing
+      </span>
+    </p>
+  
+</div>
+
+<nav class="navbar navbar-default" role="navigation">
+  <!-- Brand and toggle get grouped for better mobile display -->
+  <div class="navbar-header">
+    <button type="button" class="navbar-toggle" data-toggle="collapse"
+            data-target="#navbar-collapse-1">
+      <span class="sr-only">Toggle navigation</span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
+  </div>
+
+  <!-- Collect the nav links, forms, and other content for toggling -->
+  <div class="collapse navbar-collapse" id="navbar-collapse-1">
+    <ul class="nav navbar-nav">
+      <li><a href="/downloads.html">Download</a></li>
+      <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+          Libraries <b class="caret"></b>
+        </a>
+        <ul class="dropdown-menu">
+          <li><a href="/sql/">SQL and DataFrames</a></li>
+          <li><a href="/streaming/">Spark Streaming</a></li>
+          <li><a href="/mllib/">MLlib (machine learning)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
+          <li class="divider"></li>
+          <li><a href="http://spark-packages.org";>Third-Party Packages</a></li>
+        </ul>
+      </li>
+      <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+          Documentation <b class="caret"></b>
+        </a>
+        <ul class="dropdown-menu">
+          <li><a href="/docs/latest/">Latest Release (Spark 2.0.0)</a></li>
+          <li><a href="/documentation.html">Older Versions and Other 
Resources</a></li>
+        </ul>
+      </li>
+      <li><a href="/examples.html">Examples</a></li>
+      <li class="dropdown">
+        <a href="/community.html" class="dropdown-toggle" 
data-toggle="dropdown">
+          Community <b class="caret"></b>
+        </a>
+        <ul class="dropdown-menu">
+          <li><a href="/community.html">Mailing Lists</a></li>
+          <li><a href="/community.html#events">Events and Meetups</a></li>
+          <li><a href="/community.html#history">Project History</a></li>
+          <li><a 
href="https://cwiki.apache.org/confluence/display/SPARK/Powered+By+Spark";>Powered
 By</a></li>
+          <li><a 
href="https://cwiki.apache.org/confluence/display/SPARK/Committers";>Project 
Committers</a></li>
+          <li><a href="https://issues.apache.org/jira/browse/SPARK";>Issue 
Tracker</a></li>
+        </ul>
+      </li>
+      <li><a href="/faq.html">FAQ</a></li>
+    </ul>
+    <ul class="nav navbar-nav navbar-right">
+      <li class="dropdown">
+        <a href="http://www.apache.org/"; class="dropdown-toggle" 
data-toggle="dropdown">
+          Apache Software Foundation <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+          <li><a href="http://www.apache.org/";>Apache Homepage</a></li>
+          <li><a href="http://www.apache.org/licenses/";>License</a></li>
+          <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
+          <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+          <li><a href="http://www.apache.org/security/";>Security</a></li>
+        </ul>
+      </li>
+    </ul>
+  </div>
+  <!-- /.navbar-collapse -->
+</nav>
+
+
+<div class="row">
+  <div class="col-md-3 col-md-push-9">
+    <div class="news" style="margin-bottom: 20px;">
+      <h5>Latest News</h5>
+      <ul class="list-unstyled">
+        
+          <li><a href="/news/spark-2-0-0-released.html">Spark 2.0.0 
released</a>
+          <span class="small">(Jul 26, 2016)</span></li>
+        
+          <li><a href="/news/spark-1-6-2-released.html">Spark 1.6.2 
released</a>
+          <span class="small">(Jun 25, 2016)</span></li>
+        
+          <li><a href="/news/submit-talks-to-spark-summit-eu-2016.html">Call 
for Presentations for Spark Summit EU is Open</a>
+          <span class="small">(Jun 16, 2016)</span></li>
+        
+          <li><a href="/news/spark-2.0.0-preview.html">Preview release of 
Spark 2.0</a>
+          <span class="small">(May 26, 2016)</span></li>
+        
+      </ul>
+      <p class="small" style="text-align: right;"><a 
href="/news/index.html">Archive</a></p>
+    </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
+      </a>
+      <p style="font-size: 16px; font-weight: 500; color: #555;">
+        Built-in Libraries:
+      </p>
+      <ul class="list-none">
+        <li><a href="/sql/">SQL and DataFrames</a></li>
+        <li><a href="/streaming/">Spark Streaming</a></li>
+        <li><a href="/mllib/">MLlib (machine learning)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
+      </ul>
+      <a href="http://spark-packages.org";>Third-Party Packages</a>
+    </div>
+  </div>
+
+  <div class="col-md-9 col-md-pull-3">
+    <h2>Apache Spark Trademark Guidelines</h2>
+
+<p>Apache Spark, Spark and the Spark logo are 
+<a href="https://www.apache.org/foundation/marks/";>trademarks</a>
+of the <a href="https://www.apache.org";>Apache Software Foundation (ASF)</a>.
+The ASF is a 501(c)(3) nonprofit organization, and as such, needs to take
+special care about how its trademarks are used by organizations.
+In particular, ASF needs to ensure that its software products are clearly
+distinguished from third-party products.</p>
+
+<p>If you would like to provide software, services, events, or other products
+based on Apache Spark, please refer to the
+<a href="https://www.apache.org/foundation/marks/";>ASF trademark policy</a>
+and <a href="https://www.apache.org/foundation/marks/faq";>FAQ</a>.
+This page summarizes the key points of the policy, but please note that
+the official policy always takes precedence.</p>
+
+<ul>
+  <li><strong>Software products,</strong> whether commercial or open source, 
are not allowed to
+use &#8220;Spark&#8221; in their name, except in the form &#8220;powered by 
Apache Spark&#8221; or
+&#8220;for Apache Spark&#8221; when following
+<a href="https://www.apache.org/foundation/marks/faq/#products";>these specific
+guidelines</a>.
+    <ul>
+      <li>Names derived from &#8220;Spark&#8221;, such as 
&#8220;sparkly&#8221;, are also not allowed.</li>
+      <li>Company names may not include &#8220;Spark&#8221;.</li>
+      <li>Package identifiers (e.g., Maven coordinates) may include
+&#8220;spark&#8221;, but the full name used for the software package should
+follow the naming policy above.</li>
+    </ul>
+  </li>
+  <li>
+    <p><strong>Written materials</strong> must refer to the project as 
&#8220;Apache Spark&#8221; in the first
+and most prominent mentions. Materials from software vendors or 
software-related
+service providers must follow
+<a href="https://www.apache.org/foundation/marks/guide#howoften";>stricter
+guidelines</a>, including using the full project name &#8220;Apache 
Spark&#8221; in more
+locations, and proper
+<a href="https://www.apache.org/foundation/marks/faq/#attribution";>trademark
+attribution</a> on every page.</p>
+  </li>
+  <li>
+    <p><strong>Logos</strong> derived from the Spark logo are not allowed.</p>
+  </li>
+  <li>
+    <p><strong>Domain names</strong> containing &#8220;spark&#8221; are not 
permitted without written
+permission from the Apache Spark PMC. To request permission, email
+<a href="mailto:priv...@spark.apache.org";>priv...@spark.apache.org</a> and CC
+<a href="mailto:tradema...@apache.org";>tradema...@apache.org</a>.
+(<a 
href="https://www.apache.org/foundation/marks/domains.html";>Details</a>)</p>
+  </li>
+  <li><strong>Events, books, and merchandise</strong> have their own 
guidelines.
+Please refer to the
+<a href="https://www.apache.org/foundation/marks/";>ASF trademark policy</a>
+and <a href="http://www.apache.org/foundation/marks/faq/";>FAQ</a> for 
details.</li>
+</ul>
+
+<p>We appreciate the community&#8217;s help in respecting these guidelines.
+If you have any questions about the Apache trademark policy, please email
+<a href="mailto:tradema...@apache.org";>tradema...@apache.org</a>.</p>
+
+  </div>
+</div>
+
+
+
+<footer class="small">
+  <hr>
+  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>
+
+</div>
+
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/spark-website/blob/9700f2f4/trademarks.md
----------------------------------------------------------------------
diff --git a/trademarks.md b/trademarks.md
new file mode 100644
index 0000000..ae263e8
--- /dev/null
+++ b/trademarks.md
@@ -0,0 +1,62 @@
+---
+layout: global
+title: Trademark Guidelines
+type: "page singular"
+navigation:
+  weight: 7
+  show: true
+---
+<h2>Apache Spark Trademark Guidelines</h2>
+
+Apache Spark, Spark and the Spark logo are 
+<a href="https://www.apache.org/foundation/marks/";>trademarks</a>
+of the <a href="https://www.apache.org";>Apache Software Foundation (ASF)</a>.
+The ASF is a 501(c)(3) nonprofit organization, and as such, needs to take
+special care about how its trademarks are used by organizations.
+In particular, ASF needs to ensure that its software products are clearly
+distinguished from third-party products.
+
+If you would like to provide software, services, events, or other products
+based on Apache Spark, please refer to the
+<a href="https://www.apache.org/foundation/marks/";>ASF trademark policy</a>
+and <a href="https://www.apache.org/foundation/marks/faq";>FAQ</a>.
+This page summarizes the key points of the policy, but please note that
+the official policy always takes precedence.
+
+* **Software products,** whether commercial or open source, are not allowed to
+  use "Spark" in their name, except in the form "powered by Apache Spark" or
+  "for Apache Spark" when following
+  <a href="https://www.apache.org/foundation/marks/faq/#products";>these 
specific
+  guidelines</a>.
+  * Names derived from "Spark", such as "sparkly", are also not allowed.
+  * Company names may not include "Spark".
+  * Package identifiers (e.g., Maven coordinates) may include
+    "spark", but the full name used for the software package should
+    follow the naming policy above.
+
+
+* **Written materials** must refer to the project as "Apache Spark" in the 
first
+  and most prominent mentions. Materials from software vendors or 
software-related
+  service providers must follow
+  <a href="https://www.apache.org/foundation/marks/guide#howoften";>stricter
+  guidelines</a>, including using the full project name "Apache Spark" in more
+  locations, and proper
+  <a href="https://www.apache.org/foundation/marks/faq/#attribution";>trademark
+  attribution</a> on every page.
+
+* **Logos** derived from the Spark logo are not allowed.
+
+* **Domain names** containing "spark" are not permitted without written
+  permission from the Apache Spark PMC. To request permission, email
+  <a href="mailto:priv...@spark.apache.org";>priv...@spark.apache.org</a> and CC
+  <a href="mailto:tradema...@apache.org";>tradema...@apache.org</a>.
+  (<a href="https://www.apache.org/foundation/marks/domains.html";>Details</a>)
+
+* **Events, books, and merchandise** have their own guidelines.
+  Please refer to the
+  <a href="https://www.apache.org/foundation/marks/";>ASF trademark policy</a>
+  and <a href="http://www.apache.org/foundation/marks/faq/";>FAQ</a> for 
details.
+  
+We appreciate the community's help in respecting these guidelines.
+If you have any questions about the Apache trademark policy, please email
+<a href="mailto:tradema...@apache.org";>tradema...@apache.org</a>.


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

Reply via email to