http://git-wip-us.apache.org/repos/asf/mahout/blob/20ceb66e/general/who-we-are.html
----------------------------------------------------------------------
diff --git a/general/who-we-are.html b/general/who-we-are.html
index 936ccf2..89e1347 100644
--- a/general/who-we-are.html
+++ b/general/who-we-are.html
@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
   <title>
-    Who We Are
+    Who Are We?
     
   </title>
 
@@ -28,7 +28,15 @@
 
 </head>
 
+<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-98314020-1', 'auto');
+  ga('send', 'pageview');
+</script>
 <body>
 
   <nav class="navbar navbar-expand-lg navbar-light bg-light navbar-mahout">
@@ -49,11 +57,11 @@
 
                 <!-- Download -->
                 <li class="nav-item">
-                    <a class="nav-link" href="/downloads/">Download</a>
+                    <a class="nav-link" href="/general/downloads">Download</a>
                 </li>
 
                 <li class="nav-item">
-                    <a class="nav-link" 
href="/docs/0.13.1-SNAPSHOT/index.html">Overview</a>
+                    <a class="nav-link" 
href="/docs/latest/index.html">Overview</a>
                 </li>
 
                 <!-- Developers -->
@@ -70,11 +78,11 @@
                         <!-- <a class="dropdown-item" 
href="/developers/version-control/">Version Control</a> -->
                         <div class="dropdown-divider"></div>
                         <h6 class="dropdown-header">How To's</h6>
-                        <a class="dropdown-item" 
href="/developers/how-to-contribute/">How to Contribute</a>
-                        <a class="dropdown-item" 
href="/developers/githubPRs/">Github PRs</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-become-a-committer/">How to Become a Committer</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-release/">How to Release</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-update-the-website/">How to Update the Website</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-contribute">How to Contribute</a>
+                        <a class="dropdown-item" 
href="/developers/githubPRs">Github PRs</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-become-a-committer">How to Become a Committer</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-release">How to Release</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-update-the-website">How to Update the Website</a>
                     </div>
                 </li>
 
@@ -94,22 +102,21 @@
                 <li class="nav-item dropdown">
                     <a class="nav-link dropdown-toggle" href="" 
id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" 
aria-expanded="false">Community</a>
                     <div class="dropdown-menu dropdown-menu-right">
-                        <a class="dropdown-item" 
href="/community/history/">History of the Apache Mahout Project</a>
-                        <a class="dropdown-item" href="/community/blogs/">Blog 
Posts About Mahout</a>
-                        <a class="dropdown-item" 
href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a>
+                        <!--<a class="dropdown-item" 
href="/community/history/">History of the Apache Mahout Project</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/blogs/">Blog Posts About Mahout</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a>-->
                         <!-- <a class="dropdown-item" 
href="/community/books-tutorials-and-talks/">Books Tutorials and Talks</a> -->
-                        <a class="dropdown-item" 
href="/community/buildingmahout/">Building Mahout</a>
                         <!-- <a class="dropdown-item" 
href="/community/faq/">FAQ</a> needs a lot of updating -->
-                        <a class="dropdown-item" 
href="/community/gsoc/">GSoC</a>
+                        <a class="dropdown-item" 
href="/developers/gsoc">GSoC</a>
                         <!-- Is OK- updated Map/Reduce verbage to reflect 
Samsara -->
                         <!-- <a class="dropdown-item" 
href="/community/mahout-benchmarks/">Mahout Benchmarks</a> These are old, Keep 
them? -->
                         <!-- <a class="dropdown-item" 
href="/community/mahout-wiki/">Mahout Wiki</a> at very least needs links 
cleanedup - do we still want this even?-->
-                        <a class="dropdown-item" 
href="/community/mailing-lists/">Mailing Lists</a>
+                        <a class="dropdown-item" 
href="/general/mailing-lists">Mailing Lists</a>
                         <!-- Clean and pretty -->
                         <!-- <a class="dropdown-item" 
href="/community/powered-by-mahout/">Powered By Mahout</a> needs update -->
-                        <a class="dropdown-item" 
href="/community/privacy-policy/">Privacy Policy</a>
+                        <a class="dropdown-item" 
href="/general/privacy-policy">Privacy Policy</a>
                         <!-- <a class="dropdown-item" 
href="/community/professional-support/">Professional Support</a> update if we 
even want to keep -->
-                        <a class="dropdown-item" 
href="/community/who-we-are/">Who We Are</a>
+                        <a class="dropdown-item" 
href="/general/who-we-are">Who We Are</a>
                         <!-- nikolai needs to add himself -->
                     </div>
                 </li>
@@ -133,7 +140,12 @@
 </nav>
 
 
-  <p><a name="WhoWeAre-Whoweare"></a></p>
+  <div class="container mt-5 pb-4">
+
+  <div class="row">
+
+    <div class="col-lg-8">
+      <p><a name="WhoWeAre-Whoweare"></a></p>
 <h1 id="who-we-are">Who we are</h1>
 
 <p>Apache Mahout is maintained by a team of volunteer developers.</p>
@@ -147,155 +159,155 @@
   <thead>
     <tr>
       <th>Name</th>
-      <th>Mail</th>
-      <th>PMC</th>
-      <th>Comment</th>
+      <th style="text-align: right">Mail</th>
+      <th style="text-align: right">PMC</th>
+      <th style="text-align: right">Comment</th>
     </tr>
   </thead>
   <tbody>
     <tr>
       <td>Anand Avati</td>
-      <td>avati@…</td>
-      <td>No</td>
-      <td>Twitter: @anandavati</td>
+      <td style="text-align: right">avati@…</td>
+      <td style="text-align: right">No</td>
+      <td style="text-align: right">Twitter: @anandavati</td>
     </tr>
     <tr>
       <td>Andrew Musselman</td>
-      <td>akm@…</td>
-      <td>Yes</td>
-      <td>Twitter: @akm</td>
-    </tr>
-    <tr>
-      <td>Andrew Palumbo</td>
-      <td>apalumbo@…</td>
-      <td>Yes (Chair)</td>
-      <td> </td>
+      <td style="text-align: right">akm@…</td>
+      <td style="text-align: right">Yes</td>
+      <td style="text-align: right">Twitter: @akm</td>
     </tr>
     <tr>
       <td>Benson Margulies</td>
-      <td>bimargulies@…</td>
-      <td>Yes</td>
-      <td> </td>
+      <td style="text-align: right">bimargulies@…</td>
+      <td style="text-align: right">Yes</td>
+      <td style="text-align: right">PMC Chair</td>
     </tr>
     <tr>
       <td>Dan Filimon</td>
-      <td>dfilimon@…</td>
-      <td>No</td>
-      <td> </td>
+      <td style="text-align: right">dfilimon@…</td>
+      <td style="text-align: right">No</td>
+      <td style="text-align: right"> </td>
     </tr>
     <tr>
       <td>Dmitriy Lyubimov</td>
-      <td>dlyubimov@…</td>
-      <td>No (Emeritus)</td>
-      <td> </td>
+      <td style="text-align: right">dlyubimov@…</td>
+      <td style="text-align: right">No</td>
+      <td style="text-align: right">(Emeritus PMC)</td>
     </tr>
     <tr>
       <td>Drew Farris</td>
-      <td>drew@…</td>
-      <td>Yes</td>
-      <td> </td>
+      <td style="text-align: right">drew@…</td>
+      <td style="text-align: right">Yes</td>
+      <td style="text-align: right"> </td>
     </tr>
     <tr>
       <td>Ellen Friedman</td>
-      <td>ellenf@…</td>
-      <td>No</td>
-      <td>Twitter: @Ellen_Friedman</td>
+      <td style="text-align: right">ellenf@…</td>
+      <td style="text-align: right">No</td>
+      <td style="text-align: right">Twitter: @Ellen_Friedman</td>
     </tr>
     <tr>
       <td>Frank Scholten</td>
-      <td>frankscholten@…</td>
-      <td>No</td>
-      <td> </td>
+      <td style="text-align: right">frankscholten@…</td>
+      <td style="text-align: right">No</td>
+      <td style="text-align: right"> </td>
     </tr>
     <tr>
       <td>Gokhan Capan</td>
-      <td>gcapan@…</td>
-      <td>No</td>
-      <td><a href="http://www.linkedin.com/in/gokhancapan";>LinkedIn 
Profile</a></td>
+      <td style="text-align: right">gcapan@…</td>
+      <td style="text-align: right">No</td>
+      <td style="text-align: right"><a 
href="http://www.linkedin.com/in/gokhancapan";>LinkedIn Profile</a></td>
     </tr>
     <tr>
       <td>Grant Ingersoll</td>
-      <td>gsingers@…</td>
-      <td>Yes</td>
-      <td>Twitter: @gsingers</td>
+      <td style="text-align: right">gsingers@…</td>
+      <td style="text-align: right">Yes</td>
+      <td style="text-align: right">Twitter: @gsingers</td>
     </tr>
     <tr>
       <td>Isabel Drost-Fromm</td>
-      <td>isabel@…</td>
-      <td>Yes</td>
-      <td>Passion for free software (development, but to some extend also the 
political and economic implications), interested in agile development and 
project management, lives in Germany. Follow me on Twitter @MaineC</td>
+      <td style="text-align: right">isabel@…</td>
+      <td style="text-align: right">Yes</td>
+      <td style="text-align: right"><!--Passion for free software 
(development, but to some extend also the political and economic implications), 
interested in agile development and project management, lives in Germany. 
Follow me on Twitter @MaineC--></td>
     </tr>
     <tr>
       <td>Jacob Alexander Mannix</td>
-      <td>jmannix@…</td>
-      <td>Yes</td>
-      <td> </td>
+      <td style="text-align: right">jmannix@…</td>
+      <td style="text-align: right">Yes</td>
+      <td style="text-align: right"> </td>
     </tr>
     <tr>
       <td>Jeff Eastman</td>
-      <td>jeastman@…</td>
-      <td>No (Emeritus)</td>
-      <td> </td>
+      <td style="text-align: right">jeastman@…</td>
+      <td style="text-align: right">No</td>
+      <td style="text-align: right">(Emeritus PMC)</td>
     </tr>
     <tr>
       <td>Paritosh Ranjan</td>
-      <td>pranjan@…</td>
-      <td>Yes</td>
-      <td>Twitter: @paritoshranjan</td>
+      <td style="text-align: right">pranjan@…</td>
+      <td style="text-align: right">Yes</td>
+      <td style="text-align: right">Twitter: @paritoshranjan</td>
     </tr>
     <tr>
       <td>Pat Ferrel</td>
-      <td>pat@…</td>
-      <td>Yes</td>
-      <td>Twitter: @occam</td>
+      <td style="text-align: right">pat@…</td>
+      <td style="text-align: right">Yes</td>
+      <td style="text-align: right">Twitter: @occam</td>
     </tr>
     <tr>
       <td>Robin Anil</td>
-      <td>robinanil@…</td>
-      <td>Yes</td>
-      <td> </td>
+      <td style="text-align: right">robinanil@…</td>
+      <td style="text-align: right">Yes</td>
+      <td style="text-align: right"> </td>
     </tr>
     <tr>
       <td>Sean Owen</td>
-      <td>srowen@…</td>
-      <td>No (Emeritus)</td>
-      <td> </td>
+      <td style="text-align: right">srowen@…</td>
+      <td style="text-align: right">No</td>
+      <td style="text-align: right">(Emeritus PMC)</td>
     </tr>
     <tr>
       <td>Sebastian Schelter</td>
-      <td>ssc@…</td>
-      <td>Yes</td>
-      <td> </td>
+      <td style="text-align: right">ssc@…</td>
+      <td style="text-align: right">Yes</td>
+      <td style="text-align: right"> </td>
     </tr>
     <tr>
       <td>Shannon Quinn</td>
-      <td>squinn@…</td>
-      <td>No</td>
-      <td> </td>
+      <td style="text-align: right">squinn@…</td>
+      <td style="text-align: right">No</td>
+      <td style="text-align: right"> </td>
     </tr>
     <tr>
       <td>Stevo Slavić</td>
-      <td>sslavic@…</td>
-      <td>No</td>
-      <td>Twitter: @sslavic</td>
+      <td style="text-align: right">sslavic@…</td>
+      <td style="text-align: right">No</td>
+      <td style="text-align: right">Twitter: @sslavic</td>
     </tr>
     <tr>
       <td>Suneel Marthi</td>
-      <td>smarthi@…</td>
-      <td>Yes</td>
-      <td>Twitter: @suneelmarthi</td>
+      <td style="text-align: right">smarthi@…</td>
+      <td style="text-align: right">Yes</td>
+      <td style="text-align: right">Twitter: @suneelmarthi</td>
     </tr>
     <tr>
       <td>Ted Dunning</td>
-      <td>tdunning@…</td>
-      <td>Yes</td>
-      <td> </td>
+      <td style="text-align: right">tdunning@…</td>
+      <td style="text-align: right">Yes</td>
+      <td style="text-align: right"> </td>
     </tr>
     <tr>
       <td>Tom Pierce</td>
-      <td>tcp@…</td>
-      <td>No</td>
-      <td> </td>
+      <td style="text-align: right">tcp@…</td>
+      <td style="text-align: right">No</td>
+      <td style="text-align: right"> </td>
+    </tr>
+    <tr>
+      <td>Trevor Grant</td>
+      <td style="text-align: right">rawkintrevo@…</td>
+      <td style="text-align: right">Yes</td>
+      <td style="text-align: right">Twitter: @rawkintrevo</td>
     </tr>
   </tbody>
 </table>
@@ -321,6 +333,45 @@
 
 <p>Apache Mahout contributors and their contributions to individual issues can 
be found at Apache <a 
href="http://issues.apache.org/jira/browse/MAHOUT";>JIRA</a>.</p>
 
+    </div>
+
+    <div class="col-lg-4">
+      <!-- Apache Software Foundation Links -->
+<div class="card mb-4">
+    <div class="card-header">
+        Apache Software Foundation
+    </div>
+    <div class="card-body">
+        <ul class="list-unstyled mb-0">
+            <li>
+                <a 
href="http://www.apache.org/foundation/how-it-works.html";>Apache Software 
Foundation</a>
+            </li>
+            <li>
+                <a href="http://www.apache.org/licenses/";>Apache 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>
+        </ul>
+    </div>
+</div>
+
+<!-- Twitter Posts Widget -->
+<div class="card">
+    <div class="card-body">
+        <a class="twitter-timeline" data-height="500" 
href="https://twitter.com/ApacheMahout";>Tweets by ApacheMahout</a>
+        <script async src="//platform.twitter.com/widgets.js" 
charset="utf-8"></script>
+    </div>
+</div>
+    </div>
+
+  </div>
+
+</div>
+
 
   <footer class="footer bg-light">
     <div class="container text-center small">

http://git-wip-us.apache.org/repos/asf/mahout/blob/20ceb66e/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index e216dce..3dd38e5 100644
--- a/index.html
+++ b/index.html
@@ -28,7 +28,15 @@
 
 </head>
 
-
+<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-98314020-1', 'auto');
+  ga('send', 'pageview');
+</script>
 <body>
 
   <nav class="navbar navbar-expand-lg navbar-light bg-light navbar-mahout">
@@ -49,11 +57,11 @@
 
                 <!-- Download -->
                 <li class="nav-item">
-                    <a class="nav-link" href="/downloads/">Download</a>
+                    <a class="nav-link" href="/general/downloads">Download</a>
                 </li>
 
                 <li class="nav-item">
-                    <a class="nav-link" 
href="/docs/0.13.1-SNAPSHOT/index.html">Overview</a>
+                    <a class="nav-link" 
href="/docs/latest/index.html">Overview</a>
                 </li>
 
                 <!-- Developers -->
@@ -70,11 +78,11 @@
                         <!-- <a class="dropdown-item" 
href="/developers/version-control/">Version Control</a> -->
                         <div class="dropdown-divider"></div>
                         <h6 class="dropdown-header">How To's</h6>
-                        <a class="dropdown-item" 
href="/developers/how-to-contribute/">How to Contribute</a>
-                        <a class="dropdown-item" 
href="/developers/githubPRs/">Github PRs</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-become-a-committer/">How to Become a Committer</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-release/">How to Release</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-update-the-website/">How to Update the Website</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-contribute">How to Contribute</a>
+                        <a class="dropdown-item" 
href="/developers/githubPRs">Github PRs</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-become-a-committer">How to Become a Committer</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-release">How to Release</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-update-the-website">How to Update the Website</a>
                     </div>
                 </li>
 
@@ -94,22 +102,21 @@
                 <li class="nav-item dropdown">
                     <a class="nav-link dropdown-toggle" href="" 
id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" 
aria-expanded="false">Community</a>
                     <div class="dropdown-menu dropdown-menu-right">
-                        <a class="dropdown-item" 
href="/community/history/">History of the Apache Mahout Project</a>
-                        <a class="dropdown-item" href="/community/blogs/">Blog 
Posts About Mahout</a>
-                        <a class="dropdown-item" 
href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a>
+                        <!--<a class="dropdown-item" 
href="/community/history/">History of the Apache Mahout Project</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/blogs/">Blog Posts About Mahout</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a>-->
                         <!-- <a class="dropdown-item" 
href="/community/books-tutorials-and-talks/">Books Tutorials and Talks</a> -->
-                        <a class="dropdown-item" 
href="/community/buildingmahout/">Building Mahout</a>
                         <!-- <a class="dropdown-item" 
href="/community/faq/">FAQ</a> needs a lot of updating -->
-                        <a class="dropdown-item" 
href="/community/gsoc/">GSoC</a>
+                        <a class="dropdown-item" 
href="/developers/gsoc">GSoC</a>
                         <!-- Is OK- updated Map/Reduce verbage to reflect 
Samsara -->
                         <!-- <a class="dropdown-item" 
href="/community/mahout-benchmarks/">Mahout Benchmarks</a> These are old, Keep 
them? -->
                         <!-- <a class="dropdown-item" 
href="/community/mahout-wiki/">Mahout Wiki</a> at very least needs links 
cleanedup - do we still want this even?-->
-                        <a class="dropdown-item" 
href="/community/mailing-lists/">Mailing Lists</a>
+                        <a class="dropdown-item" 
href="/general/mailing-lists">Mailing Lists</a>
                         <!-- Clean and pretty -->
                         <!-- <a class="dropdown-item" 
href="/community/powered-by-mahout/">Powered By Mahout</a> needs update -->
-                        <a class="dropdown-item" 
href="/community/privacy-policy/">Privacy Policy</a>
+                        <a class="dropdown-item" 
href="/general/privacy-policy">Privacy Policy</a>
                         <!-- <a class="dropdown-item" 
href="/community/professional-support/">Professional Support</a> update if we 
even want to keep -->
-                        <a class="dropdown-item" 
href="/community/who-we-are/">Who We Are</a>
+                        <a class="dropdown-item" 
href="/general/who-we-are">Who We Are</a>
                         <!-- nikolai needs to add himself -->
                     </div>
                 </li>
@@ -159,9 +166,7 @@
   <div class="row">
 
     <div class="col-lg-8">
-      <h2 class="section-heading">Recent News</h2>
-
-<p>Apache Mahout(TM) is a <strong>distributed linear algebra 
framework</strong> and <strong>mathematically expressive Scala DSL</strong> 
designed to let mathematicians, statisticians, and data scientists quickly 
<em>implement their own algorithms</em>. Apache Spark is the recommended 
out-of-the-box distributed back-end, <em>or can be extended to other 
distributed backends.</em></p>
+      <p>Apache Mahout(TM) is a <strong>distributed linear algebra 
framework</strong> and <strong>mathematically expressive Scala DSL</strong> 
designed to let mathematicians, statisticians, and data scientists quickly 
<em>implement their own algorithms</em>. Apache Spark is the recommended 
out-of-the-box distributed back-end, <em>or can be extended to other 
distributed backends.</em></p>
 
 <ul>
   <li>Mathematically Expressive Scala DSL</li>
@@ -169,6 +174,8 @@
   <li>Modular Native Solvers for CPU/GPU/CUDA Acceleration</li>
 </ul>
 
+<h2 class="section-heading">Recent News</h2>
+
     </div>
 
     <div class="col-lg-4">

http://git-wip-us.apache.org/repos/asf/mahout/blob/20ceb66e/posts/new-website.html
----------------------------------------------------------------------
diff --git a/posts/new-website.html b/posts/new-website.html
new file mode 100644
index 0000000..0757110
--- /dev/null
+++ b/posts/new-website.html
@@ -0,0 +1,209 @@
+<!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">
+
+  <title>
+    New Website
+    
+  </title>
+
+  <meta name="description" content="Distributed Linear Algebra">
+
+  <link rel="stylesheet" href="/assets/css/main.css">
+
+  <!-- Font Awesome -->
+  <link 
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css";
 rel="stylesheet" 
integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN"
 crossorigin="anonymous">
+
+  <!-- Google Fonts -->
+  <link href="https://fonts.googleapis.com/css?family=Maven+Pro:400,500"; 
rel="stylesheet">
+  <link href="https://fonts.googleapis.com/css?family=Muli:400,400i,700,700i"; 
rel="stylesheet">
+
+  <link rel="canonical" 
href="http://mahout.apache.org//posts/new-website.html";>
+  <link rel="alternate" type="application/rss+xml" title="Apache Mahout" 
href="/%20/feed.xml">
+
+
+</head>
+
+<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-98314020-1', 'auto');
+  ga('send', 'pageview');
+</script>
+<body>
+
+  <nav class="navbar navbar-expand-lg navbar-light bg-light navbar-mahout">
+
+    <div class="container">
+
+        <a class="navbar-brand" href="/">
+          <img src="/assets/mahout-logo-blue.svg" alt="">
+        </a>
+
+        <button class="navbar-toggler" type="button" data-toggle="collapse" 
data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" 
aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+
+        <div class="collapse navbar-collapse" id="navbarSupportedContent">
+
+            <ul class="navbar-nav ml-auto">
+
+                <!-- Download -->
+                <li class="nav-item">
+                    <a class="nav-link" href="/general/downloads">Download</a>
+                </li>
+
+                <li class="nav-item">
+                    <a class="nav-link" 
href="/docs/latest/index.html">Overview</a>
+                </li>
+
+                <!-- Developers -->
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="" 
id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" 
aria-expanded="false">Developers</a>
+                    <div class="dropdown-menu" 
aria-labelledby="navbarDropdownMenuLink">
+                        <a class="dropdown-item" 
href="/developers/developer-resources.html">Developer Resources</a>
+                        <a class="dropdown-item" 
href="/developers/buildingmahout/">Building Mahout from Source</a>
+                        <a class="dropdown-item" 
href="/developers/issue-tracker/">Issues Tracking (JIRA)</a>
+                        <!-- <a class="dropdown-item" 
href="/developers/patch-check-list/">Patch Check List</a> going to github 
template -->
+                        <!-- <a class="dropdown-item" 
href="/developers/reference/">References</a> a lot of overlap with books, 
talks, etc. page -->
+                        <a class="dropdown-item" 
href="/developers/release-notes/">Release Notes</a>
+                        <!-- <a class="dropdown-item" 
href="/developers/thirdparty-dependencies/">Third Party Dependencies</a> is our 
site the reasonable place for this? -->
+                        <!-- <a class="dropdown-item" 
href="/developers/version-control/">Version Control</a> -->
+                        <div class="dropdown-divider"></div>
+                        <h6 class="dropdown-header">How To's</h6>
+                        <a class="dropdown-item" 
href="/developers/how-to-contribute">How to Contribute</a>
+                        <a class="dropdown-item" 
href="/developers/githubPRs">Github PRs</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-become-a-committer">How to Become a Committer</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-release">How to Release</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-update-the-website">How to Update the Website</a>
+                    </div>
+                </li>
+
+                <!-- Docs -->
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="" 
id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" 
aria-expanded="false">Docs</a>
+                    <div class="dropdown-menu" 
aria-labelledby="navbarDropdownMenuLink">
+                        <h6 class="dropdown-header">Release</h6>
+                        <a class="dropdown-item" href="/docs/0.13.0">0.13.0</a>
+                        <div class="dropdown-divider"></div>
+                        <h6 class="dropdown-header">Latest Snapshot 
(Development)</h6>
+                        <a class="dropdown-item" 
href="/docs/latest">0.13.1-SNAPSHOT</a>
+                    </div>
+                </li>
+
+                <!-- Community -->
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="" 
id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" 
aria-expanded="false">Community</a>
+                    <div class="dropdown-menu dropdown-menu-right">
+                        <!--<a class="dropdown-item" 
href="/community/history/">History of the Apache Mahout Project</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/blogs/">Blog Posts About Mahout</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a>-->
+                        <!-- <a class="dropdown-item" 
href="/community/books-tutorials-and-talks/">Books Tutorials and Talks</a> -->
+                        <!-- <a class="dropdown-item" 
href="/community/faq/">FAQ</a> needs a lot of updating -->
+                        <a class="dropdown-item" 
href="/developers/gsoc">GSoC</a>
+                        <!-- Is OK- updated Map/Reduce verbage to reflect 
Samsara -->
+                        <!-- <a class="dropdown-item" 
href="/community/mahout-benchmarks/">Mahout Benchmarks</a> These are old, Keep 
them? -->
+                        <!-- <a class="dropdown-item" 
href="/community/mahout-wiki/">Mahout Wiki</a> at very least needs links 
cleanedup - do we still want this even?-->
+                        <a class="dropdown-item" 
href="/general/mailing-lists">Mailing Lists</a>
+                        <!-- Clean and pretty -->
+                        <!-- <a class="dropdown-item" 
href="/community/powered-by-mahout/">Powered By Mahout</a> needs update -->
+                        <a class="dropdown-item" 
href="/general/privacy-policy">Privacy Policy</a>
+                        <!-- <a class="dropdown-item" 
href="/community/professional-support/">Professional Support</a> update if we 
even want to keep -->
+                        <a class="dropdown-item" 
href="/general/who-we-are">Who We Are</a>
+                        <!-- nikolai needs to add himself -->
+                    </div>
+                </li>
+
+                <!-- GitHub -->
+                <li class="nav-item">
+                    <a class="nav-link" 
href="http://github.com/apache/mahout";><i class="fa fa-github"></i></a>
+                </li>
+
+            </ul>
+
+            <!-- <form class="form-inline my-2 my-lg-0">
+            <input class="form-control mr-sm-2" type="text" 
placeholder="Search" aria-label="Search">
+            <button class="btn btn-outline-success my-2 my-sm-0" 
type="submit">Search</button>
+        </form> -->
+
+        </div>
+
+    </div>
+
+</nav>
+
+
+  <div class="container mt-5 pb-4">
+
+  <div class="row">
+
+    <div class="col-lg-8">
+      <h1 id="new-website-released">New Website Released</h1>
+
+<p>We’ve launced a new website, designed by David Miller from <a 
href="http://startbootstrap.com";>StartBootstrap</a>.</p>
+
+<p>It looks great but there’s lots to do as we migrate and clean up content 
from the old site. If you see anything broken, 
+please let us know via [email protected] or <a 
href="/developers/githubPRs">open a PR</a></p>
+
+    </div>
+
+    <div class="col-lg-4">
+      <!-- Apache Software Foundation Links -->
+<div class="card mb-4">
+    <div class="card-header">
+        Apache Software Foundation
+    </div>
+    <div class="card-body">
+        <ul class="list-unstyled mb-0">
+            <li>
+                <a 
href="http://www.apache.org/foundation/how-it-works.html";>Apache Software 
Foundation</a>
+            </li>
+            <li>
+                <a href="http://www.apache.org/licenses/";>Apache 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>
+        </ul>
+    </div>
+</div>
+
+<!-- Twitter Posts Widget -->
+<div class="card">
+    <div class="card-body">
+        <a class="twitter-timeline" data-height="500" 
href="https://twitter.com/ApacheMahout";>Tweets by ApacheMahout</a>
+        <script async src="//platform.twitter.com/widgets.js" 
charset="utf-8"></script>
+    </div>
+</div>
+    </div>
+
+  </div>
+
+</div>
+
+
+  <footer class="footer bg-light">
+    <div class="container text-center small">
+        Copyright &copy; 2014-2017 The Apache Software Foundation, Licensed 
under the Apache License, Version 2.0.
+    </div>
+</footer>
+
+  <script src="/assets/vendor/jquery/jquery-slim.min.js"></script>
+  <script src="/assets/vendor/popper/popper.min.js"></script>
+  <script src="/assets/vendor/bootstrap/js/bootstrap.min.js"></script>
+  <script src="/assets/header.js"></script>
+  <script 
src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
 type="text/javascript"></script>
+
+</body>
+
+</html>

http://git-wip-us.apache.org/repos/asf/mahout/blob/20ceb66e/users/algorithms/d-als.html
----------------------------------------------------------------------
diff --git a/users/algorithms/d-als.html b/users/algorithms/d-als.html
index cb798c8..031b0b7 100644
--- a/users/algorithms/d-als.html
+++ b/users/algorithms/d-als.html
@@ -28,7 +28,15 @@
 
 </head>
 
-
+<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-98314020-1', 'auto');
+  ga('send', 'pageview');
+</script>
 <body>
 
   <nav class="navbar navbar-expand-lg navbar-light bg-light navbar-mahout">
@@ -49,11 +57,11 @@
 
                 <!-- Download -->
                 <li class="nav-item">
-                    <a class="nav-link" href="/downloads/">Download</a>
+                    <a class="nav-link" href="/general/downloads">Download</a>
                 </li>
 
                 <li class="nav-item">
-                    <a class="nav-link" 
href="/docs/0.13.1-SNAPSHOT/index.html">Overview</a>
+                    <a class="nav-link" 
href="/docs/latest/index.html">Overview</a>
                 </li>
 
                 <!-- Developers -->
@@ -70,11 +78,11 @@
                         <!-- <a class="dropdown-item" 
href="/developers/version-control/">Version Control</a> -->
                         <div class="dropdown-divider"></div>
                         <h6 class="dropdown-header">How To's</h6>
-                        <a class="dropdown-item" 
href="/developers/how-to-contribute/">How to Contribute</a>
-                        <a class="dropdown-item" 
href="/developers/githubPRs/">Github PRs</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-become-a-committer/">How to Become a Committer</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-release/">How to Release</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-update-the-website/">How to Update the Website</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-contribute">How to Contribute</a>
+                        <a class="dropdown-item" 
href="/developers/githubPRs">Github PRs</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-become-a-committer">How to Become a Committer</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-release">How to Release</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-update-the-website">How to Update the Website</a>
                     </div>
                 </li>
 
@@ -94,22 +102,21 @@
                 <li class="nav-item dropdown">
                     <a class="nav-link dropdown-toggle" href="" 
id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" 
aria-expanded="false">Community</a>
                     <div class="dropdown-menu dropdown-menu-right">
-                        <a class="dropdown-item" 
href="/community/history/">History of the Apache Mahout Project</a>
-                        <a class="dropdown-item" href="/community/blogs/">Blog 
Posts About Mahout</a>
-                        <a class="dropdown-item" 
href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a>
+                        <!--<a class="dropdown-item" 
href="/community/history/">History of the Apache Mahout Project</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/blogs/">Blog Posts About Mahout</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a>-->
                         <!-- <a class="dropdown-item" 
href="/community/books-tutorials-and-talks/">Books Tutorials and Talks</a> -->
-                        <a class="dropdown-item" 
href="/community/buildingmahout/">Building Mahout</a>
                         <!-- <a class="dropdown-item" 
href="/community/faq/">FAQ</a> needs a lot of updating -->
-                        <a class="dropdown-item" 
href="/community/gsoc/">GSoC</a>
+                        <a class="dropdown-item" 
href="/developers/gsoc">GSoC</a>
                         <!-- Is OK- updated Map/Reduce verbage to reflect 
Samsara -->
                         <!-- <a class="dropdown-item" 
href="/community/mahout-benchmarks/">Mahout Benchmarks</a> These are old, Keep 
them? -->
                         <!-- <a class="dropdown-item" 
href="/community/mahout-wiki/">Mahout Wiki</a> at very least needs links 
cleanedup - do we still want this even?-->
-                        <a class="dropdown-item" 
href="/community/mailing-lists/">Mailing Lists</a>
+                        <a class="dropdown-item" 
href="/general/mailing-lists">Mailing Lists</a>
                         <!-- Clean and pretty -->
                         <!-- <a class="dropdown-item" 
href="/community/powered-by-mahout/">Powered By Mahout</a> needs update -->
-                        <a class="dropdown-item" 
href="/community/privacy-policy/">Privacy Policy</a>
+                        <a class="dropdown-item" 
href="/general/privacy-policy">Privacy Policy</a>
                         <!-- <a class="dropdown-item" 
href="/community/professional-support/">Professional Support</a> update if we 
even want to keep -->
-                        <a class="dropdown-item" 
href="/community/who-we-are/">Who We Are</a>
+                        <a class="dropdown-item" 
href="/general/who-we-are">Who We Are</a>
                         <!-- nikolai needs to add himself -->
                     </div>
                 </li>

http://git-wip-us.apache.org/repos/asf/mahout/blob/20ceb66e/users/algorithms/d-qr.html
----------------------------------------------------------------------
diff --git a/users/algorithms/d-qr.html b/users/algorithms/d-qr.html
index e9de396..d926802 100644
--- a/users/algorithms/d-qr.html
+++ b/users/algorithms/d-qr.html
@@ -28,7 +28,15 @@
 
 </head>
 
-
+<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-98314020-1', 'auto');
+  ga('send', 'pageview');
+</script>
 <body>
 
   <nav class="navbar navbar-expand-lg navbar-light bg-light navbar-mahout">
@@ -49,11 +57,11 @@
 
                 <!-- Download -->
                 <li class="nav-item">
-                    <a class="nav-link" href="/downloads/">Download</a>
+                    <a class="nav-link" href="/general/downloads">Download</a>
                 </li>
 
                 <li class="nav-item">
-                    <a class="nav-link" 
href="/docs/0.13.1-SNAPSHOT/index.html">Overview</a>
+                    <a class="nav-link" 
href="/docs/latest/index.html">Overview</a>
                 </li>
 
                 <!-- Developers -->
@@ -70,11 +78,11 @@
                         <!-- <a class="dropdown-item" 
href="/developers/version-control/">Version Control</a> -->
                         <div class="dropdown-divider"></div>
                         <h6 class="dropdown-header">How To's</h6>
-                        <a class="dropdown-item" 
href="/developers/how-to-contribute/">How to Contribute</a>
-                        <a class="dropdown-item" 
href="/developers/githubPRs/">Github PRs</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-become-a-committer/">How to Become a Committer</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-release/">How to Release</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-update-the-website/">How to Update the Website</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-contribute">How to Contribute</a>
+                        <a class="dropdown-item" 
href="/developers/githubPRs">Github PRs</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-become-a-committer">How to Become a Committer</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-release">How to Release</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-update-the-website">How to Update the Website</a>
                     </div>
                 </li>
 
@@ -94,22 +102,21 @@
                 <li class="nav-item dropdown">
                     <a class="nav-link dropdown-toggle" href="" 
id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" 
aria-expanded="false">Community</a>
                     <div class="dropdown-menu dropdown-menu-right">
-                        <a class="dropdown-item" 
href="/community/history/">History of the Apache Mahout Project</a>
-                        <a class="dropdown-item" href="/community/blogs/">Blog 
Posts About Mahout</a>
-                        <a class="dropdown-item" 
href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a>
+                        <!--<a class="dropdown-item" 
href="/community/history/">History of the Apache Mahout Project</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/blogs/">Blog Posts About Mahout</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a>-->
                         <!-- <a class="dropdown-item" 
href="/community/books-tutorials-and-talks/">Books Tutorials and Talks</a> -->
-                        <a class="dropdown-item" 
href="/community/buildingmahout/">Building Mahout</a>
                         <!-- <a class="dropdown-item" 
href="/community/faq/">FAQ</a> needs a lot of updating -->
-                        <a class="dropdown-item" 
href="/community/gsoc/">GSoC</a>
+                        <a class="dropdown-item" 
href="/developers/gsoc">GSoC</a>
                         <!-- Is OK- updated Map/Reduce verbage to reflect 
Samsara -->
                         <!-- <a class="dropdown-item" 
href="/community/mahout-benchmarks/">Mahout Benchmarks</a> These are old, Keep 
them? -->
                         <!-- <a class="dropdown-item" 
href="/community/mahout-wiki/">Mahout Wiki</a> at very least needs links 
cleanedup - do we still want this even?-->
-                        <a class="dropdown-item" 
href="/community/mailing-lists/">Mailing Lists</a>
+                        <a class="dropdown-item" 
href="/general/mailing-lists">Mailing Lists</a>
                         <!-- Clean and pretty -->
                         <!-- <a class="dropdown-item" 
href="/community/powered-by-mahout/">Powered By Mahout</a> needs update -->
-                        <a class="dropdown-item" 
href="/community/privacy-policy/">Privacy Policy</a>
+                        <a class="dropdown-item" 
href="/general/privacy-policy">Privacy Policy</a>
                         <!-- <a class="dropdown-item" 
href="/community/professional-support/">Professional Support</a> update if we 
even want to keep -->
-                        <a class="dropdown-item" 
href="/community/who-we-are/">Who We Are</a>
+                        <a class="dropdown-item" 
href="/general/who-we-are">Who We Are</a>
                         <!-- nikolai needs to add himself -->
                     </div>
                 </li>

http://git-wip-us.apache.org/repos/asf/mahout/blob/20ceb66e/users/algorithms/d-spca.html
----------------------------------------------------------------------
diff --git a/users/algorithms/d-spca.html b/users/algorithms/d-spca.html
index 3dfabf1..fc58179 100644
--- a/users/algorithms/d-spca.html
+++ b/users/algorithms/d-spca.html
@@ -28,7 +28,15 @@
 
 </head>
 
-
+<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-98314020-1', 'auto');
+  ga('send', 'pageview');
+</script>
 <body>
 
   <nav class="navbar navbar-expand-lg navbar-light bg-light navbar-mahout">
@@ -49,11 +57,11 @@
 
                 <!-- Download -->
                 <li class="nav-item">
-                    <a class="nav-link" href="/downloads/">Download</a>
+                    <a class="nav-link" href="/general/downloads">Download</a>
                 </li>
 
                 <li class="nav-item">
-                    <a class="nav-link" 
href="/docs/0.13.1-SNAPSHOT/index.html">Overview</a>
+                    <a class="nav-link" 
href="/docs/latest/index.html">Overview</a>
                 </li>
 
                 <!-- Developers -->
@@ -70,11 +78,11 @@
                         <!-- <a class="dropdown-item" 
href="/developers/version-control/">Version Control</a> -->
                         <div class="dropdown-divider"></div>
                         <h6 class="dropdown-header">How To's</h6>
-                        <a class="dropdown-item" 
href="/developers/how-to-contribute/">How to Contribute</a>
-                        <a class="dropdown-item" 
href="/developers/githubPRs/">Github PRs</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-become-a-committer/">How to Become a Committer</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-release/">How to Release</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-update-the-website/">How to Update the Website</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-contribute">How to Contribute</a>
+                        <a class="dropdown-item" 
href="/developers/githubPRs">Github PRs</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-become-a-committer">How to Become a Committer</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-release">How to Release</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-update-the-website">How to Update the Website</a>
                     </div>
                 </li>
 
@@ -94,22 +102,21 @@
                 <li class="nav-item dropdown">
                     <a class="nav-link dropdown-toggle" href="" 
id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" 
aria-expanded="false">Community</a>
                     <div class="dropdown-menu dropdown-menu-right">
-                        <a class="dropdown-item" 
href="/community/history/">History of the Apache Mahout Project</a>
-                        <a class="dropdown-item" href="/community/blogs/">Blog 
Posts About Mahout</a>
-                        <a class="dropdown-item" 
href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a>
+                        <!--<a class="dropdown-item" 
href="/community/history/">History of the Apache Mahout Project</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/blogs/">Blog Posts About Mahout</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a>-->
                         <!-- <a class="dropdown-item" 
href="/community/books-tutorials-and-talks/">Books Tutorials and Talks</a> -->
-                        <a class="dropdown-item" 
href="/community/buildingmahout/">Building Mahout</a>
                         <!-- <a class="dropdown-item" 
href="/community/faq/">FAQ</a> needs a lot of updating -->
-                        <a class="dropdown-item" 
href="/community/gsoc/">GSoC</a>
+                        <a class="dropdown-item" 
href="/developers/gsoc">GSoC</a>
                         <!-- Is OK- updated Map/Reduce verbage to reflect 
Samsara -->
                         <!-- <a class="dropdown-item" 
href="/community/mahout-benchmarks/">Mahout Benchmarks</a> These are old, Keep 
them? -->
                         <!-- <a class="dropdown-item" 
href="/community/mahout-wiki/">Mahout Wiki</a> at very least needs links 
cleanedup - do we still want this even?-->
-                        <a class="dropdown-item" 
href="/community/mailing-lists/">Mailing Lists</a>
+                        <a class="dropdown-item" 
href="/general/mailing-lists">Mailing Lists</a>
                         <!-- Clean and pretty -->
                         <!-- <a class="dropdown-item" 
href="/community/powered-by-mahout/">Powered By Mahout</a> needs update -->
-                        <a class="dropdown-item" 
href="/community/privacy-policy/">Privacy Policy</a>
+                        <a class="dropdown-item" 
href="/general/privacy-policy">Privacy Policy</a>
                         <!-- <a class="dropdown-item" 
href="/community/professional-support/">Professional Support</a> update if we 
even want to keep -->
-                        <a class="dropdown-item" 
href="/community/who-we-are/">Who We Are</a>
+                        <a class="dropdown-item" 
href="/general/who-we-are">Who We Are</a>
                         <!-- nikolai needs to add himself -->
                     </div>
                 </li>

http://git-wip-us.apache.org/repos/asf/mahout/blob/20ceb66e/users/algorithms/d-ssvd.html
----------------------------------------------------------------------
diff --git a/users/algorithms/d-ssvd.html b/users/algorithms/d-ssvd.html
index 1038967..fecbb8e 100644
--- a/users/algorithms/d-ssvd.html
+++ b/users/algorithms/d-ssvd.html
@@ -28,7 +28,15 @@
 
 </head>
 
-
+<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-98314020-1', 'auto');
+  ga('send', 'pageview');
+</script>
 <body>
 
   <nav class="navbar navbar-expand-lg navbar-light bg-light navbar-mahout">
@@ -49,11 +57,11 @@
 
                 <!-- Download -->
                 <li class="nav-item">
-                    <a class="nav-link" href="/downloads/">Download</a>
+                    <a class="nav-link" href="/general/downloads">Download</a>
                 </li>
 
                 <li class="nav-item">
-                    <a class="nav-link" 
href="/docs/0.13.1-SNAPSHOT/index.html">Overview</a>
+                    <a class="nav-link" 
href="/docs/latest/index.html">Overview</a>
                 </li>
 
                 <!-- Developers -->
@@ -70,11 +78,11 @@
                         <!-- <a class="dropdown-item" 
href="/developers/version-control/">Version Control</a> -->
                         <div class="dropdown-divider"></div>
                         <h6 class="dropdown-header">How To's</h6>
-                        <a class="dropdown-item" 
href="/developers/how-to-contribute/">How to Contribute</a>
-                        <a class="dropdown-item" 
href="/developers/githubPRs/">Github PRs</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-become-a-committer/">How to Become a Committer</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-release/">How to Release</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-update-the-website/">How to Update the Website</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-contribute">How to Contribute</a>
+                        <a class="dropdown-item" 
href="/developers/githubPRs">Github PRs</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-become-a-committer">How to Become a Committer</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-release">How to Release</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-update-the-website">How to Update the Website</a>
                     </div>
                 </li>
 
@@ -94,22 +102,21 @@
                 <li class="nav-item dropdown">
                     <a class="nav-link dropdown-toggle" href="" 
id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" 
aria-expanded="false">Community</a>
                     <div class="dropdown-menu dropdown-menu-right">
-                        <a class="dropdown-item" 
href="/community/history/">History of the Apache Mahout Project</a>
-                        <a class="dropdown-item" href="/community/blogs/">Blog 
Posts About Mahout</a>
-                        <a class="dropdown-item" 
href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a>
+                        <!--<a class="dropdown-item" 
href="/community/history/">History of the Apache Mahout Project</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/blogs/">Blog Posts About Mahout</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a>-->
                         <!-- <a class="dropdown-item" 
href="/community/books-tutorials-and-talks/">Books Tutorials and Talks</a> -->
-                        <a class="dropdown-item" 
href="/community/buildingmahout/">Building Mahout</a>
                         <!-- <a class="dropdown-item" 
href="/community/faq/">FAQ</a> needs a lot of updating -->
-                        <a class="dropdown-item" 
href="/community/gsoc/">GSoC</a>
+                        <a class="dropdown-item" 
href="/developers/gsoc">GSoC</a>
                         <!-- Is OK- updated Map/Reduce verbage to reflect 
Samsara -->
                         <!-- <a class="dropdown-item" 
href="/community/mahout-benchmarks/">Mahout Benchmarks</a> These are old, Keep 
them? -->
                         <!-- <a class="dropdown-item" 
href="/community/mahout-wiki/">Mahout Wiki</a> at very least needs links 
cleanedup - do we still want this even?-->
-                        <a class="dropdown-item" 
href="/community/mailing-lists/">Mailing Lists</a>
+                        <a class="dropdown-item" 
href="/general/mailing-lists">Mailing Lists</a>
                         <!-- Clean and pretty -->
                         <!-- <a class="dropdown-item" 
href="/community/powered-by-mahout/">Powered By Mahout</a> needs update -->
-                        <a class="dropdown-item" 
href="/community/privacy-policy/">Privacy Policy</a>
+                        <a class="dropdown-item" 
href="/general/privacy-policy">Privacy Policy</a>
                         <!-- <a class="dropdown-item" 
href="/community/professional-support/">Professional Support</a> update if we 
even want to keep -->
-                        <a class="dropdown-item" 
href="/community/who-we-are/">Who We Are</a>
+                        <a class="dropdown-item" 
href="/general/who-we-are">Who We Are</a>
                         <!-- nikolai needs to add himself -->
                     </div>
                 </li>

http://git-wip-us.apache.org/repos/asf/mahout/blob/20ceb66e/users/algorithms/intro-cooccurrence-spark.html
----------------------------------------------------------------------
diff --git a/users/algorithms/intro-cooccurrence-spark.html 
b/users/algorithms/intro-cooccurrence-spark.html
index bb07228..67dce17 100644
--- a/users/algorithms/intro-cooccurrence-spark.html
+++ b/users/algorithms/intro-cooccurrence-spark.html
@@ -28,7 +28,15 @@
 
 </head>
 
-
+<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-98314020-1', 'auto');
+  ga('send', 'pageview');
+</script>
 <body>
 
   <nav class="navbar navbar-expand-lg navbar-light bg-light navbar-mahout">
@@ -49,11 +57,11 @@
 
                 <!-- Download -->
                 <li class="nav-item">
-                    <a class="nav-link" href="/downloads/">Download</a>
+                    <a class="nav-link" href="/general/downloads">Download</a>
                 </li>
 
                 <li class="nav-item">
-                    <a class="nav-link" 
href="/docs/0.13.1-SNAPSHOT/index.html">Overview</a>
+                    <a class="nav-link" 
href="/docs/latest/index.html">Overview</a>
                 </li>
 
                 <!-- Developers -->
@@ -70,11 +78,11 @@
                         <!-- <a class="dropdown-item" 
href="/developers/version-control/">Version Control</a> -->
                         <div class="dropdown-divider"></div>
                         <h6 class="dropdown-header">How To's</h6>
-                        <a class="dropdown-item" 
href="/developers/how-to-contribute/">How to Contribute</a>
-                        <a class="dropdown-item" 
href="/developers/githubPRs/">Github PRs</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-become-a-committer/">How to Become a Committer</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-release/">How to Release</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-update-the-website/">How to Update the Website</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-contribute">How to Contribute</a>
+                        <a class="dropdown-item" 
href="/developers/githubPRs">Github PRs</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-become-a-committer">How to Become a Committer</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-release">How to Release</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-update-the-website">How to Update the Website</a>
                     </div>
                 </li>
 
@@ -94,22 +102,21 @@
                 <li class="nav-item dropdown">
                     <a class="nav-link dropdown-toggle" href="" 
id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" 
aria-expanded="false">Community</a>
                     <div class="dropdown-menu dropdown-menu-right">
-                        <a class="dropdown-item" 
href="/community/history/">History of the Apache Mahout Project</a>
-                        <a class="dropdown-item" href="/community/blogs/">Blog 
Posts About Mahout</a>
-                        <a class="dropdown-item" 
href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a>
+                        <!--<a class="dropdown-item" 
href="/community/history/">History of the Apache Mahout Project</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/blogs/">Blog Posts About Mahout</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a>-->
                         <!-- <a class="dropdown-item" 
href="/community/books-tutorials-and-talks/">Books Tutorials and Talks</a> -->
-                        <a class="dropdown-item" 
href="/community/buildingmahout/">Building Mahout</a>
                         <!-- <a class="dropdown-item" 
href="/community/faq/">FAQ</a> needs a lot of updating -->
-                        <a class="dropdown-item" 
href="/community/gsoc/">GSoC</a>
+                        <a class="dropdown-item" 
href="/developers/gsoc">GSoC</a>
                         <!-- Is OK- updated Map/Reduce verbage to reflect 
Samsara -->
                         <!-- <a class="dropdown-item" 
href="/community/mahout-benchmarks/">Mahout Benchmarks</a> These are old, Keep 
them? -->
                         <!-- <a class="dropdown-item" 
href="/community/mahout-wiki/">Mahout Wiki</a> at very least needs links 
cleanedup - do we still want this even?-->
-                        <a class="dropdown-item" 
href="/community/mailing-lists/">Mailing Lists</a>
+                        <a class="dropdown-item" 
href="/general/mailing-lists">Mailing Lists</a>
                         <!-- Clean and pretty -->
                         <!-- <a class="dropdown-item" 
href="/community/powered-by-mahout/">Powered By Mahout</a> needs update -->
-                        <a class="dropdown-item" 
href="/community/privacy-policy/">Privacy Policy</a>
+                        <a class="dropdown-item" 
href="/general/privacy-policy">Privacy Policy</a>
                         <!-- <a class="dropdown-item" 
href="/community/professional-support/">Professional Support</a> update if we 
even want to keep -->
-                        <a class="dropdown-item" 
href="/community/who-we-are/">Who We Are</a>
+                        <a class="dropdown-item" 
href="/general/who-we-are">Who We Are</a>
                         <!-- nikolai needs to add himself -->
                     </div>
                 </li>

http://git-wip-us.apache.org/repos/asf/mahout/blob/20ceb66e/users/algorithms/recommender-overview.html
----------------------------------------------------------------------
diff --git a/users/algorithms/recommender-overview.html 
b/users/algorithms/recommender-overview.html
index 92af04c..909f6a0 100644
--- a/users/algorithms/recommender-overview.html
+++ b/users/algorithms/recommender-overview.html
@@ -28,7 +28,15 @@
 
 </head>
 
-
+<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-98314020-1', 'auto');
+  ga('send', 'pageview');
+</script>
 <body>
 
   <nav class="navbar navbar-expand-lg navbar-light bg-light navbar-mahout">
@@ -49,11 +57,11 @@
 
                 <!-- Download -->
                 <li class="nav-item">
-                    <a class="nav-link" href="/downloads/">Download</a>
+                    <a class="nav-link" href="/general/downloads">Download</a>
                 </li>
 
                 <li class="nav-item">
-                    <a class="nav-link" 
href="/docs/0.13.1-SNAPSHOT/index.html">Overview</a>
+                    <a class="nav-link" 
href="/docs/latest/index.html">Overview</a>
                 </li>
 
                 <!-- Developers -->
@@ -70,11 +78,11 @@
                         <!-- <a class="dropdown-item" 
href="/developers/version-control/">Version Control</a> -->
                         <div class="dropdown-divider"></div>
                         <h6 class="dropdown-header">How To's</h6>
-                        <a class="dropdown-item" 
href="/developers/how-to-contribute/">How to Contribute</a>
-                        <a class="dropdown-item" 
href="/developers/githubPRs/">Github PRs</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-become-a-committer/">How to Become a Committer</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-release/">How to Release</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-update-the-website/">How to Update the Website</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-contribute">How to Contribute</a>
+                        <a class="dropdown-item" 
href="/developers/githubPRs">Github PRs</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-become-a-committer">How to Become a Committer</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-release">How to Release</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-update-the-website">How to Update the Website</a>
                     </div>
                 </li>
 
@@ -94,22 +102,21 @@
                 <li class="nav-item dropdown">
                     <a class="nav-link dropdown-toggle" href="" 
id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" 
aria-expanded="false">Community</a>
                     <div class="dropdown-menu dropdown-menu-right">
-                        <a class="dropdown-item" 
href="/community/history/">History of the Apache Mahout Project</a>
-                        <a class="dropdown-item" href="/community/blogs/">Blog 
Posts About Mahout</a>
-                        <a class="dropdown-item" 
href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a>
+                        <!--<a class="dropdown-item" 
href="/community/history/">History of the Apache Mahout Project</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/blogs/">Blog Posts About Mahout</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a>-->
                         <!-- <a class="dropdown-item" 
href="/community/books-tutorials-and-talks/">Books Tutorials and Talks</a> -->
-                        <a class="dropdown-item" 
href="/community/buildingmahout/">Building Mahout</a>
                         <!-- <a class="dropdown-item" 
href="/community/faq/">FAQ</a> needs a lot of updating -->
-                        <a class="dropdown-item" 
href="/community/gsoc/">GSoC</a>
+                        <a class="dropdown-item" 
href="/developers/gsoc">GSoC</a>
                         <!-- Is OK- updated Map/Reduce verbage to reflect 
Samsara -->
                         <!-- <a class="dropdown-item" 
href="/community/mahout-benchmarks/">Mahout Benchmarks</a> These are old, Keep 
them? -->
                         <!-- <a class="dropdown-item" 
href="/community/mahout-wiki/">Mahout Wiki</a> at very least needs links 
cleanedup - do we still want this even?-->
-                        <a class="dropdown-item" 
href="/community/mailing-lists/">Mailing Lists</a>
+                        <a class="dropdown-item" 
href="/general/mailing-lists">Mailing Lists</a>
                         <!-- Clean and pretty -->
                         <!-- <a class="dropdown-item" 
href="/community/powered-by-mahout/">Powered By Mahout</a> needs update -->
-                        <a class="dropdown-item" 
href="/community/privacy-policy/">Privacy Policy</a>
+                        <a class="dropdown-item" 
href="/general/privacy-policy">Privacy Policy</a>
                         <!-- <a class="dropdown-item" 
href="/community/professional-support/">Professional Support</a> update if we 
even want to keep -->
-                        <a class="dropdown-item" 
href="/community/who-we-are/">Who We Are</a>
+                        <a class="dropdown-item" 
href="/general/who-we-are">Who We Are</a>
                         <!-- nikolai needs to add himself -->
                     </div>
                 </li>

http://git-wip-us.apache.org/repos/asf/mahout/blob/20ceb66e/users/algorithms/spark-naive-bayes.html
----------------------------------------------------------------------
diff --git a/users/algorithms/spark-naive-bayes.html 
b/users/algorithms/spark-naive-bayes.html
index 46d6eef..a71a12d 100644
--- a/users/algorithms/spark-naive-bayes.html
+++ b/users/algorithms/spark-naive-bayes.html
@@ -28,7 +28,15 @@
 
 </head>
 
-
+<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-98314020-1', 'auto');
+  ga('send', 'pageview');
+</script>
 <body>
 
   <nav class="navbar navbar-expand-lg navbar-light bg-light navbar-mahout">
@@ -49,11 +57,11 @@
 
                 <!-- Download -->
                 <li class="nav-item">
-                    <a class="nav-link" href="/downloads/">Download</a>
+                    <a class="nav-link" href="/general/downloads">Download</a>
                 </li>
 
                 <li class="nav-item">
-                    <a class="nav-link" 
href="/docs/0.13.1-SNAPSHOT/index.html">Overview</a>
+                    <a class="nav-link" 
href="/docs/latest/index.html">Overview</a>
                 </li>
 
                 <!-- Developers -->
@@ -70,11 +78,11 @@
                         <!-- <a class="dropdown-item" 
href="/developers/version-control/">Version Control</a> -->
                         <div class="dropdown-divider"></div>
                         <h6 class="dropdown-header">How To's</h6>
-                        <a class="dropdown-item" 
href="/developers/how-to-contribute/">How to Contribute</a>
-                        <a class="dropdown-item" 
href="/developers/githubPRs/">Github PRs</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-become-a-committer/">How to Become a Committer</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-release/">How to Release</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-update-the-website/">How to Update the Website</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-contribute">How to Contribute</a>
+                        <a class="dropdown-item" 
href="/developers/githubPRs">Github PRs</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-become-a-committer">How to Become a Committer</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-release">How to Release</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-update-the-website">How to Update the Website</a>
                     </div>
                 </li>
 
@@ -94,22 +102,21 @@
                 <li class="nav-item dropdown">
                     <a class="nav-link dropdown-toggle" href="" 
id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" 
aria-expanded="false">Community</a>
                     <div class="dropdown-menu dropdown-menu-right">
-                        <a class="dropdown-item" 
href="/community/history/">History of the Apache Mahout Project</a>
-                        <a class="dropdown-item" href="/community/blogs/">Blog 
Posts About Mahout</a>
-                        <a class="dropdown-item" 
href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a>
+                        <!--<a class="dropdown-item" 
href="/community/history/">History of the Apache Mahout Project</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/blogs/">Blog Posts About Mahout</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a>-->
                         <!-- <a class="dropdown-item" 
href="/community/books-tutorials-and-talks/">Books Tutorials and Talks</a> -->
-                        <a class="dropdown-item" 
href="/community/buildingmahout/">Building Mahout</a>
                         <!-- <a class="dropdown-item" 
href="/community/faq/">FAQ</a> needs a lot of updating -->
-                        <a class="dropdown-item" 
href="/community/gsoc/">GSoC</a>
+                        <a class="dropdown-item" 
href="/developers/gsoc">GSoC</a>
                         <!-- Is OK- updated Map/Reduce verbage to reflect 
Samsara -->
                         <!-- <a class="dropdown-item" 
href="/community/mahout-benchmarks/">Mahout Benchmarks</a> These are old, Keep 
them? -->
                         <!-- <a class="dropdown-item" 
href="/community/mahout-wiki/">Mahout Wiki</a> at very least needs links 
cleanedup - do we still want this even?-->
-                        <a class="dropdown-item" 
href="/community/mailing-lists/">Mailing Lists</a>
+                        <a class="dropdown-item" 
href="/general/mailing-lists">Mailing Lists</a>
                         <!-- Clean and pretty -->
                         <!-- <a class="dropdown-item" 
href="/community/powered-by-mahout/">Powered By Mahout</a> needs update -->
-                        <a class="dropdown-item" 
href="/community/privacy-policy/">Privacy Policy</a>
+                        <a class="dropdown-item" 
href="/general/privacy-policy">Privacy Policy</a>
                         <!-- <a class="dropdown-item" 
href="/community/professional-support/">Professional Support</a> update if we 
even want to keep -->
-                        <a class="dropdown-item" 
href="/community/who-we-are/">Who We Are</a>
+                        <a class="dropdown-item" 
href="/general/who-we-are">Who We Are</a>
                         <!-- nikolai needs to add himself -->
                     </div>
                 </li>

http://git-wip-us.apache.org/repos/asf/mahout/blob/20ceb66e/users/basics/algorithms.html
----------------------------------------------------------------------
diff --git a/users/basics/algorithms.html b/users/basics/algorithms.html
index cf2285d..c67faa7 100644
--- a/users/basics/algorithms.html
+++ b/users/basics/algorithms.html
@@ -28,7 +28,15 @@
 
 </head>
 
-
+<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-98314020-1', 'auto');
+  ga('send', 'pageview');
+</script>
 <body>
 
   <nav class="navbar navbar-expand-lg navbar-light bg-light navbar-mahout">
@@ -49,11 +57,11 @@
 
                 <!-- Download -->
                 <li class="nav-item">
-                    <a class="nav-link" href="/downloads/">Download</a>
+                    <a class="nav-link" href="/general/downloads">Download</a>
                 </li>
 
                 <li class="nav-item">
-                    <a class="nav-link" 
href="/docs/0.13.1-SNAPSHOT/index.html">Overview</a>
+                    <a class="nav-link" 
href="/docs/latest/index.html">Overview</a>
                 </li>
 
                 <!-- Developers -->
@@ -70,11 +78,11 @@
                         <!-- <a class="dropdown-item" 
href="/developers/version-control/">Version Control</a> -->
                         <div class="dropdown-divider"></div>
                         <h6 class="dropdown-header">How To's</h6>
-                        <a class="dropdown-item" 
href="/developers/how-to-contribute/">How to Contribute</a>
-                        <a class="dropdown-item" 
href="/developers/githubPRs/">Github PRs</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-become-a-committer/">How to Become a Committer</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-release/">How to Release</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-update-the-website/">How to Update the Website</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-contribute">How to Contribute</a>
+                        <a class="dropdown-item" 
href="/developers/githubPRs">Github PRs</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-become-a-committer">How to Become a Committer</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-release">How to Release</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-update-the-website">How to Update the Website</a>
                     </div>
                 </li>
 
@@ -94,22 +102,21 @@
                 <li class="nav-item dropdown">
                     <a class="nav-link dropdown-toggle" href="" 
id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" 
aria-expanded="false">Community</a>
                     <div class="dropdown-menu dropdown-menu-right">
-                        <a class="dropdown-item" 
href="/community/history/">History of the Apache Mahout Project</a>
-                        <a class="dropdown-item" href="/community/blogs/">Blog 
Posts About Mahout</a>
-                        <a class="dropdown-item" 
href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a>
+                        <!--<a class="dropdown-item" 
href="/community/history/">History of the Apache Mahout Project</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/blogs/">Blog Posts About Mahout</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a>-->
                         <!-- <a class="dropdown-item" 
href="/community/books-tutorials-and-talks/">Books Tutorials and Talks</a> -->
-                        <a class="dropdown-item" 
href="/community/buildingmahout/">Building Mahout</a>
                         <!-- <a class="dropdown-item" 
href="/community/faq/">FAQ</a> needs a lot of updating -->
-                        <a class="dropdown-item" 
href="/community/gsoc/">GSoC</a>
+                        <a class="dropdown-item" 
href="/developers/gsoc">GSoC</a>
                         <!-- Is OK- updated Map/Reduce verbage to reflect 
Samsara -->
                         <!-- <a class="dropdown-item" 
href="/community/mahout-benchmarks/">Mahout Benchmarks</a> These are old, Keep 
them? -->
                         <!-- <a class="dropdown-item" 
href="/community/mahout-wiki/">Mahout Wiki</a> at very least needs links 
cleanedup - do we still want this even?-->
-                        <a class="dropdown-item" 
href="/community/mailing-lists/">Mailing Lists</a>
+                        <a class="dropdown-item" 
href="/general/mailing-lists">Mailing Lists</a>
                         <!-- Clean and pretty -->
                         <!-- <a class="dropdown-item" 
href="/community/powered-by-mahout/">Powered By Mahout</a> needs update -->
-                        <a class="dropdown-item" 
href="/community/privacy-policy/">Privacy Policy</a>
+                        <a class="dropdown-item" 
href="/general/privacy-policy">Privacy Policy</a>
                         <!-- <a class="dropdown-item" 
href="/community/professional-support/">Professional Support</a> update if we 
even want to keep -->
-                        <a class="dropdown-item" 
href="/community/who-we-are/">Who We Are</a>
+                        <a class="dropdown-item" 
href="/general/who-we-are">Who We Are</a>
                         <!-- nikolai needs to add himself -->
                     </div>
                 </li>

http://git-wip-us.apache.org/repos/asf/mahout/blob/20ceb66e/users/basics/collections.html
----------------------------------------------------------------------
diff --git a/users/basics/collections.html b/users/basics/collections.html
index aa11803..13ebea4 100644
--- a/users/basics/collections.html
+++ b/users/basics/collections.html
@@ -28,7 +28,15 @@
 
 </head>
 
-
+<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-98314020-1', 'auto');
+  ga('send', 'pageview');
+</script>
 <body>
 
   <nav class="navbar navbar-expand-lg navbar-light bg-light navbar-mahout">
@@ -49,11 +57,11 @@
 
                 <!-- Download -->
                 <li class="nav-item">
-                    <a class="nav-link" href="/downloads/">Download</a>
+                    <a class="nav-link" href="/general/downloads">Download</a>
                 </li>
 
                 <li class="nav-item">
-                    <a class="nav-link" 
href="/docs/0.13.1-SNAPSHOT/index.html">Overview</a>
+                    <a class="nav-link" 
href="/docs/latest/index.html">Overview</a>
                 </li>
 
                 <!-- Developers -->
@@ -70,11 +78,11 @@
                         <!-- <a class="dropdown-item" 
href="/developers/version-control/">Version Control</a> -->
                         <div class="dropdown-divider"></div>
                         <h6 class="dropdown-header">How To's</h6>
-                        <a class="dropdown-item" 
href="/developers/how-to-contribute/">How to Contribute</a>
-                        <a class="dropdown-item" 
href="/developers/githubPRs/">Github PRs</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-become-a-committer/">How to Become a Committer</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-release/">How to Release</a>
-                        <a class="dropdown-item" 
href="/developers/how-to-update-the-website/">How to Update the Website</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-contribute">How to Contribute</a>
+                        <a class="dropdown-item" 
href="/developers/githubPRs">Github PRs</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-become-a-committer">How to Become a Committer</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-release">How to Release</a>
+                        <a class="dropdown-item" 
href="/developers/how-to-update-the-website">How to Update the Website</a>
                     </div>
                 </li>
 
@@ -94,22 +102,21 @@
                 <li class="nav-item dropdown">
                     <a class="nav-link dropdown-toggle" href="" 
id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" 
aria-expanded="false">Community</a>
                     <div class="dropdown-menu dropdown-menu-right">
-                        <a class="dropdown-item" 
href="/community/history/">History of the Apache Mahout Project</a>
-                        <a class="dropdown-item" href="/community/blogs/">Blog 
Posts About Mahout</a>
-                        <a class="dropdown-item" 
href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a>
+                        <!--<a class="dropdown-item" 
href="/community/history/">History of the Apache Mahout Project</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/blogs/">Blog Posts About Mahout</a>-->
+                        <!--<a class="dropdown-item" 
href="/community/recent-upcoming-talks/">Recent and Upcoming Talks</a>-->
                         <!-- <a class="dropdown-item" 
href="/community/books-tutorials-and-talks/">Books Tutorials and Talks</a> -->
-                        <a class="dropdown-item" 
href="/community/buildingmahout/">Building Mahout</a>
                         <!-- <a class="dropdown-item" 
href="/community/faq/">FAQ</a> needs a lot of updating -->
-                        <a class="dropdown-item" 
href="/community/gsoc/">GSoC</a>
+                        <a class="dropdown-item" 
href="/developers/gsoc">GSoC</a>
                         <!-- Is OK- updated Map/Reduce verbage to reflect 
Samsara -->
                         <!-- <a class="dropdown-item" 
href="/community/mahout-benchmarks/">Mahout Benchmarks</a> These are old, Keep 
them? -->
                         <!-- <a class="dropdown-item" 
href="/community/mahout-wiki/">Mahout Wiki</a> at very least needs links 
cleanedup - do we still want this even?-->
-                        <a class="dropdown-item" 
href="/community/mailing-lists/">Mailing Lists</a>
+                        <a class="dropdown-item" 
href="/general/mailing-lists">Mailing Lists</a>
                         <!-- Clean and pretty -->
                         <!-- <a class="dropdown-item" 
href="/community/powered-by-mahout/">Powered By Mahout</a> needs update -->
-                        <a class="dropdown-item" 
href="/community/privacy-policy/">Privacy Policy</a>
+                        <a class="dropdown-item" 
href="/general/privacy-policy">Privacy Policy</a>
                         <!-- <a class="dropdown-item" 
href="/community/professional-support/">Professional Support</a> update if we 
even want to keep -->
-                        <a class="dropdown-item" 
href="/community/who-we-are/">Who We Are</a>
+                        <a class="dropdown-item" 
href="/general/who-we-are">Who We Are</a>
                         <!-- nikolai needs to add himself -->
                     </div>
                 </li>

Reply via email to