news-link-update
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/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/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/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/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/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 %}
