update google analytics to use new 'project' to differentiate apache clicks from spark-project.org clicks

40 files changed, 400 insertions, 560 deletions

diff --git a/_layouts/global.html b/_layouts/global.html
index c3786fe20..21578babd 100644
--- a/_layouts/global.html
+++ b/_layouts/global.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="{{site.url}}css/style.css" />
   <link rel="stylesheet" href="{{site.url}}css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='{{site.url}}index.html' />
 
diff --git a/site/documentation.html b/site/documentation.html
index 1cb204d11..c70773959 100644
--- a/site/documentation.html
+++ b/site/documentation.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/downloads.html b/site/downloads.html
index 2e24eb894..d36a559b0 100644
--- a/site/downloads.html
+++ b/site/downloads.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/examples.html b/site/examples.html
index af04d93b9..52fd053b6 100644
--- a/site/examples.html
+++ b/site/examples.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/faq.html b/site/faq.html
index c061f2e7e..1a4adc4ce 100644
--- a/site/faq.html
+++ b/site/faq.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/index.html b/site/index.html
index c62208c65..03dd14f64 100644
--- a/site/index.html
+++ b/site/index.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/mailing-lists.html b/site/mailing-lists.html
index 19358026c..bcf6a4817 100644
--- a/site/mailing-lists.html
+++ b/site/mailing-lists.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/news/amp-camp-2013-registration-ope.html b/site/news/amp-camp-2013-registration-ope.html
index c7969787c..a97485239 100644
--- a/site/news/amp-camp-2013-registration-ope.html
+++ b/site/news/amp-camp-2013-registration-ope.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/news/index.html b/site/news/index.html
index aeb41d417..ec22d0616 100644
--- a/site/news/index.html
+++ b/site/news/index.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/news/nsdi-paper.html b/site/news/nsdi-paper.html
index 4d3a3ac02..fd74d7f4d 100644
--- a/site/news/nsdi-paper.html
+++ b/site/news/nsdi-paper.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/news/run-spark-and-shark-on-amazon-emr.html b/site/news/run-spark-and-shark-on-amazon-emr.html
index db0334a81..e52ff08b8 100644
--- a/site/news/run-spark-and-shark-on-amazon-emr.html
+++ b/site/news/run-spark-and-shark-on-amazon-emr.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/news/spark-0-6-1-and-0-5-2-released.html b/site/news/spark-0-6-1-and-0-5-2-released.html
index 62f4302b5..0403308be 100644
--- a/site/news/spark-0-6-1-and-0-5-2-released.html
+++ b/site/news/spark-0-6-1-and-0-5-2-released.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/news/spark-0-6-2-released.html b/site/news/spark-0-6-2-released.html
index d36ea645d..a9d7e82e9 100644
--- a/site/news/spark-0-6-2-released.html
+++ b/site/news/spark-0-6-2-released.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/news/spark-0-7-0-released.html b/site/news/spark-0-7-0-released.html
index b69360722..8299988c1 100644
--- a/site/news/spark-0-7-0-released.html
+++ b/site/news/spark-0-7-0-released.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/news/spark-0-7-2-released.html b/site/news/spark-0-7-2-released.html
index 7fe7ec1eb..8faf8dd2f 100644
--- a/site/news/spark-0-7-2-released.html
+++ b/site/news/spark-0-7-2-released.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/news/spark-0-7-3-released.html b/site/news/spark-0-7-3-released.html
index 383aaf495..6791cc359 100644
--- a/site/news/spark-0-7-3-released.html
+++ b/site/news/spark-0-7-3-released.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/news/spark-accepted-into-apache-incubator.html b/site/news/spark-accepted-into-apache-incubator.html
index adc56aa24..a94948df3 100644
--- a/site/news/spark-accepted-into-apache-incubator.html
+++ b/site/news/spark-accepted-into-apache-incubator.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/news/spark-and-shark-in-the-news.html b/site/news/spark-and-shark-in-the-news.html
index 6ae812355..9ba06857e 100644
--- a/site/news/spark-and-shark-in-the-news.html
+++ b/site/news/spark-and-shark-in-the-news.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/news/spark-featured-in-wired.html b/site/news/spark-featured-in-wired.html
index b7a78f7df..87c59a8b8 100644
--- a/site/news/spark-featured-in-wired.html
+++ b/site/news/spark-featured-in-wired.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/news/spark-mailing-lists-moving-to-apache.html b/site/news/spark-mailing-lists-moving-to-apache.html
index c6cc5d203..44a290890 100644
--- a/site/news/spark-mailing-lists-moving-to-apache.html
+++ b/site/news/spark-mailing-lists-moving-to-apache.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/news/spark-meetups.html b/site/news/spark-meetups.html
index fb4f21c22..305d882a2 100644
--- a/site/news/spark-meetups.html
+++ b/site/news/spark-meetups.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/news/spark-screencasts-published.html b/site/news/spark-screencasts-published.html
index 3e0a908af..219206e6a 100644
--- a/site/news/spark-screencasts-published.html
+++ b/site/news/spark-screencasts-published.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/news/spark-tips-from-quantifind.html b/site/news/spark-tips-from-quantifind.html
index afec0fe16..c54f3725f 100644
--- a/site/news/spark-tips-from-quantifind.html
+++ b/site/news/spark-tips-from-quantifind.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/news/spark-version-0-6-0-released.html b/site/news/spark-version-0-6-0-released.html
index 5b1c0c7ba..fa358d30e 100644
--- a/site/news/spark-version-0-6-0-released.html
+++ b/site/news/spark-version-0-6-0-released.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/news/strata-exercises-now-available-online.html b/site/news/strata-exercises-now-available-online.html
index 3208af0be..33744ddef 100644
--- a/site/news/strata-exercises-now-available-online.html
+++ b/site/news/strata-exercises-now-available-online.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/news/video-from-first-spark-development-meetup.html b/site/news/video-from-first-spark-development-meetup.html
index 03f077c53..d24e67e92 100644
--- a/site/news/video-from-first-spark-development-meetup.html
+++ b/site/news/video-from-first-spark-development-meetup.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/releases/spark-release-0-3.html b/site/releases/spark-release-0-3.html
index 2f77074db..5d57d59ad 100644
--- a/site/releases/spark-release-0-3.html
+++ b/site/releases/spark-release-0-3.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/releases/spark-release-0-5-0.html b/site/releases/spark-release-0-5-0.html
index 0cefec461..353818e6c 100644
--- a/site/releases/spark-release-0-5-0.html
+++ b/site/releases/spark-release-0-5-0.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/releases/spark-release-0-5-1.html b/site/releases/spark-release-0-5-1.html
index c62ef13fe..cffc18695 100644
--- a/site/releases/spark-release-0-5-1.html
+++ b/site/releases/spark-release-0-5-1.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/releases/spark-release-0-5-2.html b/site/releases/spark-release-0-5-2.html
index 625c50dec..1090dcb6c 100644
--- a/site/releases/spark-release-0-5-2.html
+++ b/site/releases/spark-release-0-5-2.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/releases/spark-release-0-6-0.html b/site/releases/spark-release-0-6-0.html
index ab894cf24..c5e306f43 100644
--- a/site/releases/spark-release-0-6-0.html
+++ b/site/releases/spark-release-0-6-0.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/releases/spark-release-0-6-1.html b/site/releases/spark-release-0-6-1.html
index 497043516..7eade1948 100644
--- a/site/releases/spark-release-0-6-1.html
+++ b/site/releases/spark-release-0-6-1.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/releases/spark-release-0-6-2.html b/site/releases/spark-release-0-6-2.html
index e7c35f585..3a58b1354 100644
--- a/site/releases/spark-release-0-6-2.html
+++ b/site/releases/spark-release-0-6-2.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/releases/spark-release-0-7-0.html b/site/releases/spark-release-0-7-0.html
index f0b89ffb6..e32efc1f2 100644
--- a/site/releases/spark-release-0-7-0.html
+++ b/site/releases/spark-release-0-7-0.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/releases/spark-release-0-7-2.html b/site/releases/spark-release-0-7-2.html
index 794f16a1c..d8b8a3bf1 100644
--- a/site/releases/spark-release-0-7-2.html
+++ b/site/releases/spark-release-0-7-2.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/releases/spark-release-0-7-3.html b/site/releases/spark-release-0-7-3.html
index 04bfff1f6..77b2c3797 100644
--- a/site/releases/spark-release-0-7-3.html
+++ b/site/releases/spark-release-0-7-3.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/research.html b/site/research.html
index ad3f02e79..38c7dace0 100644
--- a/site/research.html
+++ b/site/research.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/screencasts/1-first-steps-with-spark.html b/site/screencasts/1-first-steps-with-spark.html
index 86c0a0e75..b77510498 100644
--- a/site/screencasts/1-first-steps-with-spark.html
+++ b/site/screencasts/1-first-steps-with-spark.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/screencasts/2-spark-documentation-overview.html b/site/screencasts/2-spark-documentation-overview.html
index 1a337388c..5b233bce3 100644
--- a/site/screencasts/2-spark-documentation-overview.html
+++ b/site/screencasts/2-spark-documentation-overview.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />
 
diff --git a/site/screencasts/3-transformations-and-caching.html b/site/screencasts/3-transformations-and-caching.html
index b0f4ec7b7..3da0db896 100644
--- a/site/screencasts/3-transformations-and-caching.html
+++ b/site/screencasts/3-transformations-and-caching.html
@@ -20,20 +20,16 @@
   <link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
   <link rel="stylesheet" href="/css/pygments-default.css">
 
-  <script type="text/javascript">//<![CDATA[
-  // Google Analytics for WordPress by Yoast v4.2.8 | http://yoast.com/wordpress/google-analytics/
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-32518208-1']);
-  _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);
-  })();
-  //]]></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-32518208-2', 'apache.org');
+    ga('send', 'pageview');
+
+  </script>
 
   <link rel='canonical' href='/index.html' />