r***@apache.org
2017-12-21 23:57:15 UTC
Repository: mahout
Updated Branches:
refs/heads/master b887ab365 -> 1c528a194
WEBSITE-NOJIRA Various website fixes
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/1c528a19
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/1c528a19
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/1c528a19
Branch: refs/heads/master
Commit: 1c528a194ebad97f24934685e7bfd9872ebe3019
Parents: b887ab3
Author: Trevor a.k.a @rawkintrevo <***@gmail.com>
Authored: Thu Dec 21 17:57:04 2017 -0600
Committer: Trevor a.k.a @rawkintrevo <***@gmail.com>
Committed: Thu Dec 21 17:57:04 2017 -0600
----------------------------------------------------------------------
website/_includes/analytics.html | 9 +++
website/_includes/navbar.html | 29 ++++----
website/_layouts/default.html | 2 +-
website/developers/version-control.md | 10 +--
website/general/downloads.md | 2 +-
.../general/mailing-lists,-irc-and-archives.md | 75 --------------------
website/general/mailing-lists.md | 75 ++++++++++++++++++++
website/general/privacy-policy.md | 5 +-
website/general/who-we-are.md | 56 +++++++--------
website/index.md | 10 +--
website/posts/new-website.md | 15 ++++
11 files changed, 153 insertions(+), 135 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/1c528a19/website/_includes/analytics.html
----------------------------------------------------------------------
diff --git a/website/_includes/analytics.html b/website/_includes/analytics.html
new file mode 100644
index 0000000..5f7daee
--- /dev/null
+++ b/website/_includes/analytics.html
@@ -0,0 +1,9 @@
+<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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/mahout/blob/1c528a19/website/_includes/navbar.html
----------------------------------------------------------------------
diff --git a/website/_includes/navbar.html b/website/_includes/navbar.html
index 0fea533..83bf09e 100644
--- a/website/_includes/navbar.html
+++ b/website/_includes/navbar.html
@@ -16,11 +16,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 -->
@@ -37,11 +37,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>
@@ -61,22 +61,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/1c528a19/website/_layouts/default.html
----------------------------------------------------------------------
diff --git a/website/_layouts/default.html b/website/_layouts/default.html
index e772945..eaa9b7d 100644
--- a/website/_layouts/default.html
+++ b/website/_layouts/default.html
@@ -2,7 +2,7 @@
<html lang="{{ page.lang | default: site.lang | default: " en " }}">
{% include head.html %}
-
+{% include analytics.html %}
<body>
{% include navbar.html %}
http://git-wip-us.apache.org/repos/asf/mahout/blob/1c528a19/website/developers/version-control.md
----------------------------------------------------------------------
diff --git a/website/developers/version-control.md b/website/developers/version-control.md
index bf2f187..6de7c3f 100644
--- a/website/developers/version-control.md
+++ b/website/developers/version-control.md
@@ -1,6 +1,6 @@
---
layout: page
-title: Version Control
+title: GSOC
---
@@ -24,14 +24,6 @@ The Git URL for anonymous users is [https://github.com/apache/mahout.git](https:
The Git URL for committers is [https://git-wip-us.apache.org/repos/asf/mahout.git](https://git-wip-us.apache.org/repos/asf/mahout.git).
-## Mahout Website
-The Mahout website resides in the [Apache SVN repository](https://svn.apache.org/viewvc/mahout/site).
-
-The SVN URL for the Mahout site is: [https://svn.apache.org/repos/asf/mahout/site](https://svn.apache.org/repos/asf/mahout/site).
-
-The Mahout website can be edited via the [ASF CMS Editor](http://www.apache.org/dev/cms.html) or by checking out the source locally from SVN. A handy tool for publising the website locally while editing is available [here](https://gist.github.com/tuxdna/11223434).
-
-
<a name="VersionControl-Issues"></a>
## Issues
http://git-wip-us.apache.org/repos/asf/mahout/blob/1c528a19/website/general/downloads.md
----------------------------------------------------------------------
diff --git a/website/general/downloads.md b/website/general/downloads.md
index 1813dab..e4c3d1f 100644
--- a/website/general/downloads.md
+++ b/website/general/downloads.md
@@ -1,5 +1,5 @@
---
-layout: default
+layout: page
title: Downloads
http://git-wip-us.apache.org/repos/asf/mahout/blob/1c528a19/website/general/mailing-lists,-irc-and-archives.md
----------------------------------------------------------------------
diff --git a/website/general/mailing-lists,-irc-and-archives.md b/website/general/mailing-lists,-irc-and-archives.md
deleted file mode 100644
index 8593b5c..0000000
--- a/website/general/mailing-lists,-irc-and-archives.md
+++ /dev/null
@@ -1,75 +0,0 @@
----
-layout: default
-title: Mailing Lists, IRC and Archives
-
-
----
-
-# General
-
-Communication at Mahout happens primarily online via mailing lists. We have
-a user as well as a dev list for discussion. In addition there is a commit
-list so we are able to monitor what happens on the wiki and in svn.
-
-<a name="MailingLists,IRCandArchives-Mailinglists"></a>
-# Mailing lists
-
-<a name="MailingLists,IRCandArchives-MahoutUserList"></a>
-## Mahout User List
-
-This list is for users of Mahout to ask questions, share knowledge, and
-discuss issues. Do send mail to this list with usage and configuration
-questions and problems. Also, please send questions to this list to verify
-your problem before filing issues in JIRA.
-
-* [Subscribe](mailto:user-***@mahout.apache.org)
-* [Unsubscribe](mailto:user-***@mahout.apache.org)
-
-<a name="MailingLists,IRCandArchives-MahoutDeveloperList"></a>
-## Mahout Developer List
-
-This is the list where participating developers of the Mahout project meet
-and discuss issues concerning Mahout internals, code changes/additions,
-etc. Do not send mail to this list with usage questions or configuration
-questions and problems.
-
-Discussion list:
-
-* [Subscribe](mailto:dev-***@mahout.apache.org)
- -- Do not send mail to this list with usage questions or configuration
-questions and problems.
-* [Unsubscribe](mailto:dev-***@mahout.apache.org)
-
-Commit notifications:
-
-* [Subscribe](mailto:commits-***@mahout.apache.org)
-* [Unsubscribe](mailto:commits-***@mahout.apache.org)
-
-<a name="MailingLists,IRCandArchives-IRC"></a>
-# IRC
-
-Mahout's IRC channel is **#mahout**. It is a logged channel. Please keep in
-mind that it is for discussion purposes only and that (pseudo)decisions
-should be brought back to the dev@ mailing list or JIRA and other people
-who are not on IRC should be given time to respond before any work is
-committed.
-
-<a name="MailingLists,IRCandArchives-Archives"></a>
-# Archives
-
-<a name="MailingLists,IRCandArchives-OfficialApacheArchive"></a>
-## Official Apache Archive
-
-* [http://mail-archives.apache.org/mod_mbox/mahout-dev/](http://mail-archives.apache.org/mod_mbox/mahout-dev/)
-* [http://mail-archives.apache.org/mod_mbox/mahout-user/](http://mail-archives.apache.org/mod_mbox/mahout-user/)
-
-<a name="MailingLists,IRCandArchives-ExternalArchives"></a>
-## External Archives
-
-* [MarkMail](http://mahout.markmail.org/)
-* [Gmane](http://dir.gmane.org/gmane.comp.apache.mahout.user)
-
-Please note the inclusion of a link to an archive does not imply an
-endorsement of that company by any of the committers of Mahout the Lucene
-PMC or the Apache Software Foundation. Each archive owner is solely
-responsible for the contents and availability of their archive.
http://git-wip-us.apache.org/repos/asf/mahout/blob/1c528a19/website/general/mailing-lists.md
----------------------------------------------------------------------
diff --git a/website/general/mailing-lists.md b/website/general/mailing-lists.md
new file mode 100644
index 0000000..8593b5c
--- /dev/null
+++ b/website/general/mailing-lists.md
@@ -0,0 +1,75 @@
+---
+layout: default
+title: Mailing Lists, IRC and Archives
+
+
+---
+
+# General
+
+Communication at Mahout happens primarily online via mailing lists. We have
+a user as well as a dev list for discussion. In addition there is a commit
+list so we are able to monitor what happens on the wiki and in svn.
+
+<a name="MailingLists,IRCandArchives-Mailinglists"></a>
+# Mailing lists
+
+<a name="MailingLists,IRCandArchives-MahoutUserList"></a>
+## Mahout User List
+
+This list is for users of Mahout to ask questions, share knowledge, and
+discuss issues. Do send mail to this list with usage and configuration
+questions and problems. Also, please send questions to this list to verify
+your problem before filing issues in JIRA.
+
+* [Subscribe](mailto:user-***@mahout.apache.org)
+* [Unsubscribe](mailto:user-***@mahout.apache.org)
+
+<a name="MailingLists,IRCandArchives-MahoutDeveloperList"></a>
+## Mahout Developer List
+
+This is the list where participating developers of the Mahout project meet
+and discuss issues concerning Mahout internals, code changes/additions,
+etc. Do not send mail to this list with usage questions or configuration
+questions and problems.
+
+Discussion list:
+
+* [Subscribe](mailto:dev-***@mahout.apache.org)
+ -- Do not send mail to this list with usage questions or configuration
+questions and problems.
+* [Unsubscribe](mailto:dev-***@mahout.apache.org)
+
+Commit notifications:
+
+* [Subscribe](mailto:commits-***@mahout.apache.org)
+* [Unsubscribe](mailto:commits-***@mahout.apache.org)
+
+<a name="MailingLists,IRCandArchives-IRC"></a>
+# IRC
+
+Mahout's IRC channel is **#mahout**. It is a logged channel. Please keep in
+mind that it is for discussion purposes only and that (pseudo)decisions
+should be brought back to the dev@ mailing list or JIRA and other people
+who are not on IRC should be given time to respond before any work is
+committed.
+
+<a name="MailingLists,IRCandArchives-Archives"></a>
+# Archives
+
+<a name="MailingLists,IRCandArchives-OfficialApacheArchive"></a>
+## Official Apache Archive
+
+* [http://mail-archives.apache.org/mod_mbox/mahout-dev/](http://mail-archives.apache.org/mod_mbox/mahout-dev/)
+* [http://mail-archives.apache.org/mod_mbox/mahout-user/](http://mail-archives.apache.org/mod_mbox/mahout-user/)
+
+<a name="MailingLists,IRCandArchives-ExternalArchives"></a>
+## External Archives
+
+* [MarkMail](http://mahout.markmail.org/)
+* [Gmane](http://dir.gmane.org/gmane.comp.apache.mahout.user)
+
+Please note the inclusion of a link to an archive does not imply an
+endorsement of that company by any of the committers of Mahout the Lucene
+PMC or the Apache Software Foundation. Each archive owner is solely
+responsible for the contents and availability of their archive.
http://git-wip-us.apache.org/repos/asf/mahout/blob/1c528a19/website/general/privacy-policy.md
----------------------------------------------------------------------
diff --git a/website/general/privacy-policy.md b/website/general/privacy-policy.md
index 51976f3..f6738e7 100644
--- a/website/general/privacy-policy.md
+++ b/website/general/privacy-policy.md
@@ -1,8 +1,9 @@
---
-layout: default
+layout: page
title: Privacy Policy
-
+
+
---
Information about your use of this website is collected using server access
logs and a tracking cookie. The collected information consists of the
http://git-wip-us.apache.org/repos/asf/mahout/blob/1c528a19/website/general/who-we-are.md
----------------------------------------------------------------------
diff --git a/website/general/who-we-are.md b/website/general/who-we-are.md
index 21a91db..b35bd90 100644
--- a/website/general/who-we-are.md
+++ b/website/general/who-we-are.md
@@ -1,6 +1,6 @@
---
-layout: default
-title: Who We Are
+layout: page
+title: Who Are We?
---
@@ -15,32 +15,32 @@ Apache Mahout is maintained by a team of volunteer developers.
(Please keep the list below in alphabetical order by first name.)
-Name | Mail | PMC | Comment
-----|---------|------|------|----------
-Anand Avati | ***@... | No | Twitter: @anandavati
-Andrew Musselman | ***@... | Yes | Twitter: @akm
-Andrew Palumbo | ***@... | Yes (Chair) | |
-Benson Margulies | ***@... | Yes | |
-Dan Filimon | ***@... | No | |
-Dmitriy Lyubimov | ***@... | No (Emeritus) |
-Drew Farris | ***@... | Yes | |
-Ellen Friedman | ***@... | No | Twitter: @Ellen_Friedman
-Frank Scholten | ***@... | No | |
-Gokhan Capan | ***@... | No | <a href="http://www.linkedin.com/in/gokhancapan">LinkedIn Profile</a>
-Grant Ingersoll | ***@... | Yes | Twitter: @gsingers
-Isabel Drost-Fromm | ***@... | Yes | 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
-Jacob Alexander Mannix | ***@... | Yes | |
-Jeff Eastman | ***@... | No (Emeritus) |
-Paritosh Ranjan | ***@... | Yes | Twitter: @paritoshranjan
-Pat Ferrel | ***@... | Yes | Twitter: @occam
-Robin Anil | ***@... | Yes | |
-Sean Owen | ***@... | No (Emeritus) |
-Sebastian Schelter | ***@... | Yes | |
-Shannon Quinn | ***@... | No | |
-Stevo Slavić| ***@... | No | Twitter: @sslavic
-Suneel Marthi | ***@... | Yes | Twitter: @suneelmarthi
-Ted Dunning | ***@... | Yes |
-Tom Pierce | ***@... | No | |
+Name | Mail | PMC | Comment
+------------------------|------------------:|------:|---:|
+Anand Avati | ***@... | No | Twitter: @anandavati
+Andrew Musselman | ***@... | Yes | Twitter: @akm
+Benson Margulies | ***@... | Yes | PMC Chair
+Dan Filimon | ***@... | No | |
+Dmitriy Lyubimov | ***@... | No | (Emeritus PMC)
+Drew Farris | ***@... | Yes | |
+Ellen Friedman | ***@... | No | Twitter: @Ellen_Friedman
+Frank Scholten | ***@... | No | |
+Gokhan Capan | ***@... | No | <a href="http://www.linkedin.com/in/gokhancapan">LinkedIn Profile</a>
+Grant Ingersoll | ***@... | Yes | Twitter: @gsingers
+Isabel Drost-Fromm | ***@... | Yes | <!--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-->
+Jacob Alexander Mannix | ***@... | Yes |
+Jeff Eastman | ***@... | No | (Emeritus PMC)
+Paritosh Ranjan | ***@... | Yes | Twitter: @paritoshranjan
+Pat Ferrel | ***@... | Yes | Twitter: @occam
+Robin Anil | ***@... | Yes |
+Sean Owen | ***@... | No | (Emeritus PMC)
+Sebastian Schelter | ***@... | Yes |
+Shannon Quinn | ***@... | No |
+Stevo Slavić | ***@... | No | Twitter: @sslavic
+Suneel Marthi | ***@... | Yes | Twitter: @suneelmarthi
+Ted Dunning | ***@... | Yes |
+Tom Pierce | ***@... | No |
+Trevor Grant | ***@... | Yes | Twitter: @rawkintrevo
<a name="WhoWeAre-EmeritusCommitters"></a>
## Emeritus Committers
http://git-wip-us.apache.org/repos/asf/mahout/blob/1c528a19/website/index.md
----------------------------------------------------------------------
diff --git a/website/index.md b/website/index.md
index ba116b3..9102024 100644
--- a/website/index.md
+++ b/website/index.md
@@ -2,13 +2,15 @@
layout: home
---
-<h2 class="section-heading">Recent News</h2>
-{% for post in site.posts limit: 5 %}
- {% include posts/post-preview.html %}
-{% endfor %}
+
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>
- Mathematically Expressive Scala DSL
- Support for Multiple Distributed Backends (including Apache Spark)
- Modular Native Solvers for CPU/GPU/CUDA Acceleration
+
+<h2 class="section-heading">Recent News</h2>
+{% for post in posts limit: 5 %}
+ {% include posts/post-preview.html %}
+{% endfor %}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/mahout/blob/1c528a19/website/posts/new-website.md
----------------------------------------------------------------------
diff --git a/website/posts/new-website.md b/website/posts/new-website.md
new file mode 100644
index 0000000..3757f93
--- /dev/null
+++ b/website/posts/new-website.md
@@ -0,0 +1,15 @@
+---
+layout: page
+title: New Website
+
+
+
+---
+
+
+# New Website Released
+
+We've launced a new website, designed by David Miller from [StartBootstrap](http://startbootstrap.com).
+
+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 ***@mahout.apache.org or [open a PR](/developers/githubPRs)
\ No newline at end of file
Updated Branches:
refs/heads/master b887ab365 -> 1c528a194
WEBSITE-NOJIRA Various website fixes
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/1c528a19
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/1c528a19
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/1c528a19
Branch: refs/heads/master
Commit: 1c528a194ebad97f24934685e7bfd9872ebe3019
Parents: b887ab3
Author: Trevor a.k.a @rawkintrevo <***@gmail.com>
Authored: Thu Dec 21 17:57:04 2017 -0600
Committer: Trevor a.k.a @rawkintrevo <***@gmail.com>
Committed: Thu Dec 21 17:57:04 2017 -0600
----------------------------------------------------------------------
website/_includes/analytics.html | 9 +++
website/_includes/navbar.html | 29 ++++----
website/_layouts/default.html | 2 +-
website/developers/version-control.md | 10 +--
website/general/downloads.md | 2 +-
.../general/mailing-lists,-irc-and-archives.md | 75 --------------------
website/general/mailing-lists.md | 75 ++++++++++++++++++++
website/general/privacy-policy.md | 5 +-
website/general/who-we-are.md | 56 +++++++--------
website/index.md | 10 +--
website/posts/new-website.md | 15 ++++
11 files changed, 153 insertions(+), 135 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/1c528a19/website/_includes/analytics.html
----------------------------------------------------------------------
diff --git a/website/_includes/analytics.html b/website/_includes/analytics.html
new file mode 100644
index 0000000..5f7daee
--- /dev/null
+++ b/website/_includes/analytics.html
@@ -0,0 +1,9 @@
+<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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/mahout/blob/1c528a19/website/_includes/navbar.html
----------------------------------------------------------------------
diff --git a/website/_includes/navbar.html b/website/_includes/navbar.html
index 0fea533..83bf09e 100644
--- a/website/_includes/navbar.html
+++ b/website/_includes/navbar.html
@@ -16,11 +16,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 -->
@@ -37,11 +37,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>
@@ -61,22 +61,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/1c528a19/website/_layouts/default.html
----------------------------------------------------------------------
diff --git a/website/_layouts/default.html b/website/_layouts/default.html
index e772945..eaa9b7d 100644
--- a/website/_layouts/default.html
+++ b/website/_layouts/default.html
@@ -2,7 +2,7 @@
<html lang="{{ page.lang | default: site.lang | default: " en " }}">
{% include head.html %}
-
+{% include analytics.html %}
<body>
{% include navbar.html %}
http://git-wip-us.apache.org/repos/asf/mahout/blob/1c528a19/website/developers/version-control.md
----------------------------------------------------------------------
diff --git a/website/developers/version-control.md b/website/developers/version-control.md
index bf2f187..6de7c3f 100644
--- a/website/developers/version-control.md
+++ b/website/developers/version-control.md
@@ -1,6 +1,6 @@
---
layout: page
-title: Version Control
+title: GSOC
---
@@ -24,14 +24,6 @@ The Git URL for anonymous users is [https://github.com/apache/mahout.git](https:
The Git URL for committers is [https://git-wip-us.apache.org/repos/asf/mahout.git](https://git-wip-us.apache.org/repos/asf/mahout.git).
-## Mahout Website
-The Mahout website resides in the [Apache SVN repository](https://svn.apache.org/viewvc/mahout/site).
-
-The SVN URL for the Mahout site is: [https://svn.apache.org/repos/asf/mahout/site](https://svn.apache.org/repos/asf/mahout/site).
-
-The Mahout website can be edited via the [ASF CMS Editor](http://www.apache.org/dev/cms.html) or by checking out the source locally from SVN. A handy tool for publising the website locally while editing is available [here](https://gist.github.com/tuxdna/11223434).
-
-
<a name="VersionControl-Issues"></a>
## Issues
http://git-wip-us.apache.org/repos/asf/mahout/blob/1c528a19/website/general/downloads.md
----------------------------------------------------------------------
diff --git a/website/general/downloads.md b/website/general/downloads.md
index 1813dab..e4c3d1f 100644
--- a/website/general/downloads.md
+++ b/website/general/downloads.md
@@ -1,5 +1,5 @@
---
-layout: default
+layout: page
title: Downloads
http://git-wip-us.apache.org/repos/asf/mahout/blob/1c528a19/website/general/mailing-lists,-irc-and-archives.md
----------------------------------------------------------------------
diff --git a/website/general/mailing-lists,-irc-and-archives.md b/website/general/mailing-lists,-irc-and-archives.md
deleted file mode 100644
index 8593b5c..0000000
--- a/website/general/mailing-lists,-irc-and-archives.md
+++ /dev/null
@@ -1,75 +0,0 @@
----
-layout: default
-title: Mailing Lists, IRC and Archives
-
-
----
-
-# General
-
-Communication at Mahout happens primarily online via mailing lists. We have
-a user as well as a dev list for discussion. In addition there is a commit
-list so we are able to monitor what happens on the wiki and in svn.
-
-<a name="MailingLists,IRCandArchives-Mailinglists"></a>
-# Mailing lists
-
-<a name="MailingLists,IRCandArchives-MahoutUserList"></a>
-## Mahout User List
-
-This list is for users of Mahout to ask questions, share knowledge, and
-discuss issues. Do send mail to this list with usage and configuration
-questions and problems. Also, please send questions to this list to verify
-your problem before filing issues in JIRA.
-
-* [Subscribe](mailto:user-***@mahout.apache.org)
-* [Unsubscribe](mailto:user-***@mahout.apache.org)
-
-<a name="MailingLists,IRCandArchives-MahoutDeveloperList"></a>
-## Mahout Developer List
-
-This is the list where participating developers of the Mahout project meet
-and discuss issues concerning Mahout internals, code changes/additions,
-etc. Do not send mail to this list with usage questions or configuration
-questions and problems.
-
-Discussion list:
-
-* [Subscribe](mailto:dev-***@mahout.apache.org)
- -- Do not send mail to this list with usage questions or configuration
-questions and problems.
-* [Unsubscribe](mailto:dev-***@mahout.apache.org)
-
-Commit notifications:
-
-* [Subscribe](mailto:commits-***@mahout.apache.org)
-* [Unsubscribe](mailto:commits-***@mahout.apache.org)
-
-<a name="MailingLists,IRCandArchives-IRC"></a>
-# IRC
-
-Mahout's IRC channel is **#mahout**. It is a logged channel. Please keep in
-mind that it is for discussion purposes only and that (pseudo)decisions
-should be brought back to the dev@ mailing list or JIRA and other people
-who are not on IRC should be given time to respond before any work is
-committed.
-
-<a name="MailingLists,IRCandArchives-Archives"></a>
-# Archives
-
-<a name="MailingLists,IRCandArchives-OfficialApacheArchive"></a>
-## Official Apache Archive
-
-* [http://mail-archives.apache.org/mod_mbox/mahout-dev/](http://mail-archives.apache.org/mod_mbox/mahout-dev/)
-* [http://mail-archives.apache.org/mod_mbox/mahout-user/](http://mail-archives.apache.org/mod_mbox/mahout-user/)
-
-<a name="MailingLists,IRCandArchives-ExternalArchives"></a>
-## External Archives
-
-* [MarkMail](http://mahout.markmail.org/)
-* [Gmane](http://dir.gmane.org/gmane.comp.apache.mahout.user)
-
-Please note the inclusion of a link to an archive does not imply an
-endorsement of that company by any of the committers of Mahout the Lucene
-PMC or the Apache Software Foundation. Each archive owner is solely
-responsible for the contents and availability of their archive.
http://git-wip-us.apache.org/repos/asf/mahout/blob/1c528a19/website/general/mailing-lists.md
----------------------------------------------------------------------
diff --git a/website/general/mailing-lists.md b/website/general/mailing-lists.md
new file mode 100644
index 0000000..8593b5c
--- /dev/null
+++ b/website/general/mailing-lists.md
@@ -0,0 +1,75 @@
+---
+layout: default
+title: Mailing Lists, IRC and Archives
+
+
+---
+
+# General
+
+Communication at Mahout happens primarily online via mailing lists. We have
+a user as well as a dev list for discussion. In addition there is a commit
+list so we are able to monitor what happens on the wiki and in svn.
+
+<a name="MailingLists,IRCandArchives-Mailinglists"></a>
+# Mailing lists
+
+<a name="MailingLists,IRCandArchives-MahoutUserList"></a>
+## Mahout User List
+
+This list is for users of Mahout to ask questions, share knowledge, and
+discuss issues. Do send mail to this list with usage and configuration
+questions and problems. Also, please send questions to this list to verify
+your problem before filing issues in JIRA.
+
+* [Subscribe](mailto:user-***@mahout.apache.org)
+* [Unsubscribe](mailto:user-***@mahout.apache.org)
+
+<a name="MailingLists,IRCandArchives-MahoutDeveloperList"></a>
+## Mahout Developer List
+
+This is the list where participating developers of the Mahout project meet
+and discuss issues concerning Mahout internals, code changes/additions,
+etc. Do not send mail to this list with usage questions or configuration
+questions and problems.
+
+Discussion list:
+
+* [Subscribe](mailto:dev-***@mahout.apache.org)
+ -- Do not send mail to this list with usage questions or configuration
+questions and problems.
+* [Unsubscribe](mailto:dev-***@mahout.apache.org)
+
+Commit notifications:
+
+* [Subscribe](mailto:commits-***@mahout.apache.org)
+* [Unsubscribe](mailto:commits-***@mahout.apache.org)
+
+<a name="MailingLists,IRCandArchives-IRC"></a>
+# IRC
+
+Mahout's IRC channel is **#mahout**. It is a logged channel. Please keep in
+mind that it is for discussion purposes only and that (pseudo)decisions
+should be brought back to the dev@ mailing list or JIRA and other people
+who are not on IRC should be given time to respond before any work is
+committed.
+
+<a name="MailingLists,IRCandArchives-Archives"></a>
+# Archives
+
+<a name="MailingLists,IRCandArchives-OfficialApacheArchive"></a>
+## Official Apache Archive
+
+* [http://mail-archives.apache.org/mod_mbox/mahout-dev/](http://mail-archives.apache.org/mod_mbox/mahout-dev/)
+* [http://mail-archives.apache.org/mod_mbox/mahout-user/](http://mail-archives.apache.org/mod_mbox/mahout-user/)
+
+<a name="MailingLists,IRCandArchives-ExternalArchives"></a>
+## External Archives
+
+* [MarkMail](http://mahout.markmail.org/)
+* [Gmane](http://dir.gmane.org/gmane.comp.apache.mahout.user)
+
+Please note the inclusion of a link to an archive does not imply an
+endorsement of that company by any of the committers of Mahout the Lucene
+PMC or the Apache Software Foundation. Each archive owner is solely
+responsible for the contents and availability of their archive.
http://git-wip-us.apache.org/repos/asf/mahout/blob/1c528a19/website/general/privacy-policy.md
----------------------------------------------------------------------
diff --git a/website/general/privacy-policy.md b/website/general/privacy-policy.md
index 51976f3..f6738e7 100644
--- a/website/general/privacy-policy.md
+++ b/website/general/privacy-policy.md
@@ -1,8 +1,9 @@
---
-layout: default
+layout: page
title: Privacy Policy
-
+
+
---
Information about your use of this website is collected using server access
logs and a tracking cookie. The collected information consists of the
http://git-wip-us.apache.org/repos/asf/mahout/blob/1c528a19/website/general/who-we-are.md
----------------------------------------------------------------------
diff --git a/website/general/who-we-are.md b/website/general/who-we-are.md
index 21a91db..b35bd90 100644
--- a/website/general/who-we-are.md
+++ b/website/general/who-we-are.md
@@ -1,6 +1,6 @@
---
-layout: default
-title: Who We Are
+layout: page
+title: Who Are We?
---
@@ -15,32 +15,32 @@ Apache Mahout is maintained by a team of volunteer developers.
(Please keep the list below in alphabetical order by first name.)
-Name | Mail | PMC | Comment
-----|---------|------|------|----------
-Anand Avati | ***@... | No | Twitter: @anandavati
-Andrew Musselman | ***@... | Yes | Twitter: @akm
-Andrew Palumbo | ***@... | Yes (Chair) | |
-Benson Margulies | ***@... | Yes | |
-Dan Filimon | ***@... | No | |
-Dmitriy Lyubimov | ***@... | No (Emeritus) |
-Drew Farris | ***@... | Yes | |
-Ellen Friedman | ***@... | No | Twitter: @Ellen_Friedman
-Frank Scholten | ***@... | No | |
-Gokhan Capan | ***@... | No | <a href="http://www.linkedin.com/in/gokhancapan">LinkedIn Profile</a>
-Grant Ingersoll | ***@... | Yes | Twitter: @gsingers
-Isabel Drost-Fromm | ***@... | Yes | 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
-Jacob Alexander Mannix | ***@... | Yes | |
-Jeff Eastman | ***@... | No (Emeritus) |
-Paritosh Ranjan | ***@... | Yes | Twitter: @paritoshranjan
-Pat Ferrel | ***@... | Yes | Twitter: @occam
-Robin Anil | ***@... | Yes | |
-Sean Owen | ***@... | No (Emeritus) |
-Sebastian Schelter | ***@... | Yes | |
-Shannon Quinn | ***@... | No | |
-Stevo Slavić| ***@... | No | Twitter: @sslavic
-Suneel Marthi | ***@... | Yes | Twitter: @suneelmarthi
-Ted Dunning | ***@... | Yes |
-Tom Pierce | ***@... | No | |
+Name | Mail | PMC | Comment
+------------------------|------------------:|------:|---:|
+Anand Avati | ***@... | No | Twitter: @anandavati
+Andrew Musselman | ***@... | Yes | Twitter: @akm
+Benson Margulies | ***@... | Yes | PMC Chair
+Dan Filimon | ***@... | No | |
+Dmitriy Lyubimov | ***@... | No | (Emeritus PMC)
+Drew Farris | ***@... | Yes | |
+Ellen Friedman | ***@... | No | Twitter: @Ellen_Friedman
+Frank Scholten | ***@... | No | |
+Gokhan Capan | ***@... | No | <a href="http://www.linkedin.com/in/gokhancapan">LinkedIn Profile</a>
+Grant Ingersoll | ***@... | Yes | Twitter: @gsingers
+Isabel Drost-Fromm | ***@... | Yes | <!--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-->
+Jacob Alexander Mannix | ***@... | Yes |
+Jeff Eastman | ***@... | No | (Emeritus PMC)
+Paritosh Ranjan | ***@... | Yes | Twitter: @paritoshranjan
+Pat Ferrel | ***@... | Yes | Twitter: @occam
+Robin Anil | ***@... | Yes |
+Sean Owen | ***@... | No | (Emeritus PMC)
+Sebastian Schelter | ***@... | Yes |
+Shannon Quinn | ***@... | No |
+Stevo Slavić | ***@... | No | Twitter: @sslavic
+Suneel Marthi | ***@... | Yes | Twitter: @suneelmarthi
+Ted Dunning | ***@... | Yes |
+Tom Pierce | ***@... | No |
+Trevor Grant | ***@... | Yes | Twitter: @rawkintrevo
<a name="WhoWeAre-EmeritusCommitters"></a>
## Emeritus Committers
http://git-wip-us.apache.org/repos/asf/mahout/blob/1c528a19/website/index.md
----------------------------------------------------------------------
diff --git a/website/index.md b/website/index.md
index ba116b3..9102024 100644
--- a/website/index.md
+++ b/website/index.md
@@ -2,13 +2,15 @@
layout: home
---
-<h2 class="section-heading">Recent News</h2>
-{% for post in site.posts limit: 5 %}
- {% include posts/post-preview.html %}
-{% endfor %}
+
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>
- Mathematically Expressive Scala DSL
- Support for Multiple Distributed Backends (including Apache Spark)
- Modular Native Solvers for CPU/GPU/CUDA Acceleration
+
+<h2 class="section-heading">Recent News</h2>
+{% for post in posts limit: 5 %}
+ {% include posts/post-preview.html %}
+{% endfor %}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/mahout/blob/1c528a19/website/posts/new-website.md
----------------------------------------------------------------------
diff --git a/website/posts/new-website.md b/website/posts/new-website.md
new file mode 100644
index 0000000..3757f93
--- /dev/null
+++ b/website/posts/new-website.md
@@ -0,0 +1,15 @@
+---
+layout: page
+title: New Website
+
+
+
+---
+
+
+# New Website Released
+
+We've launced a new website, designed by David Miller from [StartBootstrap](http://startbootstrap.com).
+
+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 ***@mahout.apache.org or [open a PR](/developers/githubPRs)
\ No newline at end of file