Use site.baseurl, not site.url, to work with Jekyll 3.3. Require Jekyll 3.3. Again commit HTML consistent with Jekyll 3.3 output. Fix date problem with news posts that set date: by removing date:.

2 files changed, 32 insertions, 32 deletions

diff --git a/_layouts/global.html b/_layouts/global.html
index c100330dc..24174cef6 100644
--- a/_layouts/global.html
+++ b/_layouts/global.html
@@ -12,8 +12,8 @@
   </title>
 
   {% if page.redirect %}
-    <meta http-equiv="refresh" content="0; url={{site.url}}{{page.redirect}}">
-    <link rel="canonical" href="{{site.url}}{{page.redirect}}" />
+    <meta http-equiv="refresh" content="0; url={{site.baseurl}}/{{page.redirect}}">
+    <link rel="canonical" href="{{site.url}}{{site.baseurl}}{{page.redirect}}" />
   {% endif %}
 
   {% if page.description %}
@@ -21,11 +21,11 @@
   {% endif %}
 
   <!-- Bootstrap core CSS -->
-  <link href="{{site.url}}css/cerulean.min.css" rel="stylesheet">
-  <link href="{{site.url}}css/custom.css" rel="stylesheet">
+  <link href="{{site.baseurl}}/css/cerulean.min.css" rel="stylesheet">
+  <link href="{{site.baseurl}}/css/custom.css" rel="stylesheet">
 
   <!-- Code highlighter CSS -->
-  <link href="{{site.url}}css/pygments-default.css" rel="stylesheet">
+  <link href="{{site.baseurl}}/css/pygments-default.css" rel="stylesheet">
 
   <script type="text/javascript">
   <!-- Google Analytics initialization -->
@@ -61,16 +61,16 @@
 
 <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="{{site.url}}js/lang-tabs.js"></script>
-<script src="{{site.url}}js/downloads.js"></script>
+<script src="{{site.baseurl}}/js/lang-tabs.js"></script>
+<script src="{{site.baseurl}}/js/downloads.js"></script>
 
 <div class="container" style="max-width: 1200px;">
 
 <div class="masthead">
   {% if page.subproject %}
     <p class="lead">
-      <a href="{{site.url}}">
-      <img src="{{site.url}}images/spark-logo-trademark.png"
+      <a href="{{site.baseurl}}/">
+      <img src="{{site.baseurl}}/images/spark-logo-trademark.png"
       style="height:100px; width:auto; vertical-align: bottom; margin-top: 20px;"></a>
       <a href="#"><span class="subproject">
         {{ page.subproject }}
@@ -78,8 +78,8 @@
     </p>
   {% else %}
     <p class="lead">
-      <a href="{{site.url}}">
-      <img src="{{site.url}}images/spark-logo-trademark.png"
+      <a href="{{site.baseurl}}/">
+      <img src="{{site.baseurl}}/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>
@@ -102,16 +102,16 @@
   <!-- 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="{{site.url}}downloads.html">Download</a></li>
+      <li><a href="{{site.baseurl}}/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="{{site.url}}sql/">SQL and DataFrames</a></li>
-          <li><a href="{{site.url}}streaming/">Spark Streaming</a></li>
-          <li><a href="{{site.url}}mllib/">MLlib (machine learning)</a></li>
-          <li><a href="{{site.url}}graphx/">GraphX (graph)</a></li>
+          <li><a href="{{site.baseurl}}/sql/">SQL and DataFrames</a></li>
+          <li><a href="{{site.baseurl}}/streaming/">Spark Streaming</a></li>
+          <li><a href="{{site.baseurl}}/mllib/">MLlib (machine learning)</a></li>
+          <li><a href="{{site.baseurl}}/graphx/">GraphX (graph)</a></li>
           <li class="divider"></li>
           <li><a href="https://cwiki.apache.org/confluence/display/SPARK/Third+Party+Projects">Third-Party Packages</a></li>
         </ul>
@@ -121,25 +121,25 @@
           Documentation <b class="caret"></b>
         </a>
         <ul class="dropdown-menu">
-          <li><a href="{{site.url}}docs/latest/">Latest Release (Spark 2.0.2)</a></li>
-          <li><a href="{{site.url}}documentation.html">Older Versions and Other Resources</a></li>
+          <li><a href="{{site.baseurl}}/docs/latest/">Latest Release (Spark 2.0.2)</a></li>
+          <li><a href="{{site.baseurl}}/documentation.html">Older Versions and Other Resources</a></li>
         </ul>
       </li>
-      <li><a href="{{site.url}}examples.html">Examples</a></li>
+      <li><a href="{{site.baseurl}}/examples.html">Examples</a></li>
       <li class="dropdown">
-        <a href="{{site.url}}community.html" class="dropdown-toggle" data-toggle="dropdown">
+        <a href="{{site.baseurl}}/community.html" class="dropdown-toggle" data-toggle="dropdown">
           Community <b class="caret"></b>
         </a>
         <ul class="dropdown-menu">
-          <li><a href="{{site.url}}community.html">Mailing Lists</a></li>
-          <li><a href="{{site.url}}community.html#events">Events and Meetups</a></li>
-          <li><a href="{{site.url}}community.html#history">Project History</a></li>
+          <li><a href="{{site.baseurl}}/community.html">Mailing Lists</a></li>
+          <li><a href="{{site.baseurl}}/community.html#events">Events and Meetups</a></li>
+          <li><a href="{{site.baseurl}}/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="{{site.url}}faq.html">FAQ</a></li>
+      <li><a href="{{site.baseurl}}/faq.html">FAQ</a></li>
     </ul>
     <ul class="nav navbar-nav navbar-right">
       <li class="dropdown">
@@ -169,20 +169,20 @@
           <span class="small">({{post.date| date:"%b %d, %Y"}})</span></li>
         {% endfor %}
       </ul>
-      <p class="small" style="text-align: right;"><a href="{{site.url}}news/index.html">Archive</a></p>
+      <p class="small" style="text-align: right;"><a href="{{site.baseurl}}/news/index.html">Archive</a></p>
     </div>
     <div class="hidden-xs hidden-sm">
-      <a href="{{site.url}}downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
+      <a href="{{site.baseurl}}/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="{{site.url}}sql/">SQL and DataFrames</a></li>
-        <li><a href="{{site.url}}streaming/">Spark Streaming</a></li>
-        <li><a href="{{site.url}}mllib/">MLlib (machine learning)</a></li>
-        <li><a href="{{site.url}}graphx/">GraphX (graph)</a></li>
+        <li><a href="{{site.baseurl}}/sql/">SQL and DataFrames</a></li>
+        <li><a href="{{site.baseurl}}/streaming/">Spark Streaming</a></li>
+        <li><a href="{{site.baseurl}}/mllib/">MLlib (machine learning)</a></li>
+        <li><a href="{{site.baseurl}}/graphx/">GraphX (graph)</a></li>
       </ul>
       <a href="https://cwiki.apache.org/confluence/display/SPARK/Third+Party+Projects">Third-Party Packages</a>
     </div>
@@ -199,7 +199,7 @@
 
 <footer class="small">
   <hr>
-  Apache Spark, Spark, Apache, and the Spark logo are <a href="{{site.url}}trademarks.html">trademarks</a> of
+  Apache Spark, Spark, Apache, and the Spark logo are <a href="{{site.baseurl}}/trademarks.html">trademarks</a> of
   <a href="http://www.apache.org">The Apache Software Foundation</a>.
 </footer>
 
diff --git a/_layouts/post.html b/_layouts/post.html
index 60b45e9fe..f2c9f2e4d 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -9,5 +9,5 @@ type: singular
 
 <p>
 <br/>
-<a href="{{site.url}}news/">Spark News Archive</a>
+<a href="{{site.baseurl}}/news/">Spark News Archive</a>
 </p>