Merge branch 'pr/8' into develop
diff --git a/README.md b/README.md
index 0524678..e49bc09 100644
--- a/README.md
+++ b/README.md
@@ -58,3 +58,7 @@
edit `site/_data/contributors.yml`.
The [project members]([http://localhost:4000/community.html#project-members])
list will re-generate.
+
+## Contribute to Website
+
+To help on this repository, please submit Pull Request to `develop` branch first!
diff --git a/content/assets/architecture/architectural-tactics.png b/content/assets/architecture/architectural-tactics.png
new file mode 100644
index 0000000..5fea2c0
--- /dev/null
+++ b/content/assets/architecture/architectural-tactics.png
Binary files differ
diff --git a/content/assets/architecture/cluster-admin.png b/content/assets/architecture/cluster-admin.png
new file mode 100644
index 0000000..ea11b0e
--- /dev/null
+++ b/content/assets/architecture/cluster-admin.png
Binary files differ
diff --git a/content/assets/architecture/concept-map.png b/content/assets/architecture/concept-map.png
new file mode 100644
index 0000000..7ed1955
--- /dev/null
+++ b/content/assets/architecture/concept-map.png
Binary files differ
diff --git a/content/assets/architecture/context-diagram.png b/content/assets/architecture/context-diagram.png
new file mode 100644
index 0000000..f0ba0a8
--- /dev/null
+++ b/content/assets/architecture/context-diagram.png
Binary files differ
diff --git a/content/assets/architecture/dasfe.png b/content/assets/architecture/dasfe.png
new file mode 100644
index 0000000..ff791fa
--- /dev/null
+++ b/content/assets/architecture/dasfe.png
Binary files differ
diff --git a/content/assets/architecture/deployment-diagram.png b/content/assets/architecture/deployment-diagram.png
new file mode 100644
index 0000000..cbc459c
--- /dev/null
+++ b/content/assets/architecture/deployment-diagram.png
Binary files differ
diff --git a/content/assets/architecture/execution-flow.png b/content/assets/architecture/execution-flow.png
new file mode 100644
index 0000000..bf479bc
--- /dev/null
+++ b/content/assets/architecture/execution-flow.png
Binary files differ
diff --git a/content/assets/architecture/executor-engine.png b/content/assets/architecture/executor-engine.png
new file mode 100644
index 0000000..f133741
--- /dev/null
+++ b/content/assets/architecture/executor-engine.png
Binary files differ
diff --git a/content/assets/architecture/quality-attributes.png b/content/assets/architecture/quality-attributes.png
new file mode 100644
index 0000000..8a34cc7
--- /dev/null
+++ b/content/assets/architecture/quality-attributes.png
Binary files differ
diff --git a/content/index.html b/content/index.html
index 063723b..0530aeb 100644
--- a/content/index.html
+++ b/content/index.html
@@ -97,6 +97,7 @@
<thead>
<tr>
<th>Branch</th>
+ <th> </th>
<th>Status</th>
<th>CodeCov</th>
</tr>
@@ -104,11 +105,13 @@
<tbody>
<tr>
<td><a href="https://github.com/apache/incubator-marvin">master</a></td>
+ <td> </td>
<td><a href="https://travis-ci.org/apache/incubator-marvin"><img src="https://travis-ci.org/apache/incubator-marvin.svg?branch=master" alt="Build Status" /></a></td>
<td><a href="https://codecov.io/gh/apache/incubator-marvin"><img src="https://codecov.io/gh/apache/incubator-marvin/branch/master/graph/badge.svg" alt="Codecov" /></a></td>
</tr>
<tr>
<td><a href="https://github.com/apache/incubator-marvin/tree/develop">develop</a></td>
+ <td> </td>
<td><a href="https://travis-ci.org/apache/incubator-marvin/branches"><img src="https://travis-ci.org/apache/incubator-marvin.svg?branch=develop" alt="Build Status" /></a></td>
<td><a href="https://codecov.io/gh/apache/incubator-marvin/branch/develop"><img src="https://codecov.io/gh/apache/incubator-marvin/branch/develop/graph/badge.svg" alt="Build Status" /></a></td>
</tr>
@@ -142,6 +145,17 @@
<li>Please check our <a href="/marvin-platform-book/SUMMARY">Platform Book</a>!</li>
</ul>
+<h2 id="code">Code</h2>
+
+<ul>
+ <li>
+ <p><a href="https://github.com/apache/incubator-marvin">Apache Marvin-AI</a>!</p>
+ </li>
+ <li>
+ <p><a href="https://github.com/apache/incubator-marvin-website">Apache Marvin-AI Website</a>!</p>
+ </li>
+</ul>
+
</div>
</div>
diff --git a/content/marvin-platform-book/README/index.html b/content/marvin-platform-book/README/index.html
index 156e50f..3f54e33 100644
--- a/content/marvin-platform-book/README/index.html
+++ b/content/marvin-platform-book/README/index.html
@@ -86,6 +86,8 @@
<p><img src="/assets/themes/apache/img/logo.png" alt="" /></p>
+<p>More design information in <a href="/marvin-platform-book/ch6_platform_architecture/overview">Architecture</a>!</p>
+
<hr />
<p><a href="/marvin-platform-book/SUMMARY">BACK TO SUMMARY</a></p>
diff --git a/content/marvin-platform-book/SUMMARY/index.html b/content/marvin-platform-book/SUMMARY/index.html
index e7bd5c0..d987131 100644
--- a/content/marvin-platform-book/SUMMARY/index.html
+++ b/content/marvin-platform-book/SUMMARY/index.html
@@ -142,6 +142,7 @@
<li><a href="/marvin-platform-book/ch7_community/community#github">Github</a></li>
<li><a href="/marvin-platform-book/ch7_community/community#roadmap">Roadmap</a></li>
<li><a href="/marvin-platform-book/ch7_community/community#how-to-contribute">How to Contribute</a></li>
+ <li><a href="/marvin-platform-book/ch7_community/committer">Committer Notes</a></li>
</ul>
</li>
<li><a href="/marvin-platform-book/ch8_versions/overview">Versions</a></li>
diff --git a/content/marvin-platform-book/ch1_main_components/dasfe/index.html b/content/marvin-platform-book/ch1_main_components/dasfe/index.html
index d1a1481..dcf9d64 100644
--- a/content/marvin-platform-book/ch1_main_components/dasfe/index.html
+++ b/content/marvin-platform-book/ch1_main_components/dasfe/index.html
@@ -89,7 +89,7 @@
<p>The DASFE design pattern stands for Data Acquisition, Selection, Feedback and Evaluation.
In Marvin, the DASFE pattern is represented by the image below. Each box, which we call an Action, holds code written by the user.</p>
-<p><img src="https://raw.githubusercontent.com/marvin-ai/marvin-paper/master/from-exploratory-models-to-productions/fig/marvin-dase.png" alt="" /></p>
+<p><img src="/assets/architecture/dasfe.png" alt="" /></p>
<hr />
diff --git a/content/marvin-platform-book/ch1_main_components/overview/index.html b/content/marvin-platform-book/ch1_main_components/overview/index.html
index 0690e3d..e1f1fab 100644
--- a/content/marvin-platform-book/ch1_main_components/overview/index.html
+++ b/content/marvin-platform-book/ch1_main_components/overview/index.html
@@ -80,7 +80,7 @@
-->
-<h1 id="general-overview">General Overview</h1>
+<h1 id="design-overview">Design Overview</h1>
<p>Here we will explain the design pattern for MARVIN AI</p>
diff --git a/content/marvin-platform-book/ch2_toolbox_installation/overview/index.html b/content/marvin-platform-book/ch2_toolbox_installation/overview/index.html
index 6c3a5e0..4b21a15 100644
--- a/content/marvin-platform-book/ch2_toolbox_installation/overview/index.html
+++ b/content/marvin-platform-book/ch2_toolbox_installation/overview/index.html
@@ -80,7 +80,7 @@
-->
-<h1 id="general-overview">General Overview</h1>
+<h1 id="installation-overview">Installation Overview</h1>
<p>Toolbox can be installed directly in Ubuntu(Debian) Distribution and MacOS, for other operating systems there is installation through Vagrant or Docker.</p>
diff --git a/content/marvin-platform-book/ch3_get_started/overview/index.html b/content/marvin-platform-book/ch3_get_started/overview/index.html
index 3440eac..5801dda 100644
--- a/content/marvin-platform-book/ch3_get_started/overview/index.html
+++ b/content/marvin-platform-book/ch3_get_started/overview/index.html
@@ -80,7 +80,7 @@
-->
-<h1 id="general-overview">General Overview</h1>
+<h1 id="starter-overview">Starter Overview</h1>
<p>In this chapter we have some exemples of how to create and work with an engine.</p>
<ul>
diff --git a/content/marvin-platform-book/ch4_documentation/overview/index.html b/content/marvin-platform-book/ch4_documentation/overview/index.html
index 4f3f78c..9699962 100644
--- a/content/marvin-platform-book/ch4_documentation/overview/index.html
+++ b/content/marvin-platform-book/ch4_documentation/overview/index.html
@@ -5,7 +5,7 @@
<head>
<meta charset="utf-8">
<title>Interface</title>
- <meta name="description" content="Project Community Page">
+ <meta name="description" content="CLI, API, Config Description Page">
<meta name="author" content="">
<!-- Enable responsive viewport -->
@@ -80,7 +80,7 @@
-->
-<h1 id="general-overview">General Overview</h1>
+<h1 id="interface-overview">Interface Overview</h1>
<p>In this chapter we dive into the interface design detail of each component.</p>
<ul>
diff --git a/content/marvin-platform-book/ch6_platform_architecture/overview/index.html b/content/marvin-platform-book/ch6_platform_architecture/overview/index.html
index 1951388..16290b1 100644
--- a/content/marvin-platform-book/ch6_platform_architecture/overview/index.html
+++ b/content/marvin-platform-book/ch6_platform_architecture/overview/index.html
@@ -5,7 +5,7 @@
<head>
<meta charset="utf-8">
<title>Architecture</title>
- <meta name="description" content="Project Community Page">
+ <meta name="description" content="Architecture">
<meta name="author" content="">
<!-- Enable responsive viewport -->
@@ -80,9 +80,69 @@
-->
-<h1 id="general-overview">General Overview</h1>
+<h1 id="architecture">Architecture</h1>
-<p>Here we will explain the design pattern for MARVIN AI</p>
+<h2 id="design-goal">Design Goal</h2>
+
+<ol>
+ <li>Language Agnostic capabilities: The platform must be able to support R, Python and Scala algorithms</li>
+ <li>Parallelism capacities in many different levels (Eg. GPU, Multi-core and Multi-node)</li>
+ <li>Deploy distributed machine learning models that are able to receive high concurrent traffic and provide response in near real-time</li>
+</ol>
+
+<h2 id="platform-concept-map-high-level-integration">Platform Concept Map (High Level Integration)</h2>
+
+<p><img src="/assets/architecture/concept-map.png" alt="concept map" /></p>
+
+<hr />
+
+<h2 id="quality-attributes">Quality Attributes</h2>
+
+<p><img src="/assets/architecture/quality-attributes.png" alt="quality attributes" /></p>
+
+<hr />
+
+<h2 id="architectural-tactics">Architectural Tactics</h2>
+
+<p><img src="/assets/architecture/architectural-tactics.png" alt="architectural tactics" /></p>
+
+<hr />
+
+<h2 id="dasfe">DASFE</h2>
+
+<p><img src="/assets/architecture/dasfe.png" alt="dasfe" /></p>
+
+<p>More Detail in <a href="/marvin-platform-book/ch1_main_components/dasfe">DASFE</a></p>
+
+<hr />
+
+<h2 id="context-diagram">Context Diagram</h2>
+
+<p><img src="/assets/architecture/context-diagram.png" alt="context diagram" /></p>
+
+<hr />
+
+<h2 id="execution-flow">Execution Flow</h2>
+
+<p><img src="/assets/architecture/execution-flow.png" alt="execution flow" /></p>
+
+<hr />
+
+<h2 id="executor-and-engine">Executor and Engine</h2>
+
+<p><img src="/assets/architecture/executor-engine.png" alt="executor engine" /></p>
+
+<hr />
+
+<h2 id="cluster-admin">Cluster Admin</h2>
+
+<p><img src="/assets/architecture/cluster-admin.png" alt="cluster admin" /></p>
+
+<hr />
+
+<h2 id="deployment-diagram">Deployment Diagram</h2>
+
+<p><img src="/assets/architecture/deployment-diagram.png" alt="deployment diagram" /></p>
<hr />
diff --git a/content/marvin-platform-book/ch7_community/committer/index.html b/content/marvin-platform-book/ch7_community/committer/index.html
new file mode 100644
index 0000000..9b21a5c
--- /dev/null
+++ b/content/marvin-platform-book/ch7_community/committer/index.html
@@ -0,0 +1,164 @@
+
+
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <meta charset="utf-8">
+ <title>Community</title>
+ <meta name="description" content="Project Community Page">
+ <meta name="author" content="">
+
+ <!-- Enable responsive viewport -->
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <!-- Le styles -->
+ <link href="/assets/themes/apache/bootstrap/css/bootstrap.css" rel="stylesheet">
+ <link href="/assets/themes/apache/css/style.css?body=1" rel="stylesheet" type="text/css">
+ <link href="/assets/themes/apache/css/syntax.css" rel="stylesheet" type="text/css" media="screen" />
+ <!-- Le fav and touch icons -->
+ <link rel="shortcut icon" href="/assets/themes/apache/img/icon.png">
+ <!-- Update these with your own images
+ <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">
+ -->
+
+ </head>
+
+ <body>
+
+
+ <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/apache/img/logo_white.png" width="80">
+ </a>
+ </div>
+ <nav class="navbar-collapse collapse" role="navigation">
+ <ul class="nav navbar-nav navbar-right">
+ <li id="community">
+ <a href="#" data-toggle="dropdown" class="dropdown-toggle">Community<b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="/community">Get Involved</a></li>
+ <li><a href="/community-members">Who we are</a></li>
+ </ul>
+ </li>
+ <li><a href="/news">News</a></li>
+ <li><a href="/marvin-platform-book/SUMMARY">Document</a></li>
+ <li><a href="https://github.com/apache/incubator-marvin">GitHub</a></li>
+ <li id="apache">
+ <a href="#" data-toggle="dropdown" class="dropdown-toggle">Apache<b class="caret"></b></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>
+ </nav>
+ </div>
+ </div>
+
+
+
+
+ <div class="container">
+
+
+
+<div class="row">
+ <div class="col-md-12">
+ <!--
+
+-->
+
+<h1 id="committer-notes">Committer Notes</h1>
+
+<h2 id="how-to-merge-pull-requests">How To Merge Pull Requests</h2>
+
+<p>ref: https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=65865114</p>
+
+<p>The following example is merging Pull-Request-9 to develop branch.</p>
+
+<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c"># Project Setup from Gitbox</span>
+git clone https://gitbox.apache.org/repos/asf/incubator-marvin.git
+<span class="nb">cd </span>incubator-marvin
+git remote add mirror https://github.com/apache/incubator-marvin.git
+
+<span class="c"># Update Branch</span>
+git checkout develop
+git pull origin develop
+
+<span class="c"># Merge Pull Request to Gitbox</span>
+git fetch mirror pull/9/head:pr-9
+git merge pr-9
+git push origin develop
+git branch <span class="nt">-d</span> pr-9
+</code></pre></div></div>
+
+<hr />
+
+<ul>
+ <li><a href="/marvin-platform-book/ch7_community/overview">Community</a></li>
+</ul>
+
+ </div>
+</div>
+
+
+ <hr>
+ <footer>
+ <footer class="site-footer">
+ <div class="wrapper">
+ <div class="footer-col-wrapper">
+
+ Apache Marvin-AI is an effort undergoing <a href="https://incubator.apache.org/index.html">Incubation</a>
+ at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly
+ accepted projects until a further review indicates that the infrastructure, communications, and decision
+ making process have stabilized in a manner consistent with other successful ASF projects. While incubation
+ status is not necessarily a reflection of the completeness or stability of the code, it does indicate that
+ the project has yet to be fully endorsed by the ASF.
+ <hr>
+
+ <div style="text-align:center;">
+
+ <div style="margin-top: 20px; margin-bottom: 20px;">
+ <a href="http://incubator.apache.org"><img src="/assets/themes/apache/img/egg-logo.png"
+ alt="Apache Incubator"/></a>
+ </div>
+
+ <div>
+ Copyright © 2016 <a href="http://www.apache.org">The Apache Software Foundation</a>.
+ Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version
+ 2.0</a>.
+ <br>
+
+ Apache, the Apache Feather logo, and the Apache Incubator project logo are trademarks of The Apache
+ Software Foundation.
+
+ </div>
+ </div>
+ </div>
+ </div>
+</footer>
+
+ </footer>
+ </div>
+
+
+ <script src="/assets/themes/apache/jquery/jquery-2.1.1.min.js"></script>
+
+ <script src="/assets/themes/apache/bootstrap/js/bootstrap.min.js"></script>
+
+
+ </body>
+</html>
+
diff --git a/content/marvin-platform-book/ch7_community/overview/index.html b/content/marvin-platform-book/ch7_community/overview/index.html
index 92cec3a..be4abcc 100644
--- a/content/marvin-platform-book/ch7_community/overview/index.html
+++ b/content/marvin-platform-book/ch7_community/overview/index.html
@@ -80,7 +80,7 @@
-->
-<h1 id="general-overview">General Overview</h1>
+<h1 id="community-overview">Community Overview</h1>
<ul>
<li><a href="/marvin-platform-book/ch7_community/community#github">Github</a></li>
@@ -88,6 +88,12 @@
<li><a href="/marvin-platform-book/ch7_community/community#how-to-contribute">How to Contribute</a></li>
</ul>
+<h2 id="committer-notes">Committer Notes</h2>
+
+<ul>
+ <li><a href="/marvin-platform-book/ch7_community/committer#how-to-merge-pull-requests">How To Merge Pull Requests</a></li>
+</ul>
+
<hr />
<p><a href="/marvin-platform-book/SUMMARY">BACK TO SUMMARY</a></p>
diff --git a/content/marvin-platform-book/ch8_versions/overview/index.html b/content/marvin-platform-book/ch8_versions/overview/index.html
index 2c402d4..b82cf6e 100644
--- a/content/marvin-platform-book/ch8_versions/overview/index.html
+++ b/content/marvin-platform-book/ch8_versions/overview/index.html
@@ -80,7 +80,7 @@
-->
-<h1 id="general-overview">General Overview</h1>
+<h1 id="version-overview">Version Overview</h1>
<p>Here we will explain the design pattern for MARVIN AI</p>
diff --git a/content/news/index.html b/content/news/index.html
index 25c6448..e688170 100644
--- a/content/news/index.html
+++ b/content/news/index.html
@@ -87,11 +87,11 @@
<th><b>Title</b></th><th><b>Date</b></th>
<tr>
- <td><a href="http://localhost:4000/news/2019/01/05/Marvin-AI-website-initialization/">Marvin Ai Website Initialization</a></td>
+ <td><a href="https://marvin.apache.org/news/2019/01/05/Marvin-AI-website-initialization/">Marvin Ai Website Initialization</a></td>
<td>2019-01-05</td>
<tr>
- <td><a href="http://localhost:4000/news/2018/08/27/Marvin-AI-in-ASF-incubator/">Marvin Ai In Asf Incubator</a></td>
+ <td><a href="https://marvin.apache.org/news/2018/08/27/Marvin-AI-in-ASF-incubator/">Marvin Ai In Asf Incubator</a></td>
<td>2018-08-27</td>
</tr></tr></tr></table>
diff --git a/site/assets/architecture/architectural-tactics.png b/site/assets/architecture/architectural-tactics.png
new file mode 100644
index 0000000..5fea2c0
--- /dev/null
+++ b/site/assets/architecture/architectural-tactics.png
Binary files differ
diff --git a/site/assets/architecture/cluster-admin.png b/site/assets/architecture/cluster-admin.png
new file mode 100644
index 0000000..ea11b0e
--- /dev/null
+++ b/site/assets/architecture/cluster-admin.png
Binary files differ
diff --git a/site/assets/architecture/concept-map.png b/site/assets/architecture/concept-map.png
new file mode 100644
index 0000000..7ed1955
--- /dev/null
+++ b/site/assets/architecture/concept-map.png
Binary files differ
diff --git a/site/assets/architecture/context-diagram.png b/site/assets/architecture/context-diagram.png
new file mode 100644
index 0000000..f0ba0a8
--- /dev/null
+++ b/site/assets/architecture/context-diagram.png
Binary files differ
diff --git a/site/assets/architecture/dasfe.png b/site/assets/architecture/dasfe.png
new file mode 100644
index 0000000..ff791fa
--- /dev/null
+++ b/site/assets/architecture/dasfe.png
Binary files differ
diff --git a/site/assets/architecture/deployment-diagram.png b/site/assets/architecture/deployment-diagram.png
new file mode 100644
index 0000000..cbc459c
--- /dev/null
+++ b/site/assets/architecture/deployment-diagram.png
Binary files differ
diff --git a/site/assets/architecture/execution-flow.png b/site/assets/architecture/execution-flow.png
new file mode 100644
index 0000000..bf479bc
--- /dev/null
+++ b/site/assets/architecture/execution-flow.png
Binary files differ
diff --git a/site/assets/architecture/executor-engine.png b/site/assets/architecture/executor-engine.png
new file mode 100644
index 0000000..f133741
--- /dev/null
+++ b/site/assets/architecture/executor-engine.png
Binary files differ
diff --git a/site/assets/architecture/quality-attributes.png b/site/assets/architecture/quality-attributes.png
new file mode 100644
index 0000000..8a34cc7
--- /dev/null
+++ b/site/assets/architecture/quality-attributes.png
Binary files differ
diff --git a/site/index.md b/site/index.md
index 0afd502..c7d71b9 100644
--- a/site/index.md
+++ b/site/index.md
@@ -26,10 +26,10 @@
-Branch | Status | CodeCov
-- | - | -
-[master](https://github.com/apache/incubator-marvin) | [](https://travis-ci.org/apache/incubator-marvin) | [](https://codecov.io/gh/apache/incubator-marvin)
-[develop](https://github.com/apache/incubator-marvin/tree/develop) | [](https://travis-ci.org/apache/incubator-marvin/branches) | [](https://codecov.io/gh/apache/incubator-marvin/branch/develop)
+Branch | | Status | CodeCov
+- | - | - | -
+[master](https://github.com/apache/incubator-marvin) | | [](https://travis-ci.org/apache/incubator-marvin) | [](https://codecov.io/gh/apache/incubator-marvin)
+[develop](https://github.com/apache/incubator-marvin/tree/develop) | | [](https://travis-ci.org/apache/incubator-marvin/branches) | [](https://codecov.io/gh/apache/incubator-marvin/branch/develop)
----
@@ -47,4 +47,10 @@
## Documentation
- - Please check our [Platform Book](/marvin-platform-book/SUMMARY)!
\ No newline at end of file
+ - Please check our [Platform Book](/marvin-platform-book/SUMMARY)!
+
+## Code
+
+ - [Apache Marvin-AI](https://github.com/apache/incubator-marvin)!
+
+ - [Apache Marvin-AI Website](https://github.com/apache/incubator-marvin-website)!
diff --git a/site/marvin-platform-book/README.md b/site/marvin-platform-book/README.md
index 58d91d9..15cb6d1 100644
--- a/site/marvin-platform-book/README.md
+++ b/site/marvin-platform-book/README.md
@@ -31,6 +31,8 @@
+More design information in [Architecture](/marvin-platform-book/ch6_platform_architecture/overview)!
+
----
[BACK TO SUMMARY](/marvin-platform-book/SUMMARY)
\ No newline at end of file
diff --git a/site/marvin-platform-book/SUMMARY.md b/site/marvin-platform-book/SUMMARY.md
index 4a5a2d1..a6c62d3 100644
--- a/site/marvin-platform-book/SUMMARY.md
+++ b/site/marvin-platform-book/SUMMARY.md
@@ -67,4 +67,5 @@
* [Github](/marvin-platform-book/ch7_community/community#github)
* [Roadmap](/marvin-platform-book/ch7_community/community#roadmap)
* [How to Contribute](/marvin-platform-book/ch7_community/community#how-to-contribute)
+ * [Committer Notes](/marvin-platform-book/ch7_community/committer)
* [Versions](/marvin-platform-book/ch8_versions/overview)
diff --git a/site/marvin-platform-book/ch1_main_components/dasfe.md b/site/marvin-platform-book/ch1_main_components/dasfe.md
index d4688b9..852777d 100644
--- a/site/marvin-platform-book/ch1_main_components/dasfe.md
+++ b/site/marvin-platform-book/ch1_main_components/dasfe.md
@@ -34,7 +34,7 @@
The DASFE design pattern stands for Data Acquisition, Selection, Feedback and Evaluation.
In Marvin, the DASFE pattern is represented by the image below. Each box, which we call an Action, holds code written by the user.
-
+
----
diff --git a/site/marvin-platform-book/ch1_main_components/overview.md b/site/marvin-platform-book/ch1_main_components/overview.md
index 5643389..d436618 100644
--- a/site/marvin-platform-book/ch1_main_components/overview.md
+++ b/site/marvin-platform-book/ch1_main_components/overview.md
@@ -25,7 +25,7 @@
{% include JB/setup %}
-# General Overview
+# Design Overview
Here we will explain the design pattern for MARVIN AI
@@ -38,4 +38,4 @@
----
-[BACK TO SUMMARY](/marvin-platform-book/SUMMARY)
\ No newline at end of file
+[BACK TO SUMMARY](/marvin-platform-book/SUMMARY)
diff --git a/site/marvin-platform-book/ch2_toolbox_installation/overview.md b/site/marvin-platform-book/ch2_toolbox_installation/overview.md
index 50aff98..9dd436b 100644
--- a/site/marvin-platform-book/ch2_toolbox_installation/overview.md
+++ b/site/marvin-platform-book/ch2_toolbox_installation/overview.md
@@ -25,7 +25,7 @@
{% include JB/setup %}
-# General Overview
+# Installation Overview
Toolbox can be installed directly in Ubuntu(Debian) Distribution and MacOS, for other operating systems there is installation through Vagrant or Docker.
@@ -36,4 +36,4 @@
----
-[BACK TO SUMMARY](/marvin-platform-book/SUMMARY)
\ No newline at end of file
+[BACK TO SUMMARY](/marvin-platform-book/SUMMARY)
diff --git a/site/marvin-platform-book/ch3_get_started/overview.md b/site/marvin-platform-book/ch3_get_started/overview.md
index 4ab449c..67d6449 100644
--- a/site/marvin-platform-book/ch3_get_started/overview.md
+++ b/site/marvin-platform-book/ch3_get_started/overview.md
@@ -25,7 +25,7 @@
{% include JB/setup %}
-# General Overview
+# Starter Overview
In this chapter we have some exemples of how to create and work with an engine.
* [Creating a New Engine](/marvin-platform-book/ch3_get_started/create_engine)
@@ -34,4 +34,4 @@
----
-[BACK TO SUMMARY](/marvin-platform-book/SUMMARY)
\ No newline at end of file
+[BACK TO SUMMARY](/marvin-platform-book/SUMMARY)
diff --git a/site/marvin-platform-book/ch4_documentation/overview.md b/site/marvin-platform-book/ch4_documentation/overview.md
index 35d073c..d471af7 100644
--- a/site/marvin-platform-book/ch4_documentation/overview.md
+++ b/site/marvin-platform-book/ch4_documentation/overview.md
@@ -1,7 +1,7 @@
---
layout: page
title: Interface
-description: Project Community Page
+description: CLI, API, Config Description Page
group: nav-right
---
<!--
@@ -25,7 +25,7 @@
{% include JB/setup %}
-# General Overview
+# Interface Overview
In this chapter we dive into the interface design detail of each component.
* [Toolbox CLI](/marvin-platform-book/ch4_documentation/toolbox_cli)
@@ -36,4 +36,4 @@
----
-[BACK TO SUMMARY](/marvin-platform-book/SUMMARY)
\ No newline at end of file
+[BACK TO SUMMARY](/marvin-platform-book/SUMMARY)
diff --git a/site/marvin-platform-book/ch5_deploying/overview.md b/site/marvin-platform-book/ch5_deploying/overview.md
index 531184a..d3d5b90 100644
--- a/site/marvin-platform-book/ch5_deploying/overview.md
+++ b/site/marvin-platform-book/ch5_deploying/overview.md
@@ -33,4 +33,4 @@
----
-[BACK TO SUMMARY](/marvin-platform-book/SUMMARY)
\ No newline at end of file
+[BACK TO SUMMARY](/marvin-platform-book/SUMMARY)
diff --git a/site/marvin-platform-book/ch6_platform_architecture/overview.md b/site/marvin-platform-book/ch6_platform_architecture/overview.md
index 1c290b4..d89a43c 100644
--- a/site/marvin-platform-book/ch6_platform_architecture/overview.md
+++ b/site/marvin-platform-book/ch6_platform_architecture/overview.md
@@ -1,7 +1,7 @@
---
layout: page
title: Architecture
-description: Project Community Page
+description: Architecture
group: nav-right
---
<!--
@@ -25,10 +25,68 @@
{% include JB/setup %}
-# General Overview
+# Architecture
-Here we will explain the design pattern for MARVIN AI
+## Design Goal
+
+1. Language Agnostic capabilities: The platform must be able to support R, Python and Scala algorithms
+2. Parallelism capacities in many different levels (Eg. GPU, Multi-core and Multi-node)
+3. Deploy distributed machine learning models that are able to receive high concurrent traffic and provide response in near real-time
+
+## Platform Concept Map (High Level Integration)
+
+
----
-[BACK TO SUMMARY](/marvin-platform-book/SUMMARY)
\ No newline at end of file
+## Quality Attributes
+
+
+
+----
+
+## Architectural Tactics
+
+
+
+----
+
+## DASFE
+
+
+
+More Detail in [DASFE](/marvin-platform-book/ch1_main_components/dasfe)
+
+----
+
+## Context Diagram
+
+
+
+----
+
+## Execution Flow
+
+
+
+----
+
+## Executor and Engine
+
+
+
+----
+
+## Cluster Admin
+
+
+
+----
+
+## Deployment Diagram
+
+
+
+----
+
+[BACK TO SUMMARY](/marvin-platform-book/SUMMARY)
diff --git a/site/marvin-platform-book/ch7_community/committer.md b/site/marvin-platform-book/ch7_community/committer.md
new file mode 100644
index 0000000..8cd510e
--- /dev/null
+++ b/site/marvin-platform-book/ch7_community/committer.md
@@ -0,0 +1,55 @@
+---
+layout: page
+title: Community
+description: Project Community Page
+group: nav-right
+---
+<!--
+{% comment %}
+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.
+{% endcomment %}
+-->
+
+{% include JB/setup %}
+
+# Committer Notes
+
+## How To Merge Pull Requests
+
+ref: https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=65865114
+
+The following example is merging Pull-Request-9 to develop branch.
+
+```bash
+# Project Setup from Gitbox
+git clone https://gitbox.apache.org/repos/asf/incubator-marvin.git
+cd incubator-marvin
+git remote add mirror https://github.com/apache/incubator-marvin.git
+
+# Update Branch
+git checkout develop
+git pull origin develop
+
+# Merge Pull Request to Gitbox
+git fetch mirror pull/9/head:pr-9
+git merge pr-9
+git push origin develop
+git branch -d pr-9
+```
+
+----
+
+* [Community](/marvin-platform-book/ch7_community/overview)
diff --git a/site/marvin-platform-book/ch7_community/overview.md b/site/marvin-platform-book/ch7_community/overview.md
index 2d645b5..53440ea 100644
--- a/site/marvin-platform-book/ch7_community/overview.md
+++ b/site/marvin-platform-book/ch7_community/overview.md
@@ -25,13 +25,17 @@
{% include JB/setup %}
-# General Overview
+# Community Overview
* [Github](/marvin-platform-book/ch7_community/community#github)
* [Roadmap](/marvin-platform-book/ch7_community/community#roadmap)
* [How to Contribute](/marvin-platform-book/ch7_community/community#how-to-contribute)
+## Committer Notes
+
+* [How To Merge Pull Requests](/marvin-platform-book/ch7_community/committer#how-to-merge-pull-requests)
+
----
[BACK TO SUMMARY](/marvin-platform-book/SUMMARY)
diff --git a/site/marvin-platform-book/ch8_versions/overview.md b/site/marvin-platform-book/ch8_versions/overview.md
index a52c303..5d69af2 100644
--- a/site/marvin-platform-book/ch8_versions/overview.md
+++ b/site/marvin-platform-book/ch8_versions/overview.md
@@ -25,10 +25,10 @@
{% include JB/setup %}
-# General Overview
+# Version Overview
Here we will explain the design pattern for MARVIN AI
----
-[BACK TO SUMMARY](/marvin-platform-book/SUMMARY)
\ No newline at end of file
+[BACK TO SUMMARY](/marvin-platform-book/SUMMARY)
diff --git a/site/news.md b/site/news.md
index 14682e4..2f6abd2 100644
--- a/site/news.md
+++ b/site/news.md
@@ -31,6 +31,6 @@
<th><b>Title</b></th><th><b>Date</b></th>
{% for post in site.posts %}
<tr>
- <td><a href="{{ post.url | prepend: site.baseurl | prepend: site.url }}">{{ post.title }}</a></td>
+ <td><a href="https://marvin.apache.org{{post.url}}">{{ post.title }}</a></td>
<td>{{ post.date_str }}</td>
{% endfor %}
