Updated FAQ about license

3 files changed, 14 insertions, 12 deletions

diff --git a/faq.md b/faq.md
index 14a44478f..fcb889c3e 100644
--- a/faq.md
+++ b/faq.md
@@ -29,11 +29,12 @@ navigation:
 <p>Spark 0.6 also added a <a href="{{site.url}}docs/latest/java-programming-guide.html">Java API</a>, letting you use Spark from Java, and Spark 0.7 added a <a href="{{site.url}}docs/latest/python-programming-guide.html">Python API</a>.</p>
 
 <p class="question">What license is Spark under?</p>
-<p class="answer">Spark is open source under the liberal <a href="https://github.com/mesos/spark/blob/master/LICENSE">BSD license</a>.</p>
+
+<p class="answer">Starting in version 0.8, Spark will be under the <a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache 2.0 license</a>. Previous versions used the <a href="https://github.com/mesos/spark/blob/branch-0.7/LICENSE">BSD license</a>.</p>
 
 <p class="question">How can I contribute to Spark?</p>
 <p class="answer">Contact the <a href="http://groups.google.com/group/spark-users">mailing list</a> or send us a pull request on GitHub.  We're glad to hear about your experience using Spark and to accept patches </p>
 <p>If you would like to report an issue, post it to the <a href="https://spark-project.atlassian.net/browse/SPARK">Spark issue tracker</a>.</p>
 
 <p class="question">Where can I get more help?</p>
-<p class="answer">Please post on the <a href="http://groups.google.com/group/spark-users">spark-users</a> mailing list.  We'll be glad to help!</p>
\ No newline at end of file
+<p class="answer">Please post on the <a href="http://groups.google.com/group/spark-users">spark-users</a> mailing list.  We'll be glad to help!</p>
diff --git a/site/faq.html b/site/faq.html
index 1f1c6f3a7..bcea27192 100644
--- a/site/faq.html
+++ b/site/faq.html
@@ -127,7 +127,8 @@
 <p>Spark 0.6 also added a <a href="/docs/latest/java-programming-guide.html">Java API</a>, letting you use Spark from Java, and Spark 0.7 added a <a href="/docs/latest/python-programming-guide.html">Python API</a>.</p>
 
 <p class="question">What license is Spark under?</p>
-<p class="answer">Spark is open source under the liberal <a href="https://github.com/mesos/spark/blob/master/LICENSE">BSD license</a>.</p>
+
+<p class="answer">Starting in version 0.8, Spark will be under the <a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache 2.0 license</a>. Previous versions used the <a href="https://github.com/mesos/spark/blob/branch-0.7/LICENSE">BSD license</a>.</p>
 
 <p class="question">How can I contribute to Spark?</p>
 <p class="answer">Contact the <a href="http://groups.google.com/group/spark-users">mailing list</a> or send us a pull request on GitHub.  We're glad to hear about your experience using Spark and to accept patches </p>
diff --git a/site/news/index.html b/site/news/index.html
index 8e39b1c67..b11b8ef8e 100644
--- a/site/news/index.html
+++ b/site/news/index.html
@@ -110,7 +110,7 @@
       <h1 class="entry-title"><a href="/news/fourth-spark-screencast-published.html">Fourth Spark screencast released</a></h1>
       <div class="entry-meta">August 27, 2013</div>
     </header>
-    <div class="entry-content"><p>We have released the next screencast, <a href="/screencasts/4-a-standalone-job-in-spark.html">A Standalone Job in Scala</a> that takes you beyond the Spark shell, helping you write your first standalone Spark job.</p>
+    <div class="entry-content"><p>We have released the next screencast, <a href="{{site.url}}screencasts/4-a-standalone-job-in-spark.html">A Standalone Job in Scala</a> that takes you beyond the Spark shell, helping you write your first standalone Spark job.</p>
 
 </div>
   </article>
@@ -151,7 +151,7 @@
       <h1 class="entry-title"><a href="/news/spark-0-7-3-released.html">Spark 0.7.3 released</a></h1>
       <div class="entry-meta">July 16, 2013</div>
     </header>
-    <div class="entry-content"><p>We&#8217;ve just posted <a href="/releases/spark-release-0-7-3.html" title="Spark Release 0.7.3">Spark Release 0.7.3</a>, a maintenance release that contains several fixes, including streaming API updates and new functionality for adding JARs to a <code>spark-shell</code> session. We recommend that all users update to this release. Visit the <a href="/releases/spark-release-0-7-3.html" title="Spark Release 0.7.3">release notes</a> to read about the new features, or <a href="/downloads.html">download</a> the release today.</p>
+    <div class="entry-content"><p>We&#8217;ve just posted <a href="{{site.url}}releases/spark-release-0-7-3.html" title="Spark Release 0.7.3">Spark Release 0.7.3</a>, a maintenance release that contains several fixes, including streaming API updates and new functionality for adding JARs to a <code>spark-shell</code> session. We recommend that all users update to this release. Visit the <a href="{{site.url}}releases/spark-release-0-7-3.html" title="Spark Release 0.7.3">release notes</a> to read about the new features, or <a href="{{site.url}}downloads.html">download</a> the release today.</p>
 
 </div>
   </article>
@@ -181,7 +181,7 @@
       <h1 class="entry-title"><a href="/news/spark-0-7-2-released.html">Spark 0.7.2 released</a></h1>
       <div class="entry-meta">June 02, 2013</div>
     </header>
-    <div class="entry-content"><p>We&#8217;re happy to announce the release of <a href="/releases/spark-release-0-7-2.html" title="Spark Release 0.7.2">Spark 0.7.2</a>, a new maintenance release that includes several bug fixes and improvements, as well as new code examples and API features. We recommend that all users update to this release. Head over to the <a href="/releases/spark-release-0-7-2.html" title="Spark Release 0.7.2">release notes</a> to read about the new features, or <a href="/downloads.html">download</a> the release today.</p>
+    <div class="entry-content"><p>We&#8217;re happy to announce the release of <a href="{{site.url}}releases/spark-release-0-7-2.html" title="Spark Release 0.7.2">Spark 0.7.2</a>, a new maintenance release that includes several bug fixes and improvements, as well as new code examples and API features. We recommend that all users update to this release. Head over to the <a href="{{site.url}}releases/spark-release-0-7-2.html" title="Spark Release 0.7.2">release notes</a> to read about the new features, or <a href="{{site.url}}downloads.html">download</a> the release today.</p>
 
 </div>
   </article>
@@ -193,9 +193,9 @@
     </header>
     <div class="entry-content"><p>We have released the first two screencasts in a series of short hands-on video training courses we will be publishing to help new users get up and running with Spark in minutes.</p>
 
-<p>The first Spark screencast is called <a href="/screencasts/1-first-steps-with-spark.html">First Steps With Spark</a> and walks you through downloading and building Spark, as well as using the Spark shell, all in less than 10 minutes!</p>
+<p>The first Spark screencast is called <a href="{{site.url}}screencasts/1-first-steps-with-spark.html">First Steps With Spark</a> and walks you through downloading and building Spark, as well as using the Spark shell, all in less than 10 minutes!</p>
 
-<p>The second screencast is a 2 minute <a href="/screencasts/2-spark-documentation-overview.html">overview of the Spark documentation</a>.</p>
+<p>The second screencast is a 2 minute <a href="{{site.url}}screencasts/2-spark-documentation-overview.html">overview of the Spark documentation</a>.</p>
 
 <p>We hope you find these screencasts useful.</p>
 
@@ -217,7 +217,7 @@
       <h1 class="entry-title"><a href="/news/spark-0-7-0-released.html">Spark 0.7.0 released</a></h1>
       <div class="entry-meta">February 27, 2013</div>
     </header>
-    <div class="entry-content"><p>We&#8217;re proud to announce the release of <a href="/releases/spark-release-0-7-0.html" title="Spark Release 0.7.0">Spark 0.7.0</a>, a new major version of Spark that adds several key features, including a <a href="/docs/latest/python-programming-guide.html">Python API</a> for Spark and an <a href="/docs/latest/streaming-programming-guide.html">alpha of Spark Streaming</a>. This release is the result of the largest group of contributors yet behind a Spark release &#8211; 31 contributors from inside and outside Berkeley. Head over to the <a href="/releases/spark-release-0-7-0.html" title="Spark Release 0.7.0">release notes</a> to read more about the new features, or <a href="/downloads.html">download</a> the release today.</p>
+    <div class="entry-content"><p>We&#8217;re proud to announce the release of <a href="{{site.url}}releases/spark-release-0-7-0.html" title="Spark Release 0.7.0">Spark 0.7.0</a>, a new major version of Spark that adds several key features, including a <a href="{{site.url}}docs/latest/python-programming-guide.html">Python API</a> for Spark and an <a href="{{site.url}}docs/latest/streaming-programming-guide.html">alpha of Spark Streaming</a>. This release is the result of the largest group of contributors yet behind a Spark release &#8211; 31 contributors from inside and outside Berkeley. Head over to the <a href="{{site.url}}releases/spark-release-0-7-0.html" title="Spark Release 0.7.0">release notes</a> to read more about the new features, or <a href="{{site.url}}downloads.html">download</a> the release today.</p>
 
 </div>
   </article>
@@ -237,7 +237,7 @@
       <h1 class="entry-title"><a href="/news/spark-0-6-2-released.html">Spark 0.6.2 released</a></h1>
       <div class="entry-meta">February 07, 2013</div>
     </header>
-    <div class="entry-content"><p>We recently released <a href="/releases/spark-release-0-6-2.html" title="Spark Release 0.6.2">Spark 0.6.2</a>, a new version of Spark. This is a maintenance release that includes several bug fixes and usability improvements (see the <a href="/releases/spark-release-0-6-2.html" title="Spark Release 0.6.2">release notes</a>). We recommend that all users upgrade to this release.</p>
+    <div class="entry-content"><p>We recently released <a href="{{site.url}}releases/spark-release-0-6-2.html" title="Spark Release 0.6.2">Spark 0.6.2</a>, a new version of Spark. This is a maintenance release that includes several bug fixes and usability improvements (see the <a href="{{site.url}}releases/spark-release-0-6-2.html" title="Spark Release 0.6.2">release notes</a>). We recommend that all users upgrade to this release.</p>
 
 </div>
   </article>
@@ -292,7 +292,7 @@
       <h1 class="entry-title"><a href="/news/spark-0-6-1-and-0-5-2-released.html">Spark 0.6.1 and 0.5.2 out</a></h1>
       <div class="entry-meta">November 22, 2012</div>
     </header>
-    <div class="entry-content"><p>Today we&#8217;ve made available two maintenance releases for Spark: <a href="/releases/spark-release-0-6-1.html" title="Spark Release 0.6.1">0.6.1</a> and <a href="/releases/spark-release-0-5-2.html" title="Spark Release 0.5.2">0.5.2</a>. They both contain important bug fixes as well as some new features, such as the ability to build against Hadoop 2 distributions. We recommend that users update to the latest version for their branch; for new users, we recommend <a href="/releases/spark-release-0-6-1.html" title="Spark Release 0.6.1">0.6.1</a>.</p>
+    <div class="entry-content"><p>Today we&#8217;ve made available two maintenance releases for Spark: <a href="{{site.url}}releases/spark-release-0-6-1.html" title="Spark Release 0.6.1">0.6.1</a> and <a href="{{site.url}}releases/spark-release-0-5-2.html" title="Spark Release 0.5.2">0.5.2</a>. They both contain important bug fixes as well as some new features, such as the ability to build against Hadoop 2 distributions. We recommend that users update to the latest version for their branch; for new users, we recommend <a href="{{site.url}}releases/spark-release-0-6-1.html" title="Spark Release 0.6.1">0.6.1</a>.</p>
 
 </div>
   </article>
@@ -302,7 +302,7 @@
       <h1 class="entry-title"><a href="/news/spark-version-0-6-0-released.html">Spark version 0.6.0 released</a></h1>
       <div class="entry-meta">October 15, 2012</div>
     </header>
-    <div class="entry-content"><p><a href="/releases/spark-release-0-6-0.html">Spark version 0.6.0</a> was released today, a major release that brings a wide range of performance improvements and new features, including a simpler standalone deploy mode and a Java API. Read more about it in the <a href="/releases/spark-release-0-6-0.html">release notes</a>.</p>
+    <div class="entry-content"><p><a href="{{site.url}}releases/spark-release-0-6-0.html">Spark version 0.6.0</a> was released today, a major release that brings a wide range of performance improvements and new features, including a simpler standalone deploy mode and a Java API. Read more about it in the <a href="{{site.url}}releases/spark-release-0-6-0.html">release notes</a>.</p>
 
 </div>
   </article>