You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ra...@apache.org on 2017/04/29 04:57:23 UTC

[46/46] mahout git commit: WEBSITE Ported old website

WEBSITE Ported old website


Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/ac56b551
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/ac56b551
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/ac56b551

Branch: refs/heads/website
Commit: ac56b5512356ed4a2c590808ee0f68bb512afa10
Parents: a04a32f
Author: rawkintrevo <tr...@gmail.com>
Authored: Fri Apr 28 23:56:13 2017 -0500
Committer: rawkintrevo <tr...@gmail.com>
Committed: Fri Apr 28 23:56:13 2017 -0500

----------------------------------------------------------------------
 .gitignore                                      |    3 +
 website/README.md                               |   38 +-
 website/_data/global.yml                        |   10 -
 website/_data/nav.yml                           |    5 -
 website/_includes/JB/setup                      |    1 +
 .../_includes/themes/mahout-retro/default.html  |  166 +
 website/_includes/themes/mahout-retro/page.html |    9 +
 website/_includes/themes/mahout-retro/post.html |    9 +
 .../_includes/themes/mahout-retro/settings.yml  |    2 +
 website/_includes/themes/mahout2/default.html   |  165 +-
 .../_includes/themes/mahout2/front_page.html    |   95 -
 website/_includes/themes/mahout2/header.html    |   41 -
 .../_includes/themes/mahout2/navbar_docs.html   |  124 -
 .../_includes/themes/mahout2/navbar_main.html   |  100 -
 website/_includes/themes/mahout2/page.html      |   97 +-
 website/_includes/themes/mahout3/default.html   |  117 +
 website/_includes/themes/mahout3/page.html      |    9 +
 website/_includes/themes/mahout3/post.html      |    9 +
 website/_includes/themes/mahout3/settings.yml   |    2 +
 website/_layouts/default.html                   |    6 -
 website/_layouts/doc.html                       |    0
 website/_layouts/front_page.html                |    7 -
 website/_layouts/inner.html                     |   16 -
 website/_layouts/mahout.html                    |   16 -
 website/_layouts/mahoutdoc.html                 |  118 -
 website/_layouts/page.html                      |    7 -
 website/_layouts/post.html                      |    7 -
 website/_layouts_old/body-old.html              |    7 +
 website/_layouts_old/default.html               |    6 +
 website/_layouts_old/doc.html                   |    0
 website/_layouts_old/footer.html                |    7 +
 website/_layouts_old/front_page.html            |    7 +
 website/_layouts_old/header.html                |    7 +
 website/_layouts_old/homepage.html              |    7 +
 website/_layouts_old/inner.html                 |   16 +
 website/_layouts_old/mahout.html                |   16 +
 website/_layouts_old/mahoutdoc.html             |  118 +
 website/_layouts_old/navbar_docs.html           |    7 +
 website/_layouts_old/navbar_main.html           |    7 +
 website/_layouts_old/page.html                  |    7 +
 website/_layouts_old/pagination.html            |    7 +
 website/_layouts_old/post.html                  |    7 +
 website/_layouts_old/tile.html                  |    7 +
 website/_layouts_old/title-group.html           |    7 +
 .../mahout-retro/css/bootstrap-responsive.css   | 1109 ++++
 .../css/bootstrap-responsive.css.bu             | 1109 ++++
 .../css/bootstrap-responsive.min.css            |    9 +
 .../themes/mahout-retro/css/bootstrap.css       | 6165 ++++++++++++++++++
 .../themes/mahout-retro/css/bootstrap.min.css   |    9 +
 .../assets/themes/mahout-retro/css/global.css   |  938 +++
 .../assets/themes/mahout-retro/css/global__.css |  886 +++
 website/assets/themes/mahout-retro/css/main.css |    4 +
 .../assets/themes/mahout-retro/js/bootstrap.js  | 2276 +++++++
 .../themes/mahout-retro/js/bootstrap.min.js     |    6 +
 .../assets/themes/mahout-retro/js/effects.js    | 1130 ++++
 .../themes/mahout-retro/js/jquery-1.9.1.min.js  |    5 +
 .../assets/themes/mahout-retro/js/prototype.js  | 4320 ++++++++++++
 website/assets/themes/mahout-retro/js/search.js |   21 +
 website/assets/themes/mahout-retro/js/slides.js |  109 +
 .../assets/themes/mahout-retro/js/widgets.js    |   45 +
 website/assets/themes/mahout2/css/Supernice.css | 5909 -----------------
 .../themes/mahout3/css/bootstrap-theme.min.css  |    7 +
 .../assets/themes/mahout3/css/bootstrap.min.css |    7 +
 .../themes/mahout3/css/bs-sticky-footer.css     |   29 +
 website/assets/themes/mahout3/css/style.css     |  125 +
 .../fonts/glyphicons-halflings-regular.eot      |    0
 .../fonts/glyphicons-halflings-regular.svg      |  229 +
 .../fonts/glyphicons-halflings-regular.ttf      |    0
 .../fonts/glyphicons-halflings-regular.woff     |    0
 .../assets/themes/mahout3/js/bootstrap.min.js   |    7 +
 website/docs/_config.yml                        |    6 +-
 website/docs/_includes/JB                       |    1 +
 website/docs/_includes/JB/analytics             |   20 -
 .../_includes/JB/analytics-providers/gauges     |   13 -
 .../_includes/JB/analytics-providers/getclicky  |   12 -
 .../_includes/JB/analytics-providers/google     |   11 -
 .../JB/analytics-providers/google-universal     |    9 -
 .../_includes/JB/analytics-providers/mixpanel   |   11 -
 .../docs/_includes/JB/analytics-providers/piwik |   10 -
 website/docs/_includes/JB/categories_list       |   37 -
 website/docs/_includes/JB/comments              |   18 -
 .../docs/_includes/JB/comments-providers/disqus |   15 -
 .../_includes/JB/comments-providers/duoshuo     |   14 -
 .../_includes/JB/comments-providers/facebook    |    9 -
 .../JB/comments-providers/intensedebate         |    6 -
 .../_includes/JB/comments-providers/livefyre    |    6 -
 website/docs/_includes/JB/feedburner            |    3 -
 website/docs/_includes/JB/file_exists           |   26 -
 website/docs/_includes/JB/gist                  |   19 -
 website/docs/_includes/JB/is_production         |   39 -
 website/docs/_includes/JB/liquid_raw            |   32 -
 website/docs/_includes/JB/pages_list            |   39 -
 website/docs/_includes/JB/posts_collate         |   55 -
 website/docs/_includes/JB/setup                 |   27 -
 website/docs/_includes/JB/sharing               |    9 -
 website/docs/_includes/JB/sort_collection       |   81 -
 website/docs/_includes/JB/tags_list             |   33 -
 website/docs/_includes/navbar.html              |  110 +
 website/docs/_includes/themes                   |    1 +
 .../docs/_includes/themes/mahout2/default.html  |   98 -
 .../docs/_includes/themes/mahout2/navbar.html   |  126 -
 website/docs/_includes/themes/mahout2/page.html |    9 -
 website/docs/_includes/themes/mahout2/post.html |    9 -
 .../docs/_includes/themes/mahout2/settings.yml  |    2 -
 website/docs/_layouts/default.html              |    4 +-
 website/docs/_layouts/navbar.html               |    7 -
 website/docs/_layouts/page.html                 |    4 +-
 website/docs/_layouts/post.html                 |    4 +-
 website/docs/assets                             |    1 +
 website/docs/assets/img/Mahout-logo-82x100.png  |  Bin 5140 -> 0 bytes
 .../assets/themes/mahout2/css/Supernice.css     | 5909 -----------------
 .../themes/mahout2/css/bootstrap-theme.min.css  |    7 -
 .../assets/themes/mahout2/css/bootstrap.min.css |    7 -
 .../themes/mahout2/css/bs-sticky-footer.css     |   29 -
 .../docs/assets/themes/mahout2/css/style.css    |  126 -
 .../fonts/glyphicons-halflings-regular.eot      |  Bin 20290 -> 0 bytes
 .../fonts/glyphicons-halflings-regular.svg      |  229 -
 .../fonts/glyphicons-halflings-regular.ttf      |  Bin 41236 -> 0 bytes
 .../fonts/glyphicons-halflings-regular.woff     |  Bin 23292 -> 0 bytes
 .../assets/themes/mahout2/js/bootstrap.min.js   |    7 -
 website/front/_config.yml                       |   11 +-
 website/front/_includes/JB                      |    1 +
 website/front/_includes/JB/analytics            |   20 -
 .../_includes/JB/analytics-providers/gauges     |   13 -
 .../_includes/JB/analytics-providers/getclicky  |   12 -
 .../_includes/JB/analytics-providers/google     |   11 -
 .../JB/analytics-providers/google-universal     |    9 -
 .../_includes/JB/analytics-providers/mixpanel   |   11 -
 .../_includes/JB/analytics-providers/piwik      |   10 -
 website/front/_includes/JB/categories_list      |   37 -
 website/front/_includes/JB/comments             |   18 -
 .../_includes/JB/comments-providers/disqus      |   15 -
 .../_includes/JB/comments-providers/duoshuo     |   14 -
 .../_includes/JB/comments-providers/facebook    |    9 -
 .../JB/comments-providers/intensedebate         |    6 -
 .../_includes/JB/comments-providers/livefyre    |    6 -
 website/front/_includes/JB/feedburner           |    3 -
 website/front/_includes/JB/file_exists          |   26 -
 website/front/_includes/JB/gist                 |   19 -
 website/front/_includes/JB/is_production        |   39 -
 website/front/_includes/JB/liquid_raw           |   32 -
 website/front/_includes/JB/pages_list           |   39 -
 website/front/_includes/JB/posts_collate        |   55 -
 website/front/_includes/JB/setup                |   27 -
 website/front/_includes/JB/sharing              |    9 -
 website/front/_includes/JB/sort_collection      |   81 -
 website/front/_includes/JB/tags_list            |   33 -
 website/front/_includes/navbar.html             |   82 +
 website/front/_includes/themes                  |    1 +
 .../front/_includes/themes/mahout2/default.html |   98 -
 .../front/_includes/themes/mahout2/navbar.html  |   99 -
 .../front/_includes/themes/mahout2/page.html    |    9 -
 .../front/_includes/themes/mahout2/post.html    |    9 -
 .../front/_includes/themes/mahout2/settings.yml |    2 -
 website/front/_layouts/default.html             |    4 +-
 website/front/_layouts/page.html                |    4 +-
 website/front/_layouts/post.html                |    4 +-
 website/front/assets                            |    1 +
 website/front/assets/img/Mahout-logo-82x100.png |  Bin 5140 -> 0 bytes
 .../assets/themes/mahout2/css/Supernice.css     | 5909 -----------------
 .../themes/mahout2/css/bootstrap-theme.min.css  |    7 -
 .../assets/themes/mahout2/css/bootstrap.min.css |    7 -
 .../themes/mahout2/css/bs-sticky-footer.css     |   29 -
 .../front/assets/themes/mahout2/css/style.css   |  126 -
 .../fonts/glyphicons-halflings-regular.eot      |  Bin 20290 -> 0 bytes
 .../fonts/glyphicons-halflings-regular.svg      |  229 -
 .../fonts/glyphicons-halflings-regular.ttf      |  Bin 41236 -> 0 bytes
 .../fonts/glyphicons-halflings-regular.woff     |  Bin 23292 -> 0 bytes
 .../assets/themes/mahout2/js/bootstrap.min.js   |    7 -
 .../front/assets_bu/img/Mahout-logo-82x100.png  |  Bin 0 -> 5140 bytes
 .../assets_bu/themes/mahout2/css/Supernice.css  | 5909 +++++++++++++++++
 .../themes/mahout2/css/bootstrap-theme.min.css  |    7 +
 .../themes/mahout2/css/bootstrap.min.css        |    7 +
 .../themes/mahout2/css/bs-sticky-footer.css     |   29 +
 .../assets_bu/themes/mahout2/css/style.css      |  126 +
 .../fonts/glyphicons-halflings-regular.eot      |  Bin 0 -> 20290 bytes
 .../fonts/glyphicons-halflings-regular.svg      |  229 +
 .../fonts/glyphicons-halflings-regular.ttf      |  Bin 0 -> 41236 bytes
 .../fonts/glyphicons-halflings-regular.woff     |  Bin 0 -> 23292 bytes
 .../themes/mahout2/js/bootstrap.min.js          |    7 +
 .../retro-mahout/css/bootstrap-responsive.css   | 1109 ++++
 .../css/bootstrap-responsive.min.css            |    9 +
 .../themes/retro-mahout/css/bootstrap.css       | 6158 +++++++++++++++++
 .../themes/retro-mahout/css/bootstrap.min.css   |    9 +
 .../themes/retro-mahout/css/global.css          |  938 +++
 .../themes/retro-mahout/css/global__.css        |  886 +++
 .../assets_bu/themes/retro-mahout/css/main.css  |    4 +
 .../themes/retro-mahout/js/bootstrap.js         | 2276 +++++++
 .../themes/retro-mahout/js/bootstrap.min.js     |    6 +
 .../assets_bu/themes/retro-mahout/js/effects.js | 1130 ++++
 .../themes/retro-mahout/js/jquery-1.9.1.min.js  |    5 +
 .../themes/retro-mahout/js/prototype.js         | 4320 ++++++++++++
 .../assets_bu/themes/retro-mahout/js/search.js  |   21 +
 .../assets_bu/themes/retro-mahout/js/slides.js  |  109 +
 .../assets_bu/themes/retro-mahout/js/widgets.js |   45 +
 website/front/community/mahout-wiki.md          |   26 +-
 .../developers/how-to-update-the-website.md     |    2 +-
 website/front/developers/release-notes.md       |    6 +
 website/front/index.md                          |  179 +-
 website/old-site                                |    2 +-
 200 files changed, 42916 insertions(+), 20954 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index bc2c464..0f8ee28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,4 +26,7 @@ bin/metastore_db
 *jar
 *log
 website/_site/
+website/docs/_site/*
+webiste/front/_site/*
+webiste/old-site/_site/*
 website/Gemfile.lock
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/README.md
----------------------------------------------------------------------
diff --git a/website/README.md b/website/README.md
index 71bd9bb..197bc59 100644
--- a/website/README.md
+++ b/website/README.md
@@ -14,7 +14,7 @@ cd website
 ```
 
 
-## There are actually two sites!
+## There are actually three sites!
 
 #### `website/front`
 
@@ -27,6 +27,14 @@ __*things that change between versions*__
 
 Follow the instructions below to serve either site, just know your links in community aren't going to work with the docs. Until you post it.
 
+#### `website/old-site`
+
+This is a full and mostly working port of the old site. It has been updated so that new themes can be applied to it, or the `mahout-retro` theme can be applied to the newer sites (thought this is somewhat messy).
+
+There is a lot of content in here, and a lot of it isn't even available from the main site. We should start going through this and dragging it over page by page, updating as we go.
+
+Eventually we'll use this to build `docs/0.13.0`
+
 ## Getting Started
 
 To start editing the website first you need to open two terminals.  One terminal will run a continuous build of the mahout website locally, and the other will serve the website on localhost:4000
@@ -46,19 +54,28 @@ Start coding.
 
 
 ## Organization
-website/_site   : this directory holds your static website.  don't modify anything in here directly!
-website/_pages  : this directory holds most of the website content (more documentation to come)
-website/_layouts  : this directory holds the basic layouts for page types
 
-website/assets  : this directory holds the css and images used for the website
+Within `mahout/website/docs` and `mahout/website/front` you'll find the following directories
 
+- `./_site`   : this directory holds your static website which is created with `jekyll build`. Modifying things in here directly will have no effect (they will be overwritten)
+- `./_layouts`  : this directory holds the basic layouts for page types
+- `./_includes`  : this directory holds files which can be included in layouts, such as the HTML that powers the 
+page, the navbar, etc. You will see in the html files referenced in `./_layouts` a line that says ` {{ content }}` this 
+ is where the markdown compiled into HTML is injected. 
+- `./assets`    : this directory holds the css and images used for the website
+- `./[OTHER]`   : all other directories become directory structure of the site. They maybe filled with markdown files. E.g.
+`./my-dir/myfile.md` will populate the site at `http://.../my-dir/myfile.html`
+
+**NOTE** `_includes/` and `_assets/` are actually symlinks so that if you change the theme, it will apply evenly to all sites.
 
 #### Themes
 
-With Jekyll Builder we can easily swap out themes.  Currently the theme is `mahout`
+With Jekyll Builder we can easily swap out themes.  Currently the theme is `mahout3`
 `website/_includes/themes/mahout` : This directory has HTML for things you will include in your pages, e.g. navbar
 `website/assets/themes/mahout`  : this directory holds the css and images used for the website (on the mahout theme, if we also may build new themes to try different looks and feels)
 
+
+
 ## How to port a page 
 
 #### Copy to it's new home
@@ -107,7 +124,7 @@ This will make links in say github, refer to the github links. Same with images.
 
 ` rake theme:switch name="THEME-NAME"`
 
-Options currently are `mahout` and `mahout2`
+Options currently are `mahout`, `mahout2`, `mahout3` and `mahout-retro`
 
 Mahout
 
@@ -135,6 +152,7 @@ This is a helpful tool for reference http://pikock.github.io/bootstrap-magic/3.0
 - [ ] Significant clean up of `/community/mahout-wiki.md`
 - [ ] Update of `/community/powered-by-mahout.md`
 - [ ] Folks need to review their contact info in `community/professional-support.md`
-- [ ] Get rid of `developer/patch-check-list.md` and add it to the notes as a checkbox when opening a PR (see zeppelin)
-- [ ] `developer/release-notes.md` stuck on 0.12.0... bump it. 
-- [x] refactor to 'top-site' and 'docs' as we need a different jekyll build to change base path for new docs version
\ No newline at end of file
+- [-] Get rid of `developer/patch-check-list.md` and add it to the notes as a checkbox when opening a PR (see zeppelin)
+- [x] `developer/release-notes.md` stuck on 0.12.0... bump it. 
+- [x] refactor to 'top-site' and 'docs' as we need a different jekyll build to change base path for new docs version
+- [x] Sign up for google analytics
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_data/global.yml
----------------------------------------------------------------------
diff --git a/website/_data/global.yml b/website/_data/global.yml
deleted file mode 100644
index a385cd4..0000000
--- a/website/_data/global.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Site Settings
-title: 'Scotch Jekyll Bootstrap'
-description: 'An Open-Source Bootstrap 3 Jekyll Theme by Scotch'
-url: 'http://scotch-io.github.io' # the base hostname & protocol for your site
-footer_text: 'This text is footer text. Footer text goes here.'
-
-# Admin Settings
-admin_name: 'Nicholas Cerminara'
-admin_email: 'nick@scotch.io'
-

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_data/nav.yml
----------------------------------------------------------------------
diff --git a/website/_data/nav.yml b/website/_data/nav.yml
deleted file mode 100644
index 83c51c7..0000000
--- a/website/_data/nav.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-main:
-    - { url: '/', text: 'Blog' }
-    - { url: '/about', text: 'About' }
-    - { url: 'https://scotch.io/tutorials/getting-started-with-jekyll-plus-a-free-bootstrap-3-starter-theme', text: 'Read the Tutorial' }
-    - { url: 'https://github.com/scotch-io', text: 'Fork on GitHub' }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_includes/JB/setup
----------------------------------------------------------------------
diff --git a/website/_includes/JB/setup b/website/_includes/JB/setup
index 77495f8..a2e4793 100644
--- a/website/_includes/JB/setup
+++ b/website/_includes/JB/setup
@@ -23,5 +23,6 @@
       {% capture ASSET_PATH %}{{ BASE_PATH }}/assets/themes/{{ page.theme.name }}{% endcapture %}
       {% endif %}
     {% endif %}
+
   {% endif %}
 {% endcapture %}{% assign jbcache = nil %}

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_includes/themes/mahout-retro/default.html
----------------------------------------------------------------------
diff --git a/website/_includes/themes/mahout-retro/default.html b/website/_includes/themes/mahout-retro/default.html
new file mode 100644
index 0000000..4144d5d
--- /dev/null
+++ b/website/_includes/themes/mahout-retro/default.html
@@ -0,0 +1,166 @@
+<!DOCTYPE html>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>Apache Mahout: Scalable machine learning and data mining</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta name="Distribution" content="Global">
+  <meta name="Robots" content="index,follow">
+  <meta name="keywords" content="apache, apache hadoop, apache lucene,
+        business data mining, cluster analysis,
+        collaborative filtering, data extraction, data filtering, data framework, data integration,
+        data matching, data mining, data mining algorithms, data mining analysis, data mining data,
+        data mining introduction, data mining software,
+        data mining techniques, data representation, data set, datamining,
+        feature extraction, fuzzy k means, genetic algorithm, hadoop,
+        hierarchical clustering, high dimensional, introduction to data mining, kmeans,
+        knowledge discovery, learning approach, learning approaches, learning methods,
+        learning techniques, lucene, machine learning, machine translation, mahout apache,
+        mahout taste, map reduce hadoop, mining data, mining methods, naive bayes,
+        natural language processing,
+        supervised, text mining, time series data, unsupervised, web data mining">
+  <link rel="shortcut icon" type="image/x-icon" href="https://mahout.apache.org/images/favicon.ico">
+  <!--<script type="text/javascript" src="{{ BASE_PATH}}/js/prototype.js"></script>-->
+  <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/prototype/1.7.2.0/prototype.js"></script>
+  <script type="text/javascript" src="{{ ASSET_PATH}}/js/effects.js"></script>
+  <script type="text/javascript" src="{{ ASSET_PATH}}/js/search.js"></script>
+  <script type="text/javascript" src="{{ ASSET_PATH}}/js/slides.js"></script>
+
+  <link href="{{ ASSET_PATH }}/css/bootstrap.min.css" rel="stylesheet" media="screen">
+  <link href="{{ ASSET_PATH }}/css/bootstrap-responsive.css" rel="stylesheet">
+  <link rel="stylesheet" href="{{ ASSET_PATH }}/css/global.css" type="text/css">
+
+  <!-- mathJax stuff -- use `\(...\)` for inline style math in markdown -->
+  <script type="text/x-mathjax-config">
+  MathJax.Hub.Config({
+    tex2jax: {
+      skipTags: ['script', 'noscript', 'style', 'textarea', 'pre']
+    }
+  });
+  MathJax.Hub.Queue(function() {
+    var all = MathJax.Hub.getAllJax(), i;
+    for(i = 0; i < all.length; i += 1) {
+      all[i].SourceElement().parentNode.className += ' has-jax';
+    }
+  });
+  </script>
+  <script type="text/javascript">
+    var mathjax = document.createElement('script'); 
+    mathjax.type = 'text/javascript'; 
+    mathjax.async = true;
+
+    mathjax.src = ('https:' == document.location.protocol) ?
+        'https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML' : 
+        'http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML';
+	
+	  var s = document.getElementsByTagName('script')[0]; 
+    s.parentNode.insertBefore(mathjax, s);
+  </script>
+</head>
+
+<body id="home" data-twttr-rendered="true">
+  <div id="wrap">
+   <div id="header">
+    <div id="logo"><a href="{{ BASE_PATH }}/"><img src="/assets/img/mahout-logo-brudman.png" alt="Logos for Mahout and Apache Software Foundation" /></a></div>
+  <div id="search">
+    <form id="search-form" action="http://www.google.com/search" method="get" class="navbar-search pull-right">    
+      <input value="http://mahout.apache.org" name="sitesearch" type="hidden">
+      <input class="search-query" name="q" id="query" type="text">
+      <input id="submission" type="image" src="/assets/img/mahout-lupe.png" alt="Search" />
+    </form>
+  </div>
+ 
+    <div class="navbar navbar-inverse" style="position:absolute;top:133px;padding-right:0px;padding-left:0px;">
+      <div class="navbar-inner" style="border: none; background: #999; border: none; border-radius: 0px;">
+        <div class="container">
+          <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <!-- <a class="brand" href="#">Apache Community Development Project</a> -->
+            {% include navbar.html %}
+        </div>
+      </div>
+    </div>
+
+</div>
+
+ <div id="sidebar">
+  <div id="sidebar-wrap">
+    <h2>Twitter</h2>
+	<ul class="sidemenu">
+		<li>
+<a class="twitter-timeline" href="https://twitter.com/ApacheMahout" data-widget-id="422861673444028416">Tweets by @ApacheMahout</a>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+</li>
+	</ul>
+    <h2>Apache Software Foundation</h2>
+    <ul class="sidemenu">
+      <li><a href="http://www.apache.org/foundation/how-it-works.html">How the ASF works</a></li>
+      <li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a></li>
+      <li><a href="http://www.apache.org/dev/">Developer Resources</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>
+    <h2>Related Projects</h2>
+    <ul class="sidemenu">
+      <li><a href="http://lucene.apache.org/">Apache Lucene</a></li>
+      <li><a href="http://hadoop.apache.org/">Apache Hadoop</a></li>
+      <li><a href="http://bigtop.apache.org/">Apache Bigtop</a></li>
+      <li><a href="http://spark.apache.org/">Apache Spark</a></li>
+	  <li><a href="http://flink.apache.org/">Apache Flink</a></li>
+    </ul>
+  </div>
+</div>
+
+  <div id="content-wrap" class="clearfix">
+   <div id="main">
+
+    {{ content }}
+   </div>
+  </div>     
+</div> 
+  <footer class="footer" align="center">
+    <div class="container">
+      <p>
+        Copyright &copy; 2014-2016 The Apache Software Foundation, Licensed under
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+        <br />
+		  Apache Mahout, Mahout, Apache, the Apache feather logo, and the elephant rider logo are either registered trademarks or trademarks of <a href="http://www.apache.org/foundation/marks/">The Apache Software Foundation</a> in the United States and other countries.
+      </p>
+    </div>
+  </footer>
+  
+  <script src="{{ ASSET_PATH}}/js/jquery-1.9.1.min.js"></script>
+  <script src="{{ ASSET_PATH}}/js/bootstrap.min.js"></script>
+  <script>
+    (function() {
+      var cx = '012254517474945470291:vhsfv7eokdc';
+      var gcse = document.createElement('script');
+      gcse.type = 'text/javascript';
+      gcse.async = true;
+      gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
+          '//www.google.com/cse/cse.js?cx=' + cx;
+      var s = document.getElementsByTagName('script')[0];
+      s.parentNode.insertBefore(gcse, s);
+    })();
+  </script>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_includes/themes/mahout-retro/page.html
----------------------------------------------------------------------
diff --git a/website/_includes/themes/mahout-retro/page.html b/website/_includes/themes/mahout-retro/page.html
new file mode 100755
index 0000000..e981ad9
--- /dev/null
+++ b/website/_includes/themes/mahout-retro/page.html
@@ -0,0 +1,9 @@
+<div class="page-header">
+  <h1>{{ page.title }} {% if page.tagline %} <small>{{ page.tagline }}</small>{% endif %}</h1>
+</div>
+
+<div class="row">
+  <div class="col-xs-12">
+    {{ content }}
+  </div>
+</div>

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_includes/themes/mahout-retro/post.html
----------------------------------------------------------------------
diff --git a/website/_includes/themes/mahout-retro/post.html b/website/_includes/themes/mahout-retro/post.html
new file mode 100644
index 0000000..0de6bcc
--- /dev/null
+++ b/website/_includes/themes/mahout-retro/post.html
@@ -0,0 +1,9 @@
+<div class="page-header">
+  <h1>{{ page.title }} {% if page.tagline %} <small>{{ page.tagline }}</small>{% endif %}</h1>
+</div>
+
+<div class="row">
+  <div class="col-xs-12">
+    {{ content }}
+  </div>
+</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_includes/themes/mahout-retro/settings.yml
----------------------------------------------------------------------
diff --git a/website/_includes/themes/mahout-retro/settings.yml b/website/_includes/themes/mahout-retro/settings.yml
new file mode 100644
index 0000000..6b1babc
--- /dev/null
+++ b/website/_includes/themes/mahout-retro/settings.yml
@@ -0,0 +1,2 @@
+theme :
+  name : mahout-retro
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_includes/themes/mahout2/default.html
----------------------------------------------------------------------
diff --git a/website/_includes/themes/mahout2/default.html b/website/_includes/themes/mahout2/default.html
index 9a6fb98..b21b9d8 100644
--- a/website/_includes/themes/mahout2/default.html
+++ b/website/_includes/themes/mahout2/default.html
@@ -1,64 +1,115 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-    <title>{{ page.title }}</title>
-    {% if page.description %}<meta name="description" content="{{ page.description }}">{% endif %}
-    <meta name="author" content="{{ site.author.name }}">
-
-    <!-- Enable responsive viewport -->
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- Bootstrap styles -->
-    <link href="{{ ASSET_PATH }}/css/bootstrap.min.css" rel="stylesheet">
-    <!-- Optional theme -->
-    <link href="{{ ASSET_PATH }}/css/bootstrap-theme.min.css" rel="stylesheet">
-    <!-- Sticky Footer -->
-    <link href="{{ ASSET_PATH }}/css/bs-sticky-footer.css" rel="stylesheet">
-
-    <!-- Custom styles -->
-    <link href="{{ ASSET_PATH }}/css/style.css" rel="stylesheet" type="text/css" media="all">
-
-    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-    <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Fav and touch icons -->
-    <!-- Update these with your own images
-      <link rel="shortcut icon" href="images/favicon.ico">
-      <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
-      <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
-      <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
-    -->
-
-    <!-- atom & rss feed -->
-    <link href="{{ BASE_PATH }}{{ site.JB.atom_path }}" type="application/atom+xml" rel="alternate" title="Sitewide ATOM Feed">
-    <link href="{{ BASE_PATH }}{{ site.JB.rss_path }}" type="application/rss+xml" rel="alternate" title="Sitewide RSS Feed">
-
-  </head>
-
-  <body>
-    {{ content }}
-    <div id="footer">
-      <div class="container">
-        <p>&copy; {{ site.time | date: '%Y' }} {{ site.author.name }}
-          with help from <a href="http://jekyllbootstrap.com" target="_blank" title="The Definitive Jekyll Blogging Framework">Jekyll Bootstrap</a>
-          and <a href="http://getbootstrap.com" target="_blank">Bootstrap</a>
-        </p>
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+  <title>{{ page.title }}</title>
+  {% if page.description %}<meta name="description" content="{{ page.description }}">{% endif %}
+  <meta name="author" content="{{ site.author.name }}">
+
+  <!-- Enable responsive viewport -->
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+  <!-- Bootstrap styles -->
+  <link href="{{ ASSET_PATH }}/css/bootstrap.min.css" rel="stylesheet">
+  <!-- Optional theme -->
+  <link href="{{ ASSET_PATH }}/css/bootstrap-theme.min.css" rel="stylesheet">
+  <!-- Sticky Footer -->
+  <link href="{{ ASSET_PATH }}/css/bs-sticky-footer.css" rel="stylesheet">
+
+  <!-- Custom styles -->
+  <link href="{{ ASSET_PATH }}/css/style.css" rel="stylesheet" type="text/css" media="all">
+
+  <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+  <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+  <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
+  <![endif]-->
+
+  <!-- Fav and touch icons -->
+  <!-- Update these with your own images
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
+  -->
+
+  <!-- atom & rss feed -->
+  <link href="{{ BASE_PATH }}{{ site.JB.atom_path }}" type="application/atom+xml" rel="alternate" title="Sitewide ATOM Feed">
+  <link href="{{ BASE_PATH }}{{ site.JB.rss_path }}" type="application/rss+xml" rel="alternate" title="Sitewide RSS Feed">
+  <script type="text/x-mathjax-config">
+  MathJax.Hub.Config({
+    tex2jax: {
+      skipTags: ['script', 'noscript', 'style', 'textarea', 'pre']
+    }
+  });
+  MathJax.Hub.Queue(function() {
+    var all = MathJax.Hub.getAllJax(), i;
+    for(i = 0; i < all.length; i += 1) {
+      all[i].SourceElement().parentNode.className += ' has-jax';
+    }
+  });
+  </script>
+  <script type="text/javascript">
+    var mathjax = document.createElement('script');
+    mathjax.type = 'text/javascript';
+    mathjax.async = true;
+
+    mathjax.src = ('https:' == document.location.protocol) ?
+        'https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML' :
+        'http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML';
+
+      var s = document.getElementsByTagName('script')[0];
+    s.parentNode.insertBefore(mathjax, s);
+  </script>
+</head>
+
+<body>
+
+<div id="wrap">
+  <body class="{{ post.title | downcase | replace:' ','-' | replace:',','' | strip_html }}{% if page.category %} category-{{ page.category }}{% endif %}{% if page.layout-class %} layout-{{ page.layout-class }}{% endif %}">
+  <nav class="navbar navbar-default">
+    <div class="container-fluid">
+      <!-- Brand and toggle get grouped for better mobile display -->
+      <div class="navbar-header">
+        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
+          <span class="sr-only">Toggle navigation</span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+        <a class="navbar-brand" href="/">
+          <img src="{{ BASE_PATH }}/assets/img/Mahout-logo-82x100.png" height="30" alt="I'm mahout">
+        </a>
       </div>
-    </div>
 
-    {% include JB/analytics %}
+      {% include navbar.html %}
+    </div><!-- /.container-fluid -->
+  </nav>
+  <div class="container">
+    {{ content }}
+  </div>
+
+
+</div>
+
+<div id="footer">
+  <div class="container">
+    <p>&copy; {{ site.time | date: '%Y' }} {{ site.author.name }}
+      with help from <a href="http://jekyllbootstrap.com" target="_blank" title="The Definitive Jekyll Blogging Framework">Jekyll Bootstrap</a>
+      and <a href="http://getbootstrap.com" target="_blank">Bootstrap</a>
+    </p>
+  </div>
+</div>
+
+{% include JB/analytics %}
 
 
-    <!-- Latest compiled and minified JavaScript, requires jQuery 1.x (2.x not supported in IE8) -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-    <script src="{{ ASSET_PATH }}/js/bootstrap.min.js"></script>
-  </body>
+<!-- Latest compiled and minified JavaScript, requires jQuery 1.x (2.x not supported in IE8) -->
+<!-- Placed at the end of the document so the pages load faster -->
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+<script src="{{ ASSET_PATH }}/js/bootstrap.min.js"></script>
+</body>
 </html>

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_includes/themes/mahout2/front_page.html
----------------------------------------------------------------------
diff --git a/website/_includes/themes/mahout2/front_page.html b/website/_includes/themes/mahout2/front_page.html
deleted file mode 100644
index 931dd01..0000000
--- a/website/_includes/themes/mahout2/front_page.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-    <title>{{ page.title }}</title>
-    {% if page.description %}<meta name="description" content="{{ page.description }}">{% endif %}
-    <meta name="author" content="{{ site.author.name }}">
-
-    <!-- Enable responsive viewport -->
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- Bootstrap styles -->
-    <link href="{{ ASSET_PATH }}/css/bootstrap.min.css" rel="stylesheet">
-    <!-- Optional theme -->
-    <link href="{{ ASSET_PATH }}/css/bootstrap-theme.min.css" rel="stylesheet">
-    <!-- Sticky Footer -->
-    <link href="{{ ASSET_PATH }}/css/bs-sticky-footer.css" rel="stylesheet">
-
-    <!-- Custom styles -->
-    <link href="{{ ASSET_PATH }}/css/style.css" rel="stylesheet" type="text/css" media="all">
-
-    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-    <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Fav and touch icons -->
-    <!-- Update these with your own images
-      <link rel="shortcut icon" href="images/favicon.ico">
-      <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
-      <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
-      <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
-    -->
-
-    <!-- atom & rss feed -->
-    <link href="{{ BASE_PATH }}{{ site.JB.atom_path }}" type="application/atom+xml" rel="alternate" title="Sitewide ATOM Feed">
-    <link href="{{ BASE_PATH }}{{ site.JB.rss_path }}" type="application/rss+xml" rel="alternate" title="Sitewide RSS Feed">
-    <script type="text/x-mathjax-config">
-  MathJax.Hub.Config({
-    tex2jax: {
-      skipTags: ['script', 'noscript', 'style', 'textarea', 'pre']
-    }
-  });
-  MathJax.Hub.Queue(function() {
-    var all = MathJax.Hub.getAllJax(), i;
-    for(i = 0; i < all.length; i += 1) {
-      all[i].SourceElement().parentNode.className += ' has-jax';
-    }
-  });
-  </script>
-    <script type="text/javascript">
-    var mathjax = document.createElement('script');
-    mathjax.type = 'text/javascript';
-    mathjax.async = true;
-
-    mathjax.src = ('https:' == document.location.protocol) ?
-        'https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML' :
-        'http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML';
-
-      var s = document.getElementsByTagName('script')[0];
-    s.parentNode.insertBefore(mathjax, s);
-  </script>
-</head>
-
-<body>
-
-<div id="wrap">
-    <body class="{{ post.title | downcase | replace:' ','-' | replace:',','' | strip_html }}{% if page.category %} category-{{ page.category }}{% endif %}{% if page.layout-class %} layout-{{ page.layout-class }}{% endif %}">
-    {% include themes/mahout2/navbar_main.html %}
-    {{ content }}
-
-</div>
-
-<div id="footer">
-    <div class="container">
-        <p>&copy; {{ site.time | date: '%Y' }} {{ site.author.name }}
-            with help from <a href="http://jekyllbootstrap.com" target="_blank" title="The Definitive Jekyll Blogging Framework">Jekyll Bootstrap</a>
-            and <a href="http://getbootstrap.com" target="_blank">Bootstrap</a>
-        </p>
-    </div>
-</div>
-
-{% include JB/analytics %}
-
-
-<!-- Latest compiled and minified JavaScript, requires jQuery 1.x (2.x not supported in IE8) -->
-<!-- Placed at the end of the document so the pages load faster -->
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-<script src="{{ ASSET_PATH }}/js/bootstrap.min.js"></script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_includes/themes/mahout2/header.html
----------------------------------------------------------------------
diff --git a/website/_includes/themes/mahout2/header.html b/website/_includes/themes/mahout2/header.html
deleted file mode 100644
index 677b2f0..0000000
--- a/website/_includes/themes/mahout2/header.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-    <title>{{ page.title }}</title>
-    {% if page.description %}<meta name="description" content="{{ page.description }}">{% endif %}
-    <meta name="author" content="{{ site.author.name }}">
-
-    <!-- Enable responsive viewport -->
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- Bootstrap styles -->
-    <link href="{{ ASSET_PATH }}/css/bootstrap.min.css" rel="stylesheet">
-    <!-- Optional theme -->
-    <link href="{{ ASSET_PATH }}/css/bootstrap-theme.min.css" rel="stylesheet">
-    <!-- Sticky Footer -->
-    <link href="{{ ASSET_PATH }}/css/bs-sticky-footer.css" rel="stylesheet">
-
-    <!-- Custom styles -->
-    <link href="{{ ASSET_PATH }}/css/style.css" rel="stylesheet" type="text/css" media="all">
-
-    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-    <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
-    <![endif]-->
-
-    <!-- Fav and touch icons -->
-    <!-- Update these with your own images
-      <link rel="shortcut icon" href="images/favicon.ico">
-      <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
-      <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
-      <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
-    -->
-
-    <!-- atom & rss feed -->
-    <link href="{{ BASE_PATH }}{{ site.JB.atom_path }}" type="application/atom+xml" rel="alternate" title="Sitewide ATOM Feed">
-    <link href="{{ BASE_PATH }}{{ site.JB.rss_path }}" type="application/rss+xml" rel="alternate" title="Sitewide RSS Feed">
-
-</head>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_includes/themes/mahout2/navbar_docs.html
----------------------------------------------------------------------
diff --git a/website/_includes/themes/mahout2/navbar_docs.html b/website/_includes/themes/mahout2/navbar_docs.html
deleted file mode 100644
index c00f9f7..0000000
--- a/website/_includes/themes/mahout2/navbar_docs.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<nav class="navbar navbar-default">
-    <div class="container-fluid">
-        <!-- Brand and toggle get grouped for better mobile display -->
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="/">
-                <img src="{{ BASE_PATH }}/assets/img/mahout-logo.png" width="75" alt="I'm mahout">
-                Apache Mahout
-            </a>
-        </div>
-
-        <div class="collapse navbar-collapse" id="docs-navbar">
-            <ul class="nav navbar-nav">
-
-
-            <!-- Quick Start -->
-                <li id="quickstart">
-                    <a href="{{ BASE_PATH}}/quickstart.html" >Quick Start</a>
-                </li>
-
-                <li id="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Mahout-Samsara<span class="caret"></span></a>
-                    <ul class="dropdown-menu">
-                        <li><span><b>Reference Info</b><span></li>
-                        <li><a href="{{ BASE_PATH}}/programming_guide/mahout-samsara/in-core-reference.html">In-core Reference</a></li>
-                        <li><a href="{{ BASE_PATH}}/programming_guide/mahout-samsara/out-of-core-reference.html">Out-of-core Reference</a></li>
-                        <li><a href="{{ BASE_PATH}}/programming_guide/mahout-samsara/faq.html">Samsara FAQ</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><span><b>Bindings</b><span></li>
-                        <li><a href="{{ BASE_PATH}}/programming_guide/distributed/spark-bindings.html">Spark Bindings</a></li>
-                        <li><a href="{{ BASE_PATH}}/programming_guide/distributed/flink-bindings.html">Flink Bindings</a></li>
-                        <li><a href="{{ BASE_PATH}}/programming_guide/distributed/flink-bindings.html">H20 Bindings</a></li>
-                    </ul>
-                </li>
-
-                <li id="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Tutorials<span class="caret"></span></a>
-                    <ul class="dropdown-menu">
-                        <li><span><b>Spark Examples using Samsara</b><span></li>
-                        <li><a href="{{ BASE_PATH}}/programming_guide/tutorials/play-with-shell.html">Playing with Samsara in Spark Shell</a></li>
-                        <li><a href="{{ BASE_PATH}}/programming_guide/tutorials/how-to-build-an-app.html">Basic Samsara Spark Application</a></li>
-                        <li><a href="{{ BASE_PATH}}/programming_guide/tutorials/classify-a-doc-from-the-shell.html">Text Classification (Shell)</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><span><b>Fl</b><span></li>
-                        <li><a href="/docs/0.13.1-SNAPSHOT">tbd1</a></li>
-                        <li><a href="/docs/0.13.1-SNAPSHOT">tbd2</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><span><b>MapReduce</b><span></li>
-                        <li><a href="/docs/0.13.1-SNAPSHOT">tbd1</a></li>
-                        <li><a href="/docs/0.13.1-SNAPSHOT">tbd2</a></li>
-                    </ul>
-                </li>
-
-
-                <!-- Algorithms (Samsara / MR) -->
-                <li id="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Algorithms<span class="caret"></span></a>
-                    <ul class="dropdown-menu">
-                        <li><span><b>&nbsp;Distributed Linear Algebra</b><span></li>
-                        <li><a href="/docs/lastest/algorithms/linear-algebra/d-ssvd.html">Distributed SVD</a></li>
-                        <li><a href="/docs/latest/programming_guide/algorithms/linear-algebra/d-spca.html">Distributed PCA</a></li>
-                        <li><a href="/docs/latest/programming_guide/algorithms/linear-algebra/d-qr.html">Distributed QR-Decomposition </a></li>
-                        <li><a href="/docs/latest/programming_guide/algorithms/linear-algebra/d-als.html">Distributed ALS</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><span><b>&nbsp;Regression </b><span></li>
-                        <li><a href="/docs/latest/programming_guide/algorithms/regression/ols.html">Ordinary Least Squares</a></li>
-                        <li><a href="/docs/latest/programming_guide/algorithms/regression/cochrane-orcutt.html">Cochrane-Orcutt Procedure</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><span><b>&nbsp;Preprocessors</b><span></li>
-                        <li><a href="/docs/latest/programming_guide/algorithms/preprocessors/AsFactor.html">AsFactor (a.k.a. "one-hot encoding")</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><span><b>&nbsp;Reccomenders</b><span></li>
-                        <li><a href="/docs/latest/programming_guide/algorithms/reccomenders/CCO.html">CCO</a></li>
-                    </ul>
-                </li>
-
-                <!-- Scala Docs -->
-                <li id="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Scala Docs<span class="caret"></span></a>
-                    <ul class="dropdown-menu">
-                        <li class="title"><span><b>TODO - Needs update per new scaladocs</b></span></li>
-                        <li><a href="http://apache.github.io/mahout/0.10.1/docs/mahout-math/index.html">Mahout Math</a></li>
-                        <li><a href="http://apache.github.io/mahout/0.10.1/docs/mahout-math-scala/index.html">Mahout Math Scala bindings</a></li>
-                        <li><a href="http://apache.github.io/mahout/0.10.1/docs/mahout-math/index.htmlhttp://apache.github.io/mahout/0.10.1/docs/mahout-spark/index.html">Mahout Spark bindings</a></li>
-                        <li><a href="http://apache.github.io/mahout/0.10.1/docs/mahout-math/index.html">Mahout Spark bindings shell</a></li>
-                        <li><a href="http://apache.github.io/mahout/0.10.1/docs/mahout-math/index.html">Mahout H2O backend Scaladoc</a></li>
-                        <li><a href="http://apache.github.io/mahout/0.10.1/docs/mahout-math/index.html">Mahout H2O backend Javadoc</a></li>
-                        <li><a href="http://apache.github.io/mahout/0.10.1/docs/mahout-math/index.html">Mahout HDFS</a></li>
-                        <li><a href="http://apache.github.io/mahout/0.10.1/docs/mahout-math/index.html">Mahout Map-Reduce</a></li>
-                        <li><a href="http://apache.github.io/mahout/0.10.1/docs/mahout-math/index.html">Mahout Examples</a></li>
-                        <li><a href="http://apache.github.io/mahout/0.10.1/docs/mahout-math/index.html">Mahout Integration</a></li>
-                    </ul>
-                </li>
-
-
-            </ul>
-            <form class="navbar-form navbar-left">
-                <div class="form-group">
-                    <input type="text" class="form-control" placeholder="Search">
-                </div>
-                <button type="submit" class="btn btn-default">Submit</button>
-            </form>
-            <ul class="nav navbar-nav navbar-right">
-                <li><a href="http://github.com/apache/mahout">Github</a></li>
-
-                <!-- Apache -->
-                <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache <span class="caret"></span></a>
-                    <ul class="dropdown-menu">
-                        <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>
-                </li>
-
-            </ul>
-    </div>
-</nav> <!--/.navbar-collapse -->

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_includes/themes/mahout2/navbar_main.html
----------------------------------------------------------------------
diff --git a/website/_includes/themes/mahout2/navbar_main.html b/website/_includes/themes/mahout2/navbar_main.html
deleted file mode 100644
index 9562a6c..0000000
--- a/website/_includes/themes/mahout2/navbar_main.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<nav class="navbar navbar-default">
-    <div class="container-fluid">
-        <!-- Brand and toggle get grouped for better mobile display -->
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="/">
-                <img src="{{ BASE_PATH }}/assets/img/mahout-logo.png" width="75" alt="I'm mahout">
-                Apache Mahout
-            </a>
-        </div>
-
-        <!-- Collect the nav links, forms, and other content for toggling -->
-        <div class="collapse navbar-collapse" id="main-navbar">
-            <ul class="nav navbar-nav">
-
-                <!-- Download -->
-                <li><a href="{{ BASE_PATH }}/downloads">Download Mahout</a></li>
-
-                <!-- Community -->
-                <li id="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Developers<span class="caret"></span></a>
-                    <ul class="dropdown-menu">
-                        <li><a href="/developers/githubPRs.html">Github PRs</a></li>
-                        <li><a href="/developers/how-to-become-a-committer.html">How to Become a Committer</a></li>
-                        <li><a href="/developers/how-to-contribute.html">How to Contribute</a></li>
-                        <li><a href="/developers/how-to-release.html">How to Release</a></li>
-                        <li><a href="/developers/how-to-update-the-website.html">How to Release</a></li>
-                        <li><a href="/developers/issue-tracker.html">Issues Tracking (JIRA)</a></li>
-                        <li><a href="/developers/index.html">Developers</a></li>
-                        <li><a href="/community/mailing-lists.html">Mailing Lists</a></li>
-                        <li><a href="/developers/patch-check-list.html">Patch Check List</a></li>
-                        <li><a href="/developers/reference.html">References</a></li>
-                        <li><a href="/developers/release-notes.html">Release Notes</a></li>
-                        <li><a href="/developers/thirdparty-dependencies.html">Third Party Dependencies</a></li>
-                        <li><a href="/developers/version-control.html">Version Control</a></li>
-                    </ul>
-                </li>
-
-                <!-- Docs -->
-                <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Docs <span class="caret"></span></a>    <ul class="dropdown-menu">
-                        <li><span><b>&nbsp;&nbsp;Release</b></span></li>
-                        <li><a href="/docs/0.13.0/quickstart">0.13.0</a></li>
-                        <li><a href="/tbd">Older Versions</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><span><b>&nbsp;&nbsp;Snapshot</b>&nbsp;(development)&nbsp;<span></li>
-                        <li><a href="/docs/0.13.1-SNAPSHOT">0.13.1-SNAPSHOT</a></li>
-                    </ul>
-                </li>
-
-
-                <!-- Getting Started -->
-                <li id="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Community<span class="caret"></span></a>
-                    <ul class="dropdown-menu">
-                        <li><a href="/community/books-tutorials-and-talks.html">Books Tutorials and Talks</a></li>
-                        <li><a href="/community/buildingmahout.html">Building Mahout</a></li>
-                        <li><a href="/community/faq.html">FAQ</a></li>
-                        <li><a href="/community/gsoc.html">GSOC</a></li>
-                        <li><a href="/community/mahout-benchmarks.html">Mahout Benchmarks</a></li>
-                        <li><a href="/community/mahout-wiki.html">Mahout Wiki</a></li>
-                        <li><a href="/community/mailing-lists.html">Mailing Lists</a></li>
-                        <li><a href="/community/powered-by-mahout.html">Powered By Mahout</a></li>
-                        <li><a href="/community/privacy-policy.html">Privacy Policy</a></li>
-                        <li><a href="/community/professional-support.html">Professional Support</a></li>
-                        <li><a href="/community/who-we-are.html">Who We Are</a></li>
-                    </ul>
-                </li>
-                <li><a href="/docs/0.13.0/quickstart">QuickStart</a></li>
-
-            </ul>
-            <form class="navbar-form navbar-left">
-                <div class="form-group">
-                    <input type="text" class="form-control" placeholder="Search">
-                </div>
-                <button type="submit" class="btn btn-default">Submit</button>
-            </form>
-            <ul class="nav navbar-nav navbar-right">
-                <li><a href="http://github.com/apache/mahout">Github</a></li>
-
-                <!-- Apache -->
-                <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache <span class="caret"></span></a>
-                    <ul class="dropdown-menu">
-                        <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>
-                </li>
-
-            </ul>
-        </div><!-- /.navbar-collapse -->
-    </div><!-- /.container-fluid -->
-</nav>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_includes/themes/mahout2/page.html
----------------------------------------------------------------------
diff --git a/website/_includes/themes/mahout2/page.html b/website/_includes/themes/mahout2/page.html
old mode 100644
new mode 100755
index 3227e18..e981ad9
--- a/website/_includes/themes/mahout2/page.html
+++ b/website/_includes/themes/mahout2/page.html
@@ -1,96 +1,9 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-  <title>{{ page.title }}</title>
-  {% if page.description %}<meta name="description" content="{{ page.description }}">{% endif %}
-  <meta name="author" content="{{ site.author.name }}">
-
-  <!-- Enable responsive viewport -->
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-  <!-- Bootstrap styles -->
-  <link href="{{ ASSET_PATH }}/css/bootstrap.min.css" rel="stylesheet">
-  <!-- Optional theme -->
-  <link href="{{ ASSET_PATH }}/css/bootstrap-theme.min.css" rel="stylesheet">
-  <!-- Sticky Footer -->
-  <link href="{{ ASSET_PATH }}/css/bs-sticky-footer.css" rel="stylesheet">
-
-  <!-- Custom styles -->
-  <link href="{{ ASSET_PATH }}/css/style.css" rel="stylesheet" type="text/css" media="all">
-
-  <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-  <!--[if lt IE 9]>
-  <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-  <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
-  <![endif]-->
-
-  <!-- Fav and touch icons -->
-  <!-- Update these with your own images
-    <link rel="shortcut icon" href="images/favicon.ico">
-    <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
-  -->
-
-  <!-- atom & rss feed -->
-  <link href="{{ BASE_PATH }}{{ site.JB.atom_path }}" type="application/atom+xml" rel="alternate" title="Sitewide ATOM Feed">
-  <link href="{{ BASE_PATH }}{{ site.JB.rss_path }}" type="application/rss+xml" rel="alternate" title="Sitewide RSS Feed">
-  <script type="text/x-mathjax-config">
-  MathJax.Hub.Config({
-    tex2jax: {
-      skipTags: ['script', 'noscript', 'style', 'textarea', 'pre']
-    }
-  });
-  MathJax.Hub.Queue(function() {
-    var all = MathJax.Hub.getAllJax(), i;
-    for(i = 0; i < all.length; i += 1) {
-      all[i].SourceElement().parentNode.className += ' has-jax';
-    }
-  });
-  </script>
-  <script type="text/javascript">
-    var mathjax = document.createElement('script');
-    mathjax.type = 'text/javascript';
-    mathjax.async = true;
-
-    mathjax.src = ('https:' == document.location.protocol) ?
-        'https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML' :
-        'http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML';
-
-      var s = document.getElementsByTagName('script')[0];
-    s.parentNode.insertBefore(mathjax, s);
-  </script>
-</head>
-
-<body>
-
-<div id="wrap">
-  <body class="{{ post.title | downcase | replace:' ','-' | replace:',','' | strip_html }}{% if page.category %} category-{{ page.category }}{% endif %}{% if page.layout-class %} layout-{{ page.layout-class }}{% endif %}">
-  {% include themes/mahout2/navbar_docs.html %}
-  <div class="container">
-    {{ content }}
-  </div>
+<div class="page-header">
+  <h1>{{ page.title }} {% if page.tagline %} <small>{{ page.tagline }}</small>{% endif %}</h1>
 </div>
 
-<div id="footer">
-  <div class="container">
-    <p>&copy; {{ site.time | date: '%Y' }} {{ site.author.name }}
-      with help from <a href="http://jekyllbootstrap.com" target="_blank" title="The Definitive Jekyll Blogging Framework">Jekyll Bootstrap</a>
-      and <a href="http://getbootstrap.com" target="_blank">Bootstrap</a>
-    </p>
+<div class="row">
+  <div class="col-xs-12">
+    {{ content }}
   </div>
 </div>
-
-{% include JB/analytics %}
-
-
-<!-- Latest compiled and minified JavaScript, requires jQuery 1.x (2.x not supported in IE8) -->
-<!-- Placed at the end of the document so the pages load faster -->
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-<script src="{{ ASSET_PATH }}/js/bootstrap.min.js"></script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_includes/themes/mahout3/default.html
----------------------------------------------------------------------
diff --git a/website/_includes/themes/mahout3/default.html b/website/_includes/themes/mahout3/default.html
new file mode 100644
index 0000000..ddd76c7
--- /dev/null
+++ b/website/_includes/themes/mahout3/default.html
@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+  <title>{{ page.title }}</title>
+  {% if page.description %}<meta name="description" content="{{ page.description }}">{% endif %}
+  <meta name="author" content="{{ site.author.name }}">
+
+  <!-- Enable responsive viewport -->
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+  <!-- Bootstrap styles -->
+  <link href="{{ ASSET_PATH }}/css/bootstrap.min.css" rel="stylesheet">
+  <!-- Optional theme -->
+  <link href="{{ ASSET_PATH }}/css/bootstrap-theme.min.css" rel="stylesheet">
+  <!-- Sticky Footer -->
+  <link href="{{ ASSET_PATH }}/css/bs-sticky-footer.css" rel="stylesheet">
+
+  <!-- Custom styles -->
+  <link href="{{ ASSET_PATH }}/css/style.css" rel="stylesheet" type="text/css" media="all">
+
+  <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+  <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+  <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
+  <![endif]-->
+
+  <!-- Fav and touch icons -->
+  <!-- Update these with your own images
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
+  -->
+
+  <!-- atom & rss feed -->
+  <link href="{{ BASE_PATH }}{{ site.JB.atom_path }}" type="application/atom+xml" rel="alternate" title="Sitewide ATOM Feed">
+  <link href="{{ BASE_PATH }}{{ site.JB.rss_path }}" type="application/rss+xml" rel="alternate" title="Sitewide RSS Feed">
+  <script type="text/x-mathjax-config">
+  MathJax.Hub.Config({
+    tex2jax: {
+      skipTags: ['script', 'noscript', 'style', 'textarea', 'pre']
+    }
+  });
+  MathJax.Hub.Queue(function() {
+    var all = MathJax.Hub.getAllJax(), i;
+    for(i = 0; i < all.length; i += 1) {
+      all[i].SourceElement().parentNode.className += ' has-jax';
+    }
+  });
+  </script>
+  <script type="text/javascript">
+    var mathjax = document.createElement('script');
+    mathjax.type = 'text/javascript';
+    mathjax.async = true;
+
+    mathjax.src = ('https:' == document.location.protocol) ?
+        'https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML' :
+        'http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML';
+
+      var s = document.getElementsByTagName('script')[0];
+    s.parentNode.insertBefore(mathjax, s);
+  </script>
+</head>
+
+<nav class="navbar navbar-default navbar-fixed-top">
+  <div class="container-fluid">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">
+        <img src="{{ BASE_PATH }}/assets/img/Mahout-logo-82x100.png" height="30" alt="I'm mahout">
+      </a>
+    </div>
+
+    {% include navbar.html %}
+  </div><!-- /.container-fluid -->
+</nav>
+
+<body>
+
+<div id="wrap">
+  <body class="{{ post.title | downcase | replace:' ','-' | replace:',','' | strip_html }}{% if page.category %} category-{{ page.category }}{% endif %}{% if page.layout-class %} layout-{{ page.layout-class }}{% endif %}">
+
+  <div class="container">
+    {{ content }}
+  </div>
+
+
+</div>
+
+<div id="footer">
+  <div class="container">
+    <p>&copy; {{ site.time | date: '%Y' }} {{ site.author.name }}
+      with help from <a href="http://jekyllbootstrap.com" target="_blank" title="The Definitive Jekyll Blogging Framework">Jekyll Bootstrap</a>
+      and <a href="http://getbootstrap.com" target="_blank">Bootstrap</a>
+    </p>
+  </div>
+</div>
+
+{% include JB/analytics %}
+
+
+<!-- Latest compiled and minified JavaScript, requires jQuery 1.x (2.x not supported in IE8) -->
+<!-- Placed at the end of the document so the pages load faster -->
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+<script src="{{ ASSET_PATH }}/js/bootstrap.min.js"></script>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_includes/themes/mahout3/page.html
----------------------------------------------------------------------
diff --git a/website/_includes/themes/mahout3/page.html b/website/_includes/themes/mahout3/page.html
new file mode 100755
index 0000000..e981ad9
--- /dev/null
+++ b/website/_includes/themes/mahout3/page.html
@@ -0,0 +1,9 @@
+<div class="page-header">
+  <h1>{{ page.title }} {% if page.tagline %} <small>{{ page.tagline }}</small>{% endif %}</h1>
+</div>
+
+<div class="row">
+  <div class="col-xs-12">
+    {{ content }}
+  </div>
+</div>

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_includes/themes/mahout3/post.html
----------------------------------------------------------------------
diff --git a/website/_includes/themes/mahout3/post.html b/website/_includes/themes/mahout3/post.html
new file mode 100644
index 0000000..0de6bcc
--- /dev/null
+++ b/website/_includes/themes/mahout3/post.html
@@ -0,0 +1,9 @@
+<div class="page-header">
+  <h1>{{ page.title }} {% if page.tagline %} <small>{{ page.tagline }}</small>{% endif %}</h1>
+</div>
+
+<div class="row">
+  <div class="col-xs-12">
+    {{ content }}
+  </div>
+</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_includes/themes/mahout3/settings.yml
----------------------------------------------------------------------
diff --git a/website/_includes/themes/mahout3/settings.yml b/website/_includes/themes/mahout3/settings.yml
new file mode 100644
index 0000000..796adc1
--- /dev/null
+++ b/website/_includes/themes/mahout3/settings.yml
@@ -0,0 +1,2 @@
+theme :
+  name : mahout3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_layouts/default.html
----------------------------------------------------------------------
diff --git a/website/_layouts/default.html b/website/_layouts/default.html
deleted file mode 100644
index fc93d46..0000000
--- a/website/_layouts/default.html
+++ /dev/null
@@ -1,6 +0,0 @@
----
-theme :
-  name : mahout2
----
-{% include JB/setup %}
-{% include themes/mahout2/default.html %}

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_layouts/doc.html
----------------------------------------------------------------------
diff --git a/website/_layouts/doc.html b/website/_layouts/doc.html
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_layouts/front_page.html
----------------------------------------------------------------------
diff --git a/website/_layouts/front_page.html b/website/_layouts/front_page.html
deleted file mode 100644
index 1301a92..0000000
--- a/website/_layouts/front_page.html
+++ /dev/null
@@ -1,7 +0,0 @@
----
-layout: front_page
-theme :
-name : mahout2
----
-{% include JB/setup %}
-{% include themes/mahout2/front_page.html %}

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_layouts/inner.html
----------------------------------------------------------------------
diff --git a/website/_layouts/inner.html b/website/_layouts/inner.html
deleted file mode 100644
index 6b6960c..0000000
--- a/website/_layouts/inner.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% include themes/mahout/header.html %}
-
-
-    <article>
-        <div class="container">
-            <div class="row">
-                <div class="col-md-10 col-md-offset-1">
-
-
-                    {{ content }}
-                </div>
-            </div>
-        </div>
-    </article>
-
-{% include themes/mahout/footer.html %}

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_layouts/mahout.html
----------------------------------------------------------------------
diff --git a/website/_layouts/mahout.html b/website/_layouts/mahout.html
deleted file mode 100644
index 16e445d..0000000
--- a/website/_layouts/mahout.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% include themes/mahout/header.html %}
-{% include themes/mahout/navbar_main.html %}
-
-
-    <article>
-        <div class="container">
-            <div class="row">
-                <div class="col-md-10 col-md-offset-1">
-
-                    {{ content }}
-                </div>
-            </div>
-        </div>
-    </article>
-
-{% include themes/mahout/footer.html %}

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_layouts/mahoutdoc.html
----------------------------------------------------------------------
diff --git a/website/_layouts/mahoutdoc.html b/website/_layouts/mahoutdoc.html
deleted file mode 100644
index 491f9fa..0000000
--- a/website/_layouts/mahoutdoc.html
+++ /dev/null
@@ -1,118 +0,0 @@
-{% include themes/mahout/header.html %}
-<body class="{{ post.title | downcase | replace:' ','-' | replace:',','' | strip_html }}{% if page.category %} category-{{ page.category }}{% endif %}{% if page.layout-class %} layout-{{ page.layout-class }}{% endif %}">
-
-    <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
-      <div class="container">
-        <div class="navbar-header">
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="navbar-brand" href="/">
-            <img src="/assets/themes/mahout/img/mahout-logo.png" width="75" alt="I'm mahout">
-            Apache Mahout
-          </a>
-        </div>
-        <nav class="navbar-collapse collapse" role="navigation">
-          <ul class="nav navbar-nav navbar-right">
-
-            <!-- Quick Start -->
-            <li id="quickstart">
-              <a href="/docs/0.13.0/quickstart" >Quick Start</a>
-            </li>         
-
-             <li id="samsara">
-           <!-- Samsara docs  
-             old http://mahout.apache.org/users/sparkbindings/faq.html
-
-           -->
-              <a href="#" data-toggle="dropdown" class="dropdown-toggle">Mahout-Samsara<b class="caret"></b></a>
-              <ul class="dropdown-menu">
-                <li><span><b>Reference Info</b><span></li>
-                <li><a href="/docs/0.13.0/mahout-samsara/incore">In-core Reference</a></li>
-                <li><a href="/docs/0.13.0/mahout-samsara/outofcore">Out-of-core Reference</a></li>
-                <li><a href="/docs/0.13.0/mahout-samsara/faq">Samsara FAQ</a></li>
-                <li role="separator" class="divider"></li>
-                <li><span><b>Bindings</b><span></li>
-                <li><a href="/docs/0.13.0/mahout-samsara/spark-bindings">Spark Bindings</a></li>
-                <li><a href="/docs/0.13.0/mahout-samsara/flink-bindings">Flink Bindings</a></li>
-                <li><a href="/docs/0.13.0/mahout-samsara/flink-bindings">H20 Bindings</a></li>
-              </ul>
-            </li>
-
-             <li id="tutorials">
-           <!-- Tutorials -->
-              <a href="#" data-toggle="dropdown" class="dropdown-toggle">Tutorials<b class="caret"></b></a>
-              <ul class="dropdown-menu">
-                <li><span><b>Spark Examples using Samsara</b><span></li>
-                <li><a href="/docs/0.13.0/tutorials/samsara-spark-shell">Samsara in Spark Shell</a></li>
-                <li><a href="/docs/0.13.0/tutorials/build-app">Samsara Spark Application</a></li>
-                <li><a href="/docs/0.13.0/tutorials/text-classification">Text Classification</a></li>
-                <li role="separator" class="divider"></li>
-                <li><span><b>Fl</b><span></li>
-                <li><a href="/docs/0.13.1-SNAPSHOT">tbd1</a></li>
-                <li><a href="/docs/0.13.1-SNAPSHOT">tbd2</a></li>
-                <li role="separator" class="divider"></li>
-                <li><span><b>MapReduce</b><span></li>
-                <li><a href="/docs/0.13.1-SNAPSHOT">tbd1</a></li>
-                <li><a href="/docs/0.13.1-SNAPSHOT">tbd2</a></li>
-              </ul>
-            </li>
-
-
-            <!-- Algorithms (Samsara / MR) -->
-            <li id="algorithms">
-              <a href="#" data-toggle="dropdown" class="dropdown-toggle">Algorithms<b class="caret"></b></a>
-              <ul class="dropdown-menu">
-                <li><span><b>Samsara Code</b><span></li>
-                <li><a href="/docs/0.13.0/algorithms/samsara/dssvd">Dist SVD</a></li>
-                <li><a href="/docs/0.13.0/algorithms/samsara/dspca">Dist PCA</a></li>
-                <li><a href="/docs/0.13.0/algorithms/samsara/dqr">Dist QR</a></li>
-                <li><a href="/docs/0.13.0/algorithms/samsara/dals">Dist ALS</a></li>
-                <li role="separator" class="divider"></li>
-                <li><span><b>Command Line</b><span></li>
-                <li><a href="/docs/0.13.0">algo1</a></li>
-                <li><a href="/docs/0.13.0">algo2</a></li>
-                <li role="separator" class="divider"></li>
-                <li><span><b>xxxx</b>&nbsp;(xxxxx)<span></li>
-                <li><a href="/docs/0.13.1-SNAPSHOT">xxxxx</a></li>
-              </ul>
-            </li>
-
-            <!-- Scala Docs -->
-            <li id="scaladocs">
-              <a href="tbd" data-toggle="dropdown" class="dropdown-toggle">Scala Docs<b class="caret"></b></a>
-              <ul class="dropdown-menu">
-                <li class="title"><span><b>TODO - Needs update per new scaladocs</b><span></li>
-                <li><a href="http://apache.github.io/mahout/0.10.1/docs/mahout-math/index.html">Mahout Math</a></li>
-                <li><a href="http://apache.github.io/mahout/0.10.1/docs/mahout-math-scala/index.html">Mahout Math Scala bindings</a></li>
-                <li><a href="http://apache.github.io/mahout/0.10.1/docs/mahout-math/index.htmlhttp://apache.github.io/mahout/0.10.1/docs/mahout-spark/index.html">Mahout Spark bindings</a></li>
-                <li><a href="http://apache.github.io/mahout/0.10.1/docs/mahout-math/index.html">Mahout Spark bindings shell</a></li>
-                <li><a href="http://apache.github.io/mahout/0.10.1/docs/mahout-math/index.html">Mahout H2O backend Scaladoc</a></li>
-                <li><a href="http://apache.github.io/mahout/0.10.1/docs/mahout-math/index.html">Mahout H2O backend Javadoc</a></li>
-                <li><a href="http://apache.github.io/mahout/0.10.1/docs/mahout-math/index.html">Mahout HDFS</a></li>
-                <li><a href="http://apache.github.io/mahout/0.10.1/docs/mahout-math/index.html">Mahout Map-Reduce</a></li>
-                <li><a href="http://apache.github.io/mahout/0.10.1/docs/mahout-math/index.html">Mahout Examples</a></li>
-                <li><a href="http://apache.github.io/mahout/0.10.1/docs/mahout-math/index.html">Mahout Integration</a></li>
-              </ul>
-            </li>
-
-
-        </ul>
-        </nav><!--/.navbar-collapse -->
-      </div>
-    </div>
-
-        <article>
-        <div class="container">
-            <div class="row">
-                <div class="col-md-10 col-md-offset-1">
-                    {{ content }}
-                </div>
-            </div>
-        </div>
-    </article>
-
-{% include themes/mahout/footer.html %}

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_layouts/page.html
----------------------------------------------------------------------
diff --git a/website/_layouts/page.html b/website/_layouts/page.html
deleted file mode 100644
index ce8948c..0000000
--- a/website/_layouts/page.html
+++ /dev/null
@@ -1,7 +0,0 @@
----
-theme :
-  name : mahout2
-
----
-{% include JB/setup %}
-{% include themes/mahout2/page.html %}

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_layouts/post.html
----------------------------------------------------------------------
diff --git a/website/_layouts/post.html b/website/_layouts/post.html
deleted file mode 100644
index 12c42af..0000000
--- a/website/_layouts/post.html
+++ /dev/null
@@ -1,7 +0,0 @@
----
-theme :
-  name : mahout2
-layout: default
----
-{% include JB/setup %}
-{% include themes/mahout2/post.html %}

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_layouts_old/body-old.html
----------------------------------------------------------------------
diff --git a/website/_layouts_old/body-old.html b/website/_layouts_old/body-old.html
new file mode 100644
index 0000000..5aac866
--- /dev/null
+++ b/website/_layouts_old/body-old.html
@@ -0,0 +1,7 @@
+---
+theme :
+  name : mahout
+layout: default
+---
+{% include JB/setup %}
+{% include themes/mahout/body-old.html %}

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_layouts_old/default.html
----------------------------------------------------------------------
diff --git a/website/_layouts_old/default.html b/website/_layouts_old/default.html
new file mode 100644
index 0000000..fc93d46
--- /dev/null
+++ b/website/_layouts_old/default.html
@@ -0,0 +1,6 @@
+---
+theme :
+  name : mahout2
+---
+{% include JB/setup %}
+{% include themes/mahout2/default.html %}

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_layouts_old/doc.html
----------------------------------------------------------------------
diff --git a/website/_layouts_old/doc.html b/website/_layouts_old/doc.html
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_layouts_old/footer.html
----------------------------------------------------------------------
diff --git a/website/_layouts_old/footer.html b/website/_layouts_old/footer.html
new file mode 100644
index 0000000..1523020
--- /dev/null
+++ b/website/_layouts_old/footer.html
@@ -0,0 +1,7 @@
+---
+theme :
+  name : mahout
+layout: default
+---
+{% include JB/setup %}
+{% include themes/mahout/footer.html %}

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_layouts_old/front_page.html
----------------------------------------------------------------------
diff --git a/website/_layouts_old/front_page.html b/website/_layouts_old/front_page.html
new file mode 100644
index 0000000..1301a92
--- /dev/null
+++ b/website/_layouts_old/front_page.html
@@ -0,0 +1,7 @@
+---
+layout: front_page
+theme :
+name : mahout2
+---
+{% include JB/setup %}
+{% include themes/mahout2/front_page.html %}

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_layouts_old/header.html
----------------------------------------------------------------------
diff --git a/website/_layouts_old/header.html b/website/_layouts_old/header.html
new file mode 100644
index 0000000..11c268b
--- /dev/null
+++ b/website/_layouts_old/header.html
@@ -0,0 +1,7 @@
+---
+theme :
+  name : mahout
+layout: default
+---
+{% include JB/setup %}
+{% include themes/mahout/header.html %}

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_layouts_old/homepage.html
----------------------------------------------------------------------
diff --git a/website/_layouts_old/homepage.html b/website/_layouts_old/homepage.html
new file mode 100644
index 0000000..64b198a
--- /dev/null
+++ b/website/_layouts_old/homepage.html
@@ -0,0 +1,7 @@
+---
+theme :
+  name : mahout
+layout: default
+---
+{% include JB/setup %}
+{% include themes/mahout/homepage.html %}

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_layouts_old/inner.html
----------------------------------------------------------------------
diff --git a/website/_layouts_old/inner.html b/website/_layouts_old/inner.html
new file mode 100644
index 0000000..6b6960c
--- /dev/null
+++ b/website/_layouts_old/inner.html
@@ -0,0 +1,16 @@
+{% include themes/mahout/header.html %}
+
+
+    <article>
+        <div class="container">
+            <div class="row">
+                <div class="col-md-10 col-md-offset-1">
+
+
+                    {{ content }}
+                </div>
+            </div>
+        </div>
+    </article>
+
+{% include themes/mahout/footer.html %}

http://git-wip-us.apache.org/repos/asf/mahout/blob/ac56b551/website/_layouts_old/mahout.html
----------------------------------------------------------------------
diff --git a/website/_layouts_old/mahout.html b/website/_layouts_old/mahout.html
new file mode 100644
index 0000000..16e445d
--- /dev/null
+++ b/website/_layouts_old/mahout.html
@@ -0,0 +1,16 @@
+{% include themes/mahout/header.html %}
+{% include themes/mahout/navbar_main.html %}
+
+
+    <article>
+        <div class="container">
+            <div class="row">
+                <div class="col-md-10 col-md-offset-1">
+
+                    {{ content }}
+                </div>
+            </div>
+        </div>
+    </article>
+
+{% include themes/mahout/footer.html %}