zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kha...@apache.org
Subject [08/10] zeppelin git commit: [ZEPPELIN-2596] Improving documentation page
Date Fri, 23 Jun 2017 08:41:42 GMT
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4b6d3e55/docs/displaysystem/basicdisplaysystem.md
----------------------------------------------------------------------
diff --git a/docs/displaysystem/basicdisplaysystem.md b/docs/displaysystem/basicdisplaysystem.md
deleted file mode 100644
index 15cefef..0000000
--- a/docs/displaysystem/basicdisplaysystem.md
+++ /dev/null
@@ -1,164 +0,0 @@
----
-layout: page
-title: "Basic Display System in Apache Zeppelin"
-description: "There are 3 basic display systems in Apache Zeppelin. By default, Zeppelin prints interpreter responce as a plain text using text display system. With %html directive, Zeppelin treats your output as HTML. You can also simply use %table display system to leverage Zeppelin's built in visualization."
-group: display
----
-<!--
-Licensed 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.
--->
-{% include JB/setup %}
-
-# Basic Display System in Apache Zeppelin
-
-<div id="toc"></div>
-
-## Text
-
-By default, Apache Zeppelin prints interpreter response as a plain text using `text` display system.
-
-<img src="../assets/themes/zeppelin/img/screenshots/display_text.png" />
-
-You can explicitly say you're using `text` display system.
-
-<img src="../assets/themes/zeppelin/img/screenshots/display_text1.png" />
-
-## Html
-
-With `%html` directive, Zeppelin treats your output as HTML
-
-<img src="../assets/themes/zeppelin/img/screenshots/display_html.png" />
-
-### Mathematical expressions
-HTML display system automatically formats mathematical expression using [MathJax](https://www.mathjax.org/). You can use
-`\\( INLINE EXPRESSION \\)` and `$$ EXPRESSION $$` to format. For example
-
-<img src="../assets/themes/zeppelin/img/screenshots/display_formula.png" />
-
-
-## Table
-
-If you have data that row separated by `\n` (newline) and column separated by `\t` (tab) with first row as header row, for example
-
-<img src="../assets/themes/zeppelin/img/screenshots/display_table.png" />
-
-You can simply use `%table` display system to leverage Zeppelin's built in visualization.
-
-<img src="../assets/themes/zeppelin/img/screenshots/display_table1.png" />
-
-If table contents start with `%html`, it is interpreted as an HTML.
-
-<img src="../assets/themes/zeppelin/img/screenshots/display_table_html.png" />
-
-> **Note :** Display system is backend independent.
-
-## Network
-
-With the `%network` directive, Zeppelin treats your output as a graph. Zeppelin can leverage the Property Graph Model.
-
-### What is the Labelled Property Graph Model?
-
-A [Property Graph](https://github.com/tinkerpop/gremlin/wiki/Defining-a-Property-Graph) is a graph that has these elements:
-
-* a set of vertices
-    * each vertex has a unique identifier.
-    * each vertex has a set of outgoing edges.
-    * each vertex has a set of incoming edges.
-    * each vertex has a collection of properties defined by a map from key to value
-* a set of edges
-    * each edge has a unique identifier.
-    * each edge has an outgoing tail vertex.
-    * each edge has an incoming head vertex.
-    * each edge has a label that denotes the type of relationship between its two vertices.
-    * each edge has a collection of properties defined by a map from key to value.
-
-<img src="https://github.com/tinkerpop/gremlin/raw/master/doc/images/graph-example-1.jpg" />
-
-A [Labelled Property Graph](https://neo4j.com/developer/graph-database/#property-graph) is a Property Graph where the nodes can be tagged with **labels** representing their different roles in the graph model
-
-<img src="http://s3.amazonaws.com/dev.assets.neo4j.com/wp-content/uploads/property_graph_model.png" />
-
-### What are the APIs?
-
-The new NETWORK visualization is based on json with the following params:
-
-* "nodes" (mandatory): list of nodes of the graph every node can have the following params:
-    * "id" (mandatory): the id of the node (must be unique);
-    * "label": the main Label of the node;
-    * "labels": the list of the labels of the node;
-    * "data": the data attached to the node;
-* "edges": list of the edges of the graph;
-    * "id" (mandatory): the id of the edge (must be unique);
-    * "source" (mandatory): the id of source node of the edge;
-    * "target" (mandatory): the id of target node of the edge;
-    * "label": the main type of the edge;
-    * "data": the data attached to the edge;
-* "labels": a map (K, V) where K is the node label and V is the color of the node;
-* "directed": (true/false, default false) wich tells if is directed graph or not;
-* "types": a *distinct* list of the edge types of the graph
-
-If you click on a node or edge on the bottom of the paragraph you find a list of entity properties
-
-<img src="../assets/themes/zeppelin/img/screenshots/display_network.png" />
-
-This kind of graph can be easily *flatten* in order to support other visualization formats provided by Zeppelin.
-
-<img src="../assets/themes/zeppelin/img/screenshots/display_network_flatten.png" />
-
-### How to use it?
-
-An example of a simple graph
-
-```
-%spark
-print(s"""
-%network {
-    "nodes": [
-        {"id": 1},
-        {"id": 2},
-        {"id": 3}
-    ],
-    "edges": [
-		{"source": 1, "target": 2, "id" : 1},
-		{"source": 2, "target": 3, "id" : 2},
-		{"source": 1, "target": 2, "id" : 3},
-		{"source": 1, "target": 2, "id" : 4},
-		{"source": 2, "target": 1, "id" : 5},
-		{"source": 2, "target": 1, "id" : 6}
-	]
-}
-""")
-```
-
-that will look like:
-
-<img src="../assets/themes/zeppelin/img/screenshots/display_simple_network.png" />
-
-A little more complex graph:
-
-```
-%spark
-print(s"""
-%network {
-    "nodes": [{"id": 1, "label": "User", "data": {"fullName":"Andrea Santurbano"}},{"id": 2, "label": "User", "data": {"fullName":"Lee Moon Soo"}},{"id": 3, "label": "Project", "data": {"name":"Zeppelin"}}],
-    "edges": [{"source": 2, "target": 1, "id" : 1, "label": "HELPS"},{"source": 2, "target": 3, "id" : 2, "label": "CREATE"},{"source": 1, "target": 3, "id" : 3, "label": "CONTRIBUTE_TO", "data": {"oldPR": "https://github.com/apache/zeppelin/pull/1582"}}],
-	"labels": {"User": "#8BC34A", "Project": "#3071A9"},
-	"directed": true,
-	"types": ["HELPS", "CREATE", "CONTRIBUTE_TO"]
-}
-""")
-```
-
-that will look like:
-
-<img src="../assets/themes/zeppelin/img/screenshots/display_complex_network.png" />
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4b6d3e55/docs/displaysystem/front-end-angular.md
----------------------------------------------------------------------
diff --git a/docs/displaysystem/front-end-angular.md b/docs/displaysystem/front-end-angular.md
deleted file mode 100644
index 973ed88..0000000
--- a/docs/displaysystem/front-end-angular.md
+++ /dev/null
@@ -1,170 +0,0 @@
----
-layout: page
-title: "Front-end Angular API in Apache Zeppelin"
-description: "In addition to the back-end API to handle Angular objects binding, Apache Zeppelin exposes a simple AngularJS z object on the front-end side to expose the same capabilities."
-group: display
----
-<!--
-Licensed 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.
--->
-{% include JB/setup %}
-
-# Front-end Angular API in Apache Zeppelin
-
-<div id="toc"></div>
-
-## Basic Usage
-In addition to the [back-end API](./back-end-angular.html) to handle Angular objects binding, Apache Zeppelin also exposes a simple AngularJS <code>**z**</code> object on the front-end side to expose the same capabilities.
-This <code>**z**</code> object is accessible in the Angular isolated scope for each paragraph.
-
-
-### Bind / Unbind Variables
-
-Through the **`z`**, you can bind / unbind variables to **AngularJS view**.
-Bind a value to an angular object and a **mandatory** target paragraph:
-
-```html
-
-%angular
-
-<form class="form-inline">
-  <div class="form-group">
-    <label for="superheroId">Super Hero: </label>
-    <input type="text" class="form-control" id="superheroId" placeholder="Superhero name ..." ng-model="superhero"></input>
-  </div>
-  <button type="submit" class="btn btn-primary" ng-click="z.angularBind('superhero',superhero,'20160222-232336_1472609686')"> Bind</button>
-</form>
-
-```
-
-<img src="../assets/themes/zeppelin/img/screenshots/z_angularBind.gif" />
-
-<hr/>
-
-Unbind/remove a value from angular object and a **mandatory** target paragraph:
-
-```html
-
-%angular
-
-<form class="form-inline">
-  <button type="submit" class="btn btn-primary" ng-click="z.angularUnbind('superhero','20160222-232336_1472609686')"> UnBind</button>
-</form>
-
-```
-
-<img src="../assets/themes/zeppelin/img/screenshots/z_angularUnbind.gif" />
-
-The signature for the **`z.angularBind() / z.angularUnbind()`** functions are:
-
-```javascript
-// Bind
-z.angularBind(angularObjectName, angularObjectValue, paragraphId);
-
-// Unbind
-z.angularUnbind(angularObjectName, angularObjectValue, paragraphId);
-
-```
-
-All the parameters are mandatory.
-
-
-<br />
-### Run Paragraph
-
-You can also trigger paragraph execution by calling **`z.runParagraph()`** function passing the appropriate paragraphId: 
-
-```html
-
-%angular
-
-<form class="form-inline">
-  <div class="form-group">
-    <label for="paragraphId">Paragraph Id: </label>
-    <input type="text" class="form-control" id="paragraphId" placeholder="Paragraph Id ..." ng-model="paragraph"></input>
-  </div>
-  <button type="submit" class="btn btn-primary" ng-click="z.runParagraph(paragraph)"> Run Paragraph</button>
-</form>
-
-```
-
-<img src="../assets/themes/zeppelin/img/screenshots/z_runParagraph.gif" />
-
-<br />
-## Overriding dynamic form with Angular Object
-
-The front-end Angular Interaction API has been designed to offer richer form capabilities and variable binding. With the existing **Dynamic Form** system you can already create input text, select and checkbox forms but the choice is rather limited and the look & feel cannot be changed.
-
-The idea is to create a custom form using plain HTML/AngularJS code and bind actions on this form to push/remove Angular variables to targeted paragraphs using this new API. 
-
-Consequently if you use the **Dynamic Form** syntax in a paragraph and there is a bound Angular object having the same name as the `${formName}`, the Angular object will have higher priority and the **Dynamic Form** will not be displayed. Example: 
- 
-
-<img src="../assets/themes/zeppelin/img/screenshots/z_angularJs_overriding_dynamic_form.gif" />
-
-
-<br />
-## Feature matrix comparison
-
-How does the front-end AngularJS API compares to the [back-end API](./back-end-angular.html) ? Below is a comparison matrix for both APIs:
-
-<table class="table-configuration">
-    <thead>
-        <tr>
-            <th>Actions</th>
-            <th>Front-end API</th>
-            <th>Back-end API</th>
-        </tr>
-    </thead>
-        <tr>
-            <td>Initiate binding</td>
-            <td>z.angularbind(var, initialValue, paragraphId)</td>
-            <td>z.angularBind(var, initialValue)</td>
-        </tr>
-        <tr>
-            <td>Update value</td>
-            <td>same to ordinary angularjs scope variable, or z.angularbind(var, newValue, paragraphId)</td>
-            <td>z.angularBind(var, newValue)</td>
-        </tr>
-        <tr>
-            <td>Watching value</td>
-            <td>same to ordinary angularjs scope variable</td>
-            <td>z.angularWatch(var, (oldVal, newVal) => ...)</td>
-        </tr>
-        <tr>
-            <td>Destroy binding</td>
-            <td>z.angularUnbind(var, paragraphId)</td>
-            <td>z.angularUnbind(var)</td>
-        </tr>
-        <tr>
-            <td>Executing Paragraph</td>
-            <td>z.runParagraph(paragraphId)</td>
-            <td>z.run(paragraphId)</td>
-        </tr>
-        <tr>
-            <td>Executing Paragraph (Specific paragraphs in other notes) (</td>
-            <td></td>
-            <td>z.run(noteid, paragraphId)</td>
-        </tr>
-        <tr>
-            <td>Executing note</td>
-            <td></td>
-            <td>z.runNote(noteId)</td>
-        </tr> 
-    <tbody>
-    <tbody>    
-</table>
-
-Both APIs are pretty similar, except for value watching where it is done naturally by AngularJS internals on the front-end and by user custom watcher functions in the back-end.
-
-There is also a slight difference in term of scope. Front-end API limits the Angular object binding to a paragraph scope whereas back-end API allows you to bind an Angular object at the global or note scope. This restriction has been designed purposely to avoid Angular object leaks and scope pollution.

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4b6d3e55/docs/index.md
----------------------------------------------------------------------
diff --git a/docs/index.md b/docs/index.md
index bb2222b..e623f0d 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -18,179 +18,140 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% include JB/setup %}
-<br />
-<div class="row">
-  <div class="col-md-6" style="padding-right:0">
-    <h1 style="color:#4c555a">Multi-purpose Notebook</h1>
-    <p class="index-header">
-      The Notebook is the place for all your needs
+<div class="row" style="margin-top: 0px;">
+  <div class="col-sm-6 col-md-6" style="padding-right:0;">
+    <h1 style="color:#4c555a; margin-top: 0px;">What is Apache Zeppelin?</h1>
+    <p style="margin-bottom: 0px; margin-top: 20px; font-size: 18px; font-style="font-family: "Roboto", sans-serif;">
+      Multi-purpose notebook which supports
     </p>
-    <ul style="list-style-type: none;padding-left:10px;" >
-      <li style="font-size:18px; margin: 5px;"><span class="glyphicon glyphicon-import" style="margin-right:10px"></span> Data Ingestion</li>
-      <li style="font-size:18px; margin: 5px;"><span class="glyphicon glyphicon-eye-open" style="margin-right:10px"></span> Data Discovery</li>
-      <li style="font-size:18px; margin: 5px;"><span class="glyphicon glyphicon-wrench" style="margin-right:10px"></span> Data Analytics</li>
-      <li style="font-size:18px; margin: 5px;"><span class="glyphicon glyphicon-dashboard" style="margin-right:10px"></span> Data Visualization & Collaboration</li>
+    <p style="font-size: 18px; font-style="font-family: "Roboto", sans-serif;">
+      20+ language backends
+    </p>
+    <ul style="list-style-type: none; padding-left:10px; margin-top: 30px;" >
+      <li style="font-weight: 300; font-size:18px; margin: 5px;"><span class="glyphicon glyphicon-import" style="margin-right:10px"></span> Data Ingestion</li>
+      <li style="font-weight: 300; font-size:18px; margin: 5px;"><span class="glyphicon glyphicon-eye-open" style="margin-right:10px"></span> Data Discovery</li>
+      <li style="font-weight: 300; font-size:18px; margin: 5px;"><span class="glyphicon glyphicon-wrench" style="margin-right:10px"></span> Data Analytics</li>
+      <li style="font-weight: 300; font-size:18px; margin: 5px;"><span class="glyphicon glyphicon-dashboard" style="margin-right:10px"></span> Data Visualization & Collaboration</li>
     </ul>
+    <br/>
   </div>
-  <div class="col-md-6" style="padding:0">
-    <img class="img-responsive" style="border: 1px solid #ecf0f1;" src="./assets/themes/zeppelin/img/notebook.png" />
-  </div>
-</div>
-
-<br />
-## Multiple Language Backend
-[Apache Zeppelin interpreter](./manual/interpreters.html) concept allows any language/data-processing-backend to be plugged into Zeppelin.
-Currently Apache Zeppelin supports many interpreters such as Apache Spark, Python, JDBC, Markdown and Shell.
-
-<img class="img-responsive" width="500px" style="margin:0 auto; padding: 26px;" src="./assets/themes/zeppelin/img/available_interpreters.png" />
-
-Adding new language-backend is really simple. Learn [how to create your own interpreter](./development/writingzeppelininterpreter.html#make-your-own-interpreter).
-
-#### Apache Spark integration
-Especially, Apache Zeppelin provides built-in [Apache Spark](http://spark.apache.org/) integration. You don't need to build a separate module, plugin or library for it.
-
-<img class="img-responsive" src="./assets/themes/zeppelin/img/spark_logo.png" width="140px" />
-
-Apache Zeppelin with Spark integration provides
-
-- Automatic SparkContext and SQLContext injection
-- Runtime jar dependency loading from local filesystem or maven repository. Learn more about [dependency loader](./interpreter/spark.html#dependencyloading).
-- Canceling job and displaying its progress
-
-For the further information about Apache Spark in Apache Zeppelin, please see [Spark interpreter for Apache Zeppelin](./interpreter/spark.html).
-
-<br />
-## Data visualization
-
-Some basic charts are already included in Apache Zeppelin. Visualizations are not limited to Spark SQL query, any output from any language backend can be recognized and visualized.
-
-<div class="row">
-  <div class="col-md-6">
-    <img class="img-responsive" src="./assets/themes/zeppelin/img/graph1.png" />
-  </div>
-  <div class="col-md-6">
-    <img class="img-responsive" src="./assets/themes/zeppelin/img/graph2.png" />
+  <div class="col-sm-6 col-md-6" style="padding:0;">
+    <div class="hidden-xs" style="margin-top: 60px;"></div>
+    <img class="img-responsive" style="border: 1px solid #ecf0f1;" src="/assets/themes/zeppelin/img/notebook.png" />
   </div>
 </div>
 
-### Pivot chart
-
-Apache Zeppelin aggregates values and displays them in pivot chart with simple drag and drop. You can easily create chart with multiple aggregated values including sum, count, average, min, max.
-
-<div class="row">
-  <div class="col-md-12">
-    <img class="img-responsive" style="margin: 16px auto;" src="./assets/themes/zeppelin/img/screenshots/pivot.png" width="480px" />
-  </div>
-</div>
-
-Learn more about [display systems](#display-system) in Apache Zeppelin.
-
-<br />
-## Dynamic forms
-
-Apache Zeppelin can dynamically create some input forms in your notebook.
-<div class="row">
-  <div class="col-md-12">
-    <img class="img-responsive" style="margin: 16px auto;" src="./assets/themes/zeppelin/img/screenshots/dynamicform.png" />
-  </div>
-</div>
-Learn more about [Dynamic Forms](./manual/dynamicform.html).
-
-<br />
-## Collaborate by sharing your Notebook & Paragraph
-Your notebook URL can be shared among collaborators. Then Apache Zeppelin will broadcast any changes in realtime, just like the collaboration in Google docs.
-
-<div class="row">
-  <div class="col-md-12">
-    <img class="img-responsive" style="margin: 20px auto" src="./assets/themes/zeppelin/img/screenshots/publish.png" width="650px"/>
-  </div>
-</div>
-
-Apache Zeppelin provides an URL to display the result only, that page does not include any menus and buttons inside of notebooks.
-You can easily embed it as an iframe inside of your website in this way.
-If you want to learn more about this feature, please visit [this page](./manual/publish.html).
-
-<br />
-## 100% Opensource
-
-<img class="img-responsive" style="margin:0 auto; padding: 15px;" src="./assets/themes/zeppelin/img/asf_logo.png" width="250px"/>
-
-Apache Zeppelin is Apache2 Licensed software. Please check out the [source repository](http://git.apache.org/zeppelin.git) and [how to contribute](https://zeppelin.apache.org/contribution/contributions.html).
-Apache Zeppelin has a very active development community.
-Join to our [Mailing list](https://zeppelin.apache.org/community.html) and report issues on [Jira Issue tracker](https://issues.apache.org/jira/browse/ZEPPELIN).
-
-## What is the next ?
-
-####Quick Start
-
-* Getting Started
-  * [Quick Start](./install/install.html) for basic instructions on installing Apache Zeppelin
-  * [Configuration](./install/configuration.html) lists for Apache Zeppelin
-  * [Explore Apache Zeppelin UI](./quickstart/explorezeppelinui.html): basic components of Apache Zeppelin home
-  * [Tutorial](./quickstart/tutorial.html): a short walk-through tutorial that uses Apache Spark backend
-* Basic Feature Guide
-  * [Dynamic Form](./manual/dynamicform.html): a step by step guide for creating dynamic forms
-  * [Publish your Paragraph](./manual/publish.html) results into your external website
-  * [Customize Zeppelin Homepage](./manual/notebookashomepage.html) with one of your notebooks
-* More
-  * [Upgrade Apache Zeppelin Version](./install/upgrade.html): a manual procedure of upgrading Apache Zeppelin version
-  * [Build](./install/build.html): Build from source
-
-####Interpreter
-
-* [Interpreters in Apache Zeppelin](./manual/interpreters.html): what is interpreter group? how can you set interpreters in Apache Zeppelin?
-* Usage
-  * [Interpreter Installation](./manual/interpreterinstallation.html): Install not only community managed interpreters but also 3rd party interpreters
-  * [Interpreter Dependency Management](./manual/dependencymanagement.html) when you include external libraries to interpreter
-  * [Interpreter User Impersonation](./manual/userimpersonation.html) when you want to run interpreter as end user
-  * [Interpreter Execution Hooks](./manual/interpreterexechooks.html) to specify additional code to be executed by an interpreter at pre and post-paragraph code execution
-* Available Interpreters: currently, about 20 interpreters are available in Apache Zeppelin.
-
-####Display System
-
-* Basic Display System: [Text](./displaysystem/basicdisplaysystem.html#text), [HTML](./displaysystem/basicdisplaysystem.html#html), [Table](./displaysystem/basicdisplaysystem.html#table) is available
-* Angular API: a description about avilable backend and frontend AngularJS API with examples
-  * [Angular (backend API)](./displaysystem/back-end-angular.html)
-  * [Angular (frontend API)](./displaysystem/front-end-angular.html)
-
-#### More
-
-* Notebook Storage: a guide about saving notebooks to external storage
-  * [Git Storage](./storage/storage.html#notebook-storage-in-local-git-repository)
-  * [S3 Storage](./storage/storage.html#notebook-storage-in-s3)
-  * [Azure Storage](./storage/storage.html#notebook-storage-in-azure)
-  * [ZeppelinHub Storage](./storage/storage.html#storage-in-zeppelinhub)
+## Documentation 
+
+#### Quick Start
+
+* [Install](./quickstart/install.html) for basic instructions on installing Apache Zeppelin
+* [Explore UI](./quickstart/explore_ui.html): basic components of Apache Zeppelin home
+* [Tutorial](./quickstart/tutorial.html)
+* [Spark with Zeppelin](./quickstart/spark_with_zeppelin.html)
+* [SQL with Zeppelin](./quickstart/sql_with_zeppelin.html)
+* [Python with Zeppelin](./quickstart/python_with_zeppelin.html)
+  
+#### Usage 
+* Dynamic Form 
+  * [What is Dynamic Form](./usage/dynamic_form/intro.html): a step by step guide for creating dynamic forms
+* Display System 
+  * [Text Display (`%text`)](./usage/display_system/basic.html#text)
+  * [HTML Display (`%html`)](./usage/display_system/basic.html#html)
+  * [Table Display (`%table`)](./usage/display_system/basic.html#table)
+  * [Angular Display using Backend API (`%angular`)](./usage/display_system/angular_backend.html)
+  * [Angular Display using Frontend API (`%angular`)](./usage/display_system/angular_frontend.html)
+* Interpreter  
+  * [Overview](./usage/interpreter/overview.html): what is interpreter group? how can you set interpreters in Apache Zeppelin?
+  * [User Impersonation](./usage/interpreter/user_impersonation.html) when you want to run interpreter as end user
+  * [Interpreter Binding Mode](./usage/interpreter/interpreter_binding_mode.html) when you want to manage separate interpreter contexts 
+  * [Dependency Management](./usage/interpreter/dependency_management.html) when you include external libraries to interpreter
+  * [Installing Interpreters](./usage/interpreter/installation.html): Install not only community managed interpreters but also 3rd party interpreters
+  * [Execution Hooks](./usage/interpreter/execution_hooks.html) to specify additional code to be executed by an interpreter at pre and post-paragraph code execution
+* Other Features:
+  * [Publishing Paragraphs](./usage/other_features/publishing_paragraphs.html) results into your external website
+  * [Personalized Mode](./usage/other_features/personalized_mode.html) 
+  * [Customizing Zeppelin Homepage](./usage/other_features/customizing_homepage.html) with one of your notebooks
 * REST API: available REST API list in Apache Zeppelin
-  * [Zeppelin server API](./rest-api/rest-zeppelin-server.html)
-  * [Interpreter API](./rest-api/rest-interpreter.html)
-  * [Notebook API](./rest-api/rest-notebook.html)
-  * [Notebook Repository API](./rest-api/rest-notebookRepo.html)
-  * [Configuration API](./rest-api/rest-configuration.html)
-  * [Credential API](./rest-api/rest-credential.html)
-  * [Helium API](./rest-api/rest-helium.html)
+  * [Interpreter API](./usage/rest_api/interpreter.html)
+  * [Zeppelin Server API](./usage/rest_api/zeppelin_server.html)
+  * [Notebook API](./usage/rest_api/notebook.html)
+  * [Notebook Repository API](./usage/rest_api/notebook_repository.html)
+  * [Configuration API](./usage/rest_api/configuration.html)
+  * [Credential API](./usage/rest_api/credential.html)
+  * [Helium API](./usage/rest_api/helium.html)
+  
+#### Setup 
+* Basics 
+  * [How to Build Zeppelin](./setup/basics/how_to_build.html)
+  * [Multi-user Support](./setup/basics/multi_user_support.html)
+* Deployment 
+  * [Spark Cluster Mode: Standalone](./setup/deployment/spark_cluster_mode.html#spark-standalone-mode)
+  * [Spark Cluster Mode: YARN](./setup/deployment/spark_cluster_mode.html#spark-on-yarn-mode)
+  * [Spark Cluster Mode: Mesos](./setup/deployment/spark_cluster_mode.html#spark-on-mesos-mode)
+  * [Zeppelin with Flink and Spark Cluster](./setup/deployment/flink_and_spark_cluster.html)
+  * [Zeppelin on CDH](./setup/deployment/cdh.html)
+  * [Zeppelin on VM: Vagrant](./setup/deployment/virtual_machine.html)
 * Security: available security support in Apache Zeppelin
-  * [Authentication for NGINX](./security/authentication.html)
-  * [Shiro Authentication](./security/shiroauthentication.html)
-  * [Notebook Authorization](./security/notebook_authorization.html)
-  * [Data Source Authorization](./security/datasource_authorization.html)
-  * [Helium Authorization](./security/helium_authorization.html)
-* Helium Framework (Experimental)
-  * [Writing Zeppelin Application](./development/writingzeppelinapplication.html)
-  * [Writing Zeppelin Spell](./development/writingzeppelinspell.html)
-  * [Writing Zeppelin Visualization: Basic](./development/writingzeppelinvisualization.html)
-  * [Writing Zeppelin Visualization: Transformation](./development/writingzeppelinvisualization_transformation.html)
-* Advanced
-  * [Apache Zeppelin on Vagrant VM](./install/virtual_machine.html)
-  * [Zeppelin on Spark Cluster Mode (Standalone via Docker)](./install/spark_cluster_mode.html#spark-standalone-mode)
-  * [Zeppelin on Spark Cluster Mode (YARN via Docker)](./install/spark_cluster_mode.html#spark-on-yarn-mode)
-  * [Zeppelin on Spark Cluster Mode (Mesos via Docker)](./install/spark_cluster_mode.html#spark-on-mesos-mode)
-  * [Zeppelin on CDH (via Docker)](./install/cdh.html)
-* Contribute
-  * [Writing Zeppelin Interpreter](./development/writingzeppelininterpreter.html)
-  * [How to contribute (code)](./development/howtocontribute.html)
-  * [How to contribute (documentation website)](./development/howtocontributewebsite.html)
+  * [HTTP Basic Auth using NGINX](./setup/security/authentication_nginx.html)
+  * [Shiro Authentication](./setup/security/shiro_authentication.html)
+  * [Notebook Authorization](./setup/security/notebook_authorization.html)
+  * [Data Source Authorization](./setup/security/datasource_authorization.html)
+* Notebook Storage: a guide about saving notebooks to external storage
+  * [Git Storage](./setup/storage/storage.html#notebook-storage-in-local-git-repository)
+  * [S3 Storage](./setup/storage/storage.html#notebook-storage-in-s3)
+  * [Azure Storage](./setup/storage/storage.html#notebook-storage-in-azure)
+  * [ZeppelinHub Storage](./setup/storage/storage.html#notebook-storage-in-zeppelinhub)
+  * [MongoDB Storage](./setup/storage/storage.html#notebook-storage-in-mongodb)
+* Operation 
+  * [Configuration](./setup/operation/configuration.html): lists for Apache Zeppelin
+  * [Proxy Setting](./setup/operation/proxy_setting.html)
+  * [Upgrading](./setup/operation/upgrading.html): a manual procedure of upgrading Apache Zeppelin version
+  * [Trouble Shooting](./setup/operation/trouble_shooting.html)
+  
+#### Developer Guide
+* Extending Zeppelin
+  * [Writing Zeppelin Interpreter](./development/writing_zeppelin_interpreter.html)
+  * [Helium: Overview](./development/helium/overview.html)
+  * [Helium: Writing Application](./development/helium/writing_application.html)
+  * [Helium: Writing Spell](./development/helium/writing_spell.html)
+  * [Helium: Writing Visualization: Basic](./development/helium/writing_visualization_basic.html)
+  * [Helium: Writing Visualization: Transformation](./development/helium/writing_visualization_transformation.html)
+* Contributing to Zeppelin
+  * [How to Build Zeppelin](./setup/basics/how_to_build.html)
+  * [Useful Developer Tools](./development/contribution/useful_developer_tools.html)
+  * [How to Contribute (code)](./development/contribution/how_to_contribute_code.html)
+  * [How to Contribute (website)](./development/contribution/how_to_contribute_website.html)
 
 #### External Resources
   * [Mailing List](https://zeppelin.apache.org/community.html)
   * [Apache Zeppelin Wiki](https://cwiki.apache.org/confluence/display/ZEPPELIN/Zeppelin+Home)
-  * [StackOverflow tag `apache-zeppelin`](http://stackoverflow.com/questions/tagged/apache-zeppelin)
+  * [Stackoverflow Questions about Zeppelin (tag: `apache-zeppelin`)](http://stackoverflow.com/questions/tagged/apache-zeppelin)
+  
+#### Available Interpreters 
+  * [Alluxio](./interpreter/alluxio.html)
+  * [Beam](./interpreter/beam.html)
+  * [BigQuery](./interpreter/bigquery.html)
+  * [Cassandra](./interpreter/cassandra.html)
+  * [Elasticsearch](./interpreter/elasticsearch.html)
+  * [flink](./interpreter/flink.html)
+  * [Geode](./interpreter/geode.html)
+  * [Groovy](./interpreter/groovy.html)
+  * [HBase](./interpreter/hbase.html)
+  * [HDFS](./interpreter/hdfs.html)
+  * [Hive](./interpreter/hive.html)
+  * [Ignite](./interpreter/ignite.html)
+  * [JDBC](./interpreter/jdbc.html)
+  * [Kylin](./interpreter/kylin.html)
+  * [Lens](./interpreter/lens.html)
+  * [Livy](./interpreter/livy.html)
+  * [markdown](./interpreter/markdown.html)
+  * [Pig](./interpreter/pig.html)
+  * [Postgresql, HAWQ](./interpreter/postgresql.html)
+  * [Python](./interpreter/python.html)
+  * [R](./interpreter/r.html)
+  * [Scalding](./interpreter/scalding.html)
+  * [Scio](./interpreter/scio.html)
+  * [Shell](./interpreter/Shell.html)
+  * [Spark](./interpreter/spark.html)
+  

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4b6d3e55/docs/install/build.md
----------------------------------------------------------------------
diff --git a/docs/install/build.md b/docs/install/build.md
deleted file mode 100644
index c0974d9..0000000
--- a/docs/install/build.md
+++ /dev/null
@@ -1,336 +0,0 @@
----
-layout: page
-title: "Build from Source"
-description: "How to build Zeppelin from source"
-group: install
----
-<!--
-Licensed 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.
--->
-{% include JB/setup %}
-
-## Building from Source
-
-<div id="toc"></div>
-
-If you want to build from source, you must first install the following dependencies:
-
-<table class="table-configuration">
-  <tr>
-    <th>Name</th>
-    <th>Value</th>
-  </tr>
-  <tr>
-    <td>Git</td>
-    <td>(Any Version)</td>
-  </tr>
-  <tr>
-    <td>Maven</td>
-    <td>3.1.x or higher</td>
-  </tr>
-  <tr>
-    <td>JDK</td>
-    <td>1.7</td>
-  </tr>
-</table>
-
-
-If you haven't installed Git and Maven yet, check the [Build requirements](#build-requirements) section and follow the step by step instructions from there.
-
-
-####1. Clone the Apache Zeppelin repository
-
-```
-git clone https://github.com/apache/zeppelin.git
-```
-
-####2. Build source
-
-
-You can build Zeppelin with following maven command:
-
-```
-mvn clean package -DskipTests [Options]
-```
-
-If you're unsure about the options, use the same commands that creates official binary package.
-
-```bash
-# update all pom.xml to use scala 2.11
-./dev/change_scala_version.sh 2.11
-# build zeppelin with all interpreters and include latest version of Apache spark support for local mode.
-mvn clean package -DskipTests -Pspark-2.0 -Phadoop-2.4 -Pr -Pscala-2.11
-```
-
-####3. Done
-You can directly start Zeppelin by running after successful build:
-
-```bash
-./bin/zeppelin-daemon.sh start
-```
-
-Check [build-profiles](#build-profiles) section for further build options.
-If you are behind proxy, follow instructions in [Proxy setting](#proxy-setting-optional) section.
-
-If you're interested in contribution, please check [Contributing to Apache Zeppelin (Code)](../development/howtocontribute.html) and [Contributing to Apache Zeppelin (Website)](../../development/contributewebsite.html).
-
-### Build profiles
-
-#### Spark Interpreter
-
-To build with a specific Spark version, Hadoop version or specific features, define one or more of the following profiles and options:
-
-##### `-Pspark-[version]`
-
-Set spark major version
-
-Available profiles are
-
-```
--Pspark-2.1
--Pspark-2.0
--Pspark-1.6
--Pspark-1.5
--Pspark-1.4
--Pcassandra-spark-1.5
--Pcassandra-spark-1.4
--Pcassandra-spark-1.3
--Pcassandra-spark-1.2
--Pcassandra-spark-1.1
-```
-
-minor version can be adjusted by `-Dspark.version=x.x.x`
-
-
-##### `-Phadoop-[version]`
-
-set hadoop major version
-
-Available profiles are
-
-```
--Phadoop-0.23
--Phadoop-1
--Phadoop-2.2
--Phadoop-2.3
--Phadoop-2.4
--Phadoop-2.6
--Phadoop-2.7
-```
-
-minor version can be adjusted by `-Dhadoop.version=x.x.x`
-
-##### `-Pscala-[version] (optional)`
-
-set scala version (default 2.10)
-Available profiles are
-
-```
--Pscala-2.10
--Pscala-2.11
-```
-
-##### `-Pr` (optional)
-
-enable [R](https://www.r-project.org/) support with [SparkR](https://spark.apache.org/docs/latest/sparkr.html) integration.
-
-##### `-Pvendor-repo` (optional)
-
-enable 3rd party vendor repository (cloudera)
-
-
-##### `-Pmapr[version]` (optional)
-
-For the MapR Hadoop Distribution, these profiles will handle the Hadoop version. As MapR allows different versions of Spark to be installed, you should specify which version of Spark is installed on the cluster by adding a Spark profile (`-Pspark-1.6`, `-Pspark-2.0`, etc.) as needed.
-The correct Maven artifacts can be found for every version of MapR at http://doc.mapr.com
-
-Available profiles are
-
-```
--Pmapr3
--Pmapr40
--Pmapr41
--Pmapr50
--Pmapr51
-```
-
-#### -Pexamples (optional)
-
-Bulid examples under zeppelin-examples directory
-
-
-### Build command examples
-Here are some examples with several options:
-
-```bash
-# build with spark-2.1, scala-2.11
-./dev/change_scala_version.sh 2.11
-mvn clean package -Pspark-2.1 -Phadoop-2.4 -Pscala-2.11 -DskipTests
-
-# build with spark-2.0, scala-2.11
-./dev/change_scala_version.sh 2.11
-mvn clean package -Pspark-2.0 -Phadoop-2.4 -Pscala-2.11 -DskipTests
-
-# build with spark-1.6, scala-2.10
-mvn clean package -Pspark-1.6 -Phadoop-2.4 -DskipTests
-
-# spark-cassandra integration
-mvn clean package -Pcassandra-spark-1.5 -Dhadoop.version=2.6.0 -Phadoop-2.6 -DskipTests -DskipTests
-
-# with CDH
-mvn clean package -Pspark-1.5 -Dhadoop.version=2.6.0-cdh5.5.0 -Phadoop-2.6 -Pvendor-repo -DskipTests
-
-# with MapR
-mvn clean package -Pspark-1.5 -Pmapr50 -DskipTests
-```
-
-Ignite Interpreter
-
-```bash
-mvn clean package -Dignite.version=1.9.0 -DskipTests
-```
-
-Scalding Interpreter
-
-```bash
-mvn clean package -Pscalding -DskipTests
-```
-
-
-
-
-## Build requirements
-
-### Install requirements
-
-If you don't have requirements prepared, install it.
-(The installation method may vary according to your environment, example is for Ubuntu.)
-
-```
-sudo apt-get update
-sudo apt-get install git
-sudo apt-get install openjdk-7-jdk
-sudo apt-get install npm
-sudo apt-get install libfontconfig
-```
-
-
-
-### Install maven
-```
-wget http://www.eu.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
-sudo tar -zxf apache-maven-3.3.9-bin.tar.gz -C /usr/local/
-sudo ln -s /usr/local/apache-maven-3.3.9/bin/mvn /usr/local/bin/mvn
-```
-
-_Notes:_
- - Ensure node is installed by running `node --version`  
- - Ensure maven is running version 3.1.x or higher with `mvn -version`
- - Configure maven to use more memory than usual by `export MAVEN_OPTS="-Xmx2g -XX:MaxPermSize=1024m"`
-
-
-
-## Proxy setting (optional)
-
-If you're behind the proxy, you'll need to configure maven and npm to pass through it.
-
-First of all, configure maven in your `~/.m2/settings.xml`.
-
-```
-<settings>
-  <proxies>
-    <proxy>
-      <id>proxy-http</id>
-      <active>true</active>
-      <protocol>http</protocol>
-      <host>localhost</host>
-      <port>3128</port>
-      <!-- <username>usr</username>
-      <password>pwd</password> -->
-      <nonProxyHosts>localhost|127.0.0.1</nonProxyHosts>
-    </proxy>
-    <proxy>
-      <id>proxy-https</id>
-      <active>true</active>
-      <protocol>https</protocol>
-      <host>localhost</host>
-      <port>3128</port>
-      <!-- <username>usr</username>
-      <password>pwd</password> -->
-      <nonProxyHosts>localhost|127.0.0.1</nonProxyHosts>
-    </proxy>
-  </proxies>
-</settings>
-```
-
-Then, next commands will configure npm.
-
-```
-npm config set proxy http://localhost:3128
-npm config set https-proxy http://localhost:3128
-npm config set registry "http://registry.npmjs.org/"
-npm config set strict-ssl false
-```
-
-Configure git as well
-
-```
-git config --global http.proxy http://localhost:3128
-git config --global https.proxy http://localhost:3128
-git config --global url."http://".insteadOf git://
-```
-
-To clean up, set `active false` in Maven `settings.xml` and run these commands.
-
-```bash
-npm config rm proxy
-npm config rm https-proxy
-git config --global --unset http.proxy
-git config --global --unset https.proxy
-git config --global --unset url."http://".insteadOf
-```
-
-_Notes:_
- - If you are behind NTLM proxy you can use [Cntlm Authentication Proxy](http://cntlm.sourceforge.net/).
- - Replace `localhost:3128` with the standard pattern `http://user:pwd@host:port`.
-
-
-## Package
-To package the final distribution including the compressed archive, run:
-
-```sh
-mvn clean package -Pbuild-distr
-```
-
-To build a distribution with specific profiles, run:
-
-```sh
-mvn clean package -Pbuild-distr -Pspark-1.5 -Phadoop-2.4
-```
-
-The profiles `-Pspark-1.5 -Phadoop-2.4` can be adjusted if you wish to build to a specific spark versions.  
-
-The archive is generated under _`zeppelin-distribution/target`_ directory
-
-## Run end-to-end tests
-Zeppelin comes with a set of end-to-end acceptance tests driving headless selenium browser
-
-```sh
-# assumes zeppelin-server running on localhost:8080 (use -Durl=.. to override)
-mvn verify
-
-# or take care of starting/stoping zeppelin-server from packaged zeppelin-distribuion/target
-mvn verify -P using-packaged-distr
-```
-
-[![Analytics](https://ga-beacon.appspot.com/UA-45176241-4/apache/zeppelin/README.md?pixel)](https://github.com/igrigorik/ga-beacon)

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4b6d3e55/docs/install/cdh.md
----------------------------------------------------------------------
diff --git a/docs/install/cdh.md b/docs/install/cdh.md
deleted file mode 100644
index f661417..0000000
--- a/docs/install/cdh.md
+++ /dev/null
@@ -1,100 +0,0 @@
----
-layout: page
-title: "Apache Zeppelin on CDH"
-description: "This document will guide you how you can build and configure the environment on CDH with Apache Zeppelin using docker scripts."
-group: install
----
-<!--
-Licensed 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.
--->
-{% include JB/setup %}
-
-# Apache Zeppelin on CDH
-
-<div id="toc"></div>
-
-### 1. Import Cloudera QuickStart Docker image
-
->[Cloudera](http://www.cloudera.com/) has officially provided CDH Docker Hub in their own container. Please check [this guide page](http://www.cloudera.com/documentation/enterprise/latest/topics/quickstart_docker_container.html#cloudera_docker_container) for more information.
-
-You can import the Docker image by pulling it from Cloudera Docker Hub.
-
-```
-docker pull cloudera/quickstart:latest
-```
-
-
-### 2. Run docker
-
-```
-docker run -it \
- -p 80:80 \
- -p 4040:4040 \
- -p 8020:8020 \
- -p 8022:8022 \
- -p 8030:8030 \
- -p 8032:8032 \
- -p 8033:8033 \
- -p 8040:8040 \
- -p 8042:8042 \
- -p 8088:8088 \
- -p 8480:8480 \
- -p 8485:8485 \
- -p 8888:8888 \
- -p 9083:9083 \
- -p 10020:10020 \
- -p 10033:10033 \
- -p 18088:18088 \
- -p 19888:19888 \
- -p 25000:25000 \
- -p 25010:25010 \
- -p 25020:25020 \
- -p 50010:50010 \
- -p 50020:50020 \
- -p 50070:50070 \
- -p 50075:50075 \
- -h quickstart.cloudera --privileged=true \
- agitated_payne_backup /usr/bin/docker-quickstart;
-```
-
-### 3. Verify running CDH
-
-To verify the application is running well, check the web UI for HDFS on `http://<hostname>:50070/` and YARN on `http://<hostname>:8088/cluster`.
-
-
-### 4. Configure Spark interpreter in Zeppelin
-Set following configurations to `conf/zeppelin-env.sh`.
-
-```
-export MASTER=yarn-client
-export HADOOP_CONF_DIR=[your_hadoop_conf_path]
-export SPARK_HOME=[your_spark_home_path]
-```
-
-`HADOOP_CONF_DIR`(Hadoop configuration path) is defined in `/scripts/docker/spark-cluster-managers/cdh/hdfs_conf`.
-
-Don't forget to set Spark `master` as `yarn-client` in Zeppelin **Interpreters** setting page like below.
-
-<img src="../assets/themes/zeppelin/img/docs-img/zeppelin_yarn_conf.png" />
-
-### 5. Run Zeppelin with Spark interpreter
-After running a single paragraph with Spark interpreter in Zeppelin,
-
-<img src="../assets/themes/zeppelin/img/docs-img/zeppelin_with_cdh.png" />
-
-<br/>
-
-browse `http://<hostname>:8088/cluster/apps` to check Zeppelin application is running well or not.
-
-<img src="../assets/themes/zeppelin/img/docs-img/cdh_yarn_applications.png" />
-

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4b6d3e55/docs/install/configuration.md
----------------------------------------------------------------------
diff --git a/docs/install/configuration.md b/docs/install/configuration.md
deleted file mode 100644
index ca55397..0000000
--- a/docs/install/configuration.md
+++ /dev/null
@@ -1,445 +0,0 @@
----
-layout: page
-title: "Apache Zeppelin Configuration"
-description: "This page will guide you to configure Apache Zeppelin using either environment variables or Java properties. Also, you can configure SSL for Zeppelin."
-group: install
----
-<!--
-Licensed 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.
--->
-{% include JB/setup %}
-
-# Apache Zeppelin Configuration
-
-<div id="toc"></div>
-
-## Zeppelin Properties
-There are two locations you can configure Apache Zeppelin.
-
-* **Environment variables** can be defined `conf/zeppelin-env.sh`(`conf\zeppelin-env.cmd` for Windows).
-* **Java properties** can ba defined in `conf/zeppelin-site.xml`.
-
-If both are defined, then the **environment variables** will take priority.
-> Mouse hover on each property and click <i class="fa fa-link fa-flip-horizontal"></i> then you can get a link for that.
-
-<table class="table-configuration">
-  <tr>
-    <th>zeppelin-env.sh</th>
-    <th>zeppelin-site.xml</th>
-    <th>Default value</th>
-    <th class="col-md-4">Description</th>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_PORT</h6></td>
-    <td><h6 class="properties">zeppelin.server.port</h6></td>
-    <td>8080</td>
-    <td>Zeppelin server port </br>
-      <span style="font-style:italic; color: gray"> Note: Please make sure you're not using the same port with
-      <a href="https://zeppelin.apache.org/contribution/webapplication.html#dev-mode" target="_blank">Zeppelin web application development port</a> (default: 9000).</span></td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_SSL_PORT</h6></td>
-    <td><h6 class="properties">zeppelin.server.ssl.port</h6></td>
-    <td>8443</td>
-    <td>Zeppelin Server ssl port (used when ssl environment/property is set to true)</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_MEM</h6></td>
-    <td>N/A</td>
-    <td>-Xmx1024m -XX:MaxPermSize=512m</td>
-    <td>JVM mem options</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_INTP_MEM</h6></td>
-    <td>N/A</td>
-    <td>ZEPPELIN_MEM</td>
-    <td>JVM mem options for interpreter process</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_JAVA_OPTS</h6></td>
-    <td>N/A</td>
-    <td></td>
-    <td>JVM options</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_ALLOWED_ORIGINS</h6></td>
-    <td><h6 class="properties">zeppelin.server.allowed.origins</h6></td>
-    <td>*</td>
-    <td>Enables a way to specify a ',' separated list of allowed origins for REST and websockets. <br /> e.g. http://localhost:8080</td>
-  </tr>
-    <tr>
-    <td>N/A</td>
-    <td><h6 class="properties">zeppelin.anonymous.allowed</h6></td>
-    <td>true</td>
-    <td>The anonymous user is allowed by default.</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_SERVER_CONTEXT_PATH</h6></td>
-    <td><h6 class="properties">zeppelin.server.context.path</h6></td>
-    <td>/</td>
-    <td>Context path of the web application</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_SSL</h6></td>
-    <td><h6 class="properties">zeppelin.ssl</h6></td>
-    <td>false</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_SSL_CLIENT_AUTH</h6></td>
-    <td><h6 class="properties">zeppelin.ssl.client.auth</h6></td>
-    <td>false</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_SSL_KEYSTORE_PATH</h6></td>
-    <td><h6 class="properties">zeppelin.ssl.keystore.path</h6></td>
-    <td>keystore</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_SSL_KEYSTORE_TYPE</h6></td>
-    <td><h6 class="properties">zeppelin.ssl.keystore.type</h6></td>
-    <td>JKS</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_SSL_KEYSTORE_PASSWORD</h6></td>
-    <td><h6 class="properties">zeppelin.ssl.keystore.password</h6></td>
-    <td></td>
-    <td></td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_SSL_KEY_MANAGER_PASSWORD</h6></td>
-    <td><h6 class="properties">zeppelin.ssl.key.manager.password</h6></td>
-    <td></td>
-    <td></td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_SSL_TRUSTSTORE_PATH</h6></td>
-    <td><h6 class="properties">zeppelin.ssl.truststore.path</h6></td>
-    <td></td>
-    <td></td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_SSL_TRUSTSTORE_TYPE</h6></td>
-    <td><h6 class="properties">zeppelin.ssl.truststore.type</h6></td>
-    <td></td>
-    <td></td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_SSL_TRUSTSTORE_PASSWORD</h6></td>
-    <td><h6 class="properties">zeppelin.ssl.truststore.password</h6></td>
-    <td></td>
-    <td></td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_NOTEBOOK_HOMESCREEN</h6></td>
-    <td><h6 class="properties">zeppelin.notebook.homescreen</h6></td>
-    <td></td>
-    <td>Display note IDs on the Apache Zeppelin homescreen <br />e.g. 2A94M5J1Z</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_NOTEBOOK_HOMESCREEN_HIDE</h6></td>
-    <td><h6 class="properties">zeppelin.notebook.homescreen.hide</h6></td>
-    <td>false</td>
-    <td>Hide the note ID set by <code>ZEPPELIN_NOTEBOOK_HOMESCREEN</code> on the Apache Zeppelin homescreen. <br />For the further information, please read <a href="../manual/notebookashomepage.html">Customize your Zeppelin homepage</a>.</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_WAR_TEMPDIR</h6></td>
-    <td><h6 class="properties">zeppelin.war.tempdir</h6></td>
-    <td>webapps</td>
-    <td>Location of the jetty temporary directory</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_NOTEBOOK_DIR</h6></td>
-    <td><h6 class="properties">zeppelin.notebook.dir</h6></td>
-    <td>notebook</td>
-    <td>The root directory where notebook directories are saved</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_NOTEBOOK_S3_BUCKET</h6></td>
-    <td><h6 class="properties">zeppelin.notebook.s3.bucket</h6></td>
-    <td>zeppelin</td>
-    <td>S3 Bucket where notebook files will be saved</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_NOTEBOOK_S3_USER</h6></td>
-    <td><h6 class="properties">zeppelin.notebook.s3.user</h6></td>
-    <td>user</td>
-    <td>User name of an S3 bucket<br />e.g. <code>bucket/user/notebook/2A94M5J1Z/note.json</code></td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_NOTEBOOK_S3_ENDPOINT</h6></td>
-    <td><h6 class="properties">zeppelin.notebook.s3.endpoint</h6></td>
-    <td>s3.amazonaws.com</td>
-    <td>Endpoint for the bucket</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_NOTEBOOK_S3_KMS_KEY_ID</h6></td>
-    <td><h6 class="properties">zeppelin.notebook.s3.kmsKeyID</h6></td>
-    <td></td>
-    <td>AWS KMS Key ID to use for encrypting data in S3 (optional)</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_NOTEBOOK_S3_EMP</h6></td>
-    <td><h6 class="properties">zeppelin.notebook.s3.encryptionMaterialsProvider</h6></td>
-    <td></td>
-    <td>Class name of a custom S3 encryption materials provider implementation to use for encrypting data in S3 (optional)</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_NOTEBOOK_S3_SSE</h6></td>
-    <td><h6 class="properties">zeppelin.notebook.s3.sse</h6></td>
-    <td>false</td>
-    <td>Save notebooks to S3 with server-side encryption enabled</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_NOTEBOOK_AZURE_CONNECTION_STRING</h6></td>
-    <td><h6 class="properties">zeppelin.notebook.azure.connectionString</h6></td>
-    <td></td>
-    <td>The Azure storage account connection string<br />e.g. <br/><code>DefaultEndpointsProtocol=https;<br/>AccountName=&lt;accountName&gt;;<br/>AccountKey=&lt;accountKey&gt;</code></td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_NOTEBOOK_AZURE_SHARE</h6></td>
-    <td><h6 class="properties">zeppelin.notebook.azure.share</h6></td>
-    <td>zeppelin</td>
-    <td>Azure Share where the notebook files will be saved</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_NOTEBOOK_AZURE_USER</h6></td>
-    <td><h6 class="properties">zeppelin.notebook.azure.user</h6></td>
-    <td>user</td>
-    <td>Optional user name of an Azure file share<br />e.g. <code>share/user/notebook/2A94M5J1Z/note.json</code></td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_NOTEBOOK_STORAGE</h6></td>
-    <td><h6 class="properties">zeppelin.notebook.storage</h6></td>
-    <td>org.apache.zeppelin.notebook.repo.GitNotebookRepo</td>
-    <td>Comma separated list of notebook storage locations</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_NOTEBOOK_ONE_WAY_SYNC</h6></td>
-    <td><h6 class="properties">zeppelin.notebook.one.way.sync</h6></td>
-    <td>false</td>
-    <td>If there are multiple notebook storage locations, should we treat the first one as the only source of truth?</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_NOTEBOOK_PUBLIC</h6></td>
-    <td><h6 class="properties">zeppelin.notebook.public</h6></td>
-    <td>true</td>
-    <td>Make notebook public (set only <code>owners</code>) by default when created/imported. If set to <code>false</code> will add <code>user</code> to <code>readers</code> and <code>writers</code> as well, making it private and invisible to other users unless permissions are granted.</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_INTERPRETERS</h6></td>
-    <td><h6 class="properties">zeppelin.interpreters</h6></td>
-  <description></description>
-    <td>org.apache.zeppelin.spark.SparkInterpreter,<br />org.apache.zeppelin.spark.PySparkInterpreter,<br />org.apache.zeppelin.spark.SparkSqlInterpreter,<br />org.apache.zeppelin.spark.DepInterpreter,<br />org.apache.zeppelin.markdown.Markdown,<br />org.apache.zeppelin.shell.ShellInterpreter,<br />
-    ...
-    </td>
-    <td>
-      Comma separated interpreter configurations [Class] <br/><br />
-      <span style="font-style:italic; color: gray">NOTE: This property is deprecated since Zeppelin-0.6.0 and will not be supported from Zeppelin-0.7.0.</span>
-    </td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_INTERPRETER_DIR</h6></td>
-    <td><h6 class="properties">zeppelin.interpreter.dir</h6></td>
-    <td>interpreter</td>
-    <td>Interpreter directory</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_INTERPRETER_DEP_MVNREPO</h6></td>
-    <td><h6 class="properties">zeppelin.interpreter.dep.mvnRepo</h6></td>
-    <td>http://repo1.maven.org/maven2/</td>
-    <td>Remote principal repository for interpreter's additional dependency loading</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_INTERPRETER_OUTPUT_LIMIT</h6></td>
-    <td><h6 class="properties">zeppelin.interpreter.output.limit</h6></td>
-    <td>102400</td>
-    <td>Output message from interpreter exceeding the limit will be truncated</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_INTERPRETER_CONNECT_TIMEOUT</h6></td>
-    <td><h6 class="properties">zeppelin.interpreter.connect.timeout</h6></td>
-    <td>30000</td>
-    <td>Output message from interpreter exceeding the limit will be truncated</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_DEP_LOCALREPO</h6></td>
-    <td><h6 class="properties">zeppelin.dep.localrepo</h6></td>
-    <td>local-repo</td>
-    <td>Local repository for dependency loader.<br>ex)visualiztion modules of npm.</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_HELIUM_NODE_INSTALLER_URL</h6></td>
-    <td><h6 class="properties">zeppelin.helium.node.installer.url</h6></td>
-    <td>https://nodejs.org/dist/</td>
-    <td>Remote Node installer url for Helium dependency loader</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_HELIUM_NPM_INSTALLER_URL</h6></td>
-    <td><h6 class="properties">zeppelin.helium.npm.installer.url</h6></td>
-    <td>http://registry.npmjs.org/</td>
-    <td>Remote Npm installer url for Helium dependency loader</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_HELIUM_YARNPKG_INSTALLER_URL</h6></td>
-    <td><h6 class="properties">zeppelin.helium.yarnpkg.installer.url</h6></td>
-    <td>https://github.com/yarnpkg/yarn/releases/download/</td>
-    <td>Remote Yarn package installer url for Helium dependency loader</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_WEBSOCKET_MAX_TEXT_MESSAGE_SIZE</h6></td>
-    <td><h6 class="properties">zeppelin.websocket.max.text.message.size</h6></td>
-    <td>1024000</td>
-    <td>Size(in characters) of the maximum text message that can be received by websocket.</td>
-  </tr>
-  <tr>
-    <td><h6 class="properties">ZEPPELIN_SERVER_DEFAULT_DIR_ALLOWED</h6></td>
-    <td><h6 class="properties">zeppelin.server.default.dir.allowed</h6></td>
-    <td>false</td>
-    <td>Enable directory listings on server.</td>
-  </tr>
-</table>
-
-
-## SSL Configuration
-
-Enabling SSL requires a few configuration changes. First, you need to create certificates and then update necessary configurations to enable server side SSL and/or client side certificate authentication.
-
-### Creating and configuring the Certificates
-
-Information how about to generate certificates and a keystore can be found [here](https://wiki.eclipse.org/Jetty/Howto/Configure_SSL).
-
-A condensed example can be found in the top answer to this [StackOverflow post](http://stackoverflow.com/questions/4008837/configure-ssl-on-jetty).
-
-The keystore holds the private key and certificate on the server end. The trustore holds the trusted client certificates. Be sure that the path and password for these two stores are correctly configured in the password fields below. They can be obfuscated using the Jetty password tool. After Maven pulls in all the dependency to build Zeppelin, one of the Jetty jars contain the Password tool. Invoke this command from the Zeppelin home build directory with the appropriate version, user, and password.
-
-```
-java -cp ./zeppelin-server/target/lib/jetty-all-server-<version>.jar org.eclipse.jetty.util.security.Password <user> <password>
-```
-
-If you are using a self-signed, a certificate signed by an untrusted CA, or if client authentication is enabled, then the client must have a browser create exceptions for both the normal HTTPS port and WebSocket port. This can by done by trying to establish an HTTPS connection to both ports in a browser (e.g. if the ports are 443 and 8443, then visit https://127.0.0.1:443 and https://127.0.0.1:8443). This step can be skipped if the server certificate is signed by a trusted CA and client auth is disabled.
-
-### Configuring server side SSL
-
-The following properties needs to be updated in the `zeppelin-site.xml` in order to enable server side SSL.
-
-```
-<property>
-  <name>zeppelin.server.ssl.port</name>
-  <value>8443</value>
-  <description>Server ssl port. (used when ssl property is set to true)</description>
-</property>
-
-<property>
-  <name>zeppelin.ssl</name>
-  <value>true</value>
-  <description>Should SSL be used by the servers?</description>
-</property>
-
-<property>
-  <name>zeppelin.ssl.keystore.path</name>
-  <value>keystore</value>
-  <description>Path to keystore relative to Zeppelin configuration directory</description>
-</property>
-
-<property>
-  <name>zeppelin.ssl.keystore.type</name>
-  <value>JKS</value>
-  <description>The format of the given keystore (e.g. JKS or PKCS12)</description>
-</property>
-
-<property>
-  <name>zeppelin.ssl.keystore.password</name>
-  <value>change me</value>
-  <description>Keystore password. Can be obfuscated by the Jetty Password tool</description>
-</property>
-
-<property>
-  <name>zeppelin.ssl.key.manager.password</name>
-  <value>change me</value>
-  <description>Key Manager password. Defaults to keystore password. Can be obfuscated.</description>
-</property>
-```
-
-
-### Enabling client side certificate authentication
-
-The following properties needs to be updated in the `zeppelin-site.xml` in order to enable client side certificate authentication.
-
-```
-<property>
-  <name>zeppelin.server.ssl.port</name>
-  <value>8443</value>
-  <description>Server ssl port. (used when ssl property is set to true)</description>
-</property>
-
-<property>
-  <name>zeppelin.ssl.client.auth</name>
-  <value>true</value>
-  <description>Should client authentication be used for SSL connections?</description>
-</property>
-
-<property>
-  <name>zeppelin.ssl.truststore.path</name>
-  <value>truststore</value>
-  <description>Path to truststore relative to Zeppelin configuration directory. Defaults to the keystore path</description>
-</property>
-
-<property>
-  <name>zeppelin.ssl.truststore.type</name>
-  <value>JKS</value>
-  <description>The format of the given truststore (e.g. JKS or PKCS12). Defaults to the same type as the keystore type</description>
-</property>
-
-<property>
-  <name>zeppelin.ssl.truststore.password</name>
-  <value>change me</value>
-  <description>Truststore password. Can be obfuscated by the Jetty Password tool. Defaults to the keystore password</description>
-</property>
-```
-
-
-### Obfuscating Passwords using the Jetty Password Tool
-
-Security best practices advise to not use plain text passwords and Jetty provides a password tool to help obfuscating the passwords used to access the KeyStore and TrustStore.
-
-The Password tool documentation can be found [here](http://www.eclipse.org/jetty/documentation/current/configuring-security-secure-passwords.html).
-
-After using the tool:
-
-```
-java -cp $ZEPPELIN_HOME/zeppelin-server/target/lib/jetty-util-9.2.15.v20160210.jar \
-         org.eclipse.jetty.util.security.Password  \
-         password
-
-2016-12-15 10:46:47.931:INFO::main: Logging initialized @101ms
-password
-OBF:1v2j1uum1xtv1zej1zer1xtn1uvk1v1v
-MD5:5f4dcc3b5aa765d61d8327deb882cf99
-```
-
-update your configuration with the obfuscated password :
-
-```
-<property>
-  <name>zeppelin.ssl.keystore.password</name>
-  <value>OBF:1v2j1uum1xtv1zej1zer1xtn1uvk1v1v</value>
-  <description>Keystore password. Can be obfuscated by the Jetty Password tool</description>
-</property>
-```
-
-
-**Note:** After updating these configurations, Zeppelin server needs to be restarted.

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4b6d3e55/docs/install/docker.md
----------------------------------------------------------------------
diff --git a/docs/install/docker.md b/docs/install/docker.md
deleted file mode 100644
index 6b1309a..0000000
--- a/docs/install/docker.md
+++ /dev/null
@@ -1,61 +0,0 @@
----
-layout: page
-title: "Apache Zeppelin Releases Docker Images"
-description: "This document contains instructions about making docker containers for Zeppelin. It mainly provides guidance into how to create, publish and run docker images for zeppelin releases."
-group: install
----
-<!--
-Licensed 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.
--->
-{% include JB/setup %}
-
-# Docker Image for Apache Zeppelin Releases 
-
-<div id="toc"></div>
-
-## Overview 
-This document contains instructions about making docker containers for Zeppelin. It mainly provides guidance into how to create, publish and run docker images for zeppelin releases.
-
-## Quick Start
-
-### Installing Docker
-You need to [install docker](https://docs.docker.com/engine/installation/) on your machine.
-
-### Running docker image
-
-```
-docker run -p 8080:8080 --rm --name zeppelin apache/zeppelin:<release-version> 
-```
-
-* Zeppelin will run at `http://localhost:8080`.
-
-If you want to specify `logs` and `notebook` dir, 
-
-```
-docker run -p 8080:8080 --rm \
--v $PWD/logs:/logs \
--v $PWD/notebook:/notebook \
--e ZEPPELIN_LOG_DIR='/logs' \
--e ZEPPELIN_NOTEBOOK_DIR='/notebook' \
---name zeppelin apache/zeppelin:<release-version> # e.g '0.7.1'
-```
-
-### Building dockerfile locally
-
-```
-cd $ZEPPELIN_HOME
-cd scripts/docker/zeppelin/bin
-
-docker build -t my-zeppelin:my-tag ./
-```
-

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4b6d3e55/docs/install/install.md
----------------------------------------------------------------------
diff --git a/docs/install/install.md b/docs/install/install.md
deleted file mode 100644
index 5064993..0000000
--- a/docs/install/install.md
+++ /dev/null
@@ -1,158 +0,0 @@
----
-layout: page
-title: "Quick Start"
-description: "This page will help you get started and will guide you through installing Apache Zeppelin and running it in the command line."
-group: install
----
-<!--
-Licensed 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.
--->
-{% include JB/setup %}
-
-# Quick Start
-
-<div id="toc"></div>
-
-Welcome to Apache Zeppelin! On this page are instructions to help you get started.
-
-## Installation
-
-Apache Zeppelin officially supports and is tested on the following environments:
-
-<table class="table-configuration">
-  <tr>
-    <th>Name</th>
-    <th>Value</th>
-  </tr>
-  <tr>
-    <td>Oracle JDK</td>
-    <td>1.7 <br /> (set <code>JAVA_HOME</code>)</td>
-  </tr>
-  <tr>
-    <td>OS</td>
-    <td>Mac OSX <br /> Ubuntu 14.X <br /> CentOS 6.X <br /> Windows 7 Pro SP1</td>
-  </tr>
-</table>
-
-### Downloading Binary Package
-
-Two binary packages are available on the [Apache Zeppelin Download Page](http://zeppelin.apache.org/download.html). Only difference between these two binaries is interpreters are included in the package file.
-
-- #### Package with `all` interpreters.
-
-  Just unpack it in a directory of your choice and you're ready to go.
-
-- #### Package with `net-install` interpreters.
-
-  Unpack and follow [install additional interpreters](../manual/interpreterinstallation.html) to install interpreters. If you're unsure, just run `./bin/install-interpreter.sh --all` and install all interpreters.
-
-## Starting Apache Zeppelin
-
-#### Starting Apache Zeppelin from the Command Line
-
-On all unix like platforms:
-
-```
-bin/zeppelin-daemon.sh start
-```
-
-If you are on Windows:
-
-```
-bin\zeppelin.cmd
-```
-
-After Zeppelin has started successfully, go to [http://localhost:8080](http://localhost:8080) with your web browser.
-
-#### Stopping Zeppelin
-
-```
-bin/zeppelin-daemon.sh stop
-```
-
-#### Start Apache Zeppelin with a service manager
-
-> **Note :** The below description was written based on Ubuntu Linux.
-
-Apache Zeppelin can be auto-started as a service with an init script, using a service manager like **upstart**.
-
-This is an example upstart script saved as `/etc/init/zeppelin.conf`
-This allows the service to be managed with commands such as
-
-```
-sudo service zeppelin start  
-sudo service zeppelin stop  
-sudo service zeppelin restart
-```
-
-Other service managers could use a similar approach with the `upstart` argument passed to the `zeppelin-daemon.sh` script.
-
-```
-bin/zeppelin-daemon.sh upstart
-```
-
-**zeppelin.conf**
-
-```
-description "zeppelin"
-
-start on (local-filesystems and net-device-up IFACE!=lo)
-stop on shutdown
-
-# Respawn the process on unexpected termination
-respawn
-
-# respawn the job up to 7 times within a 5 second period.
-# If the job exceeds these values, it will be stopped and marked as failed.
-respawn limit 7 5
-
-# zeppelin was installed in /usr/share/zeppelin in this example
-chdir /usr/share/zeppelin
-exec bin/zeppelin-daemon.sh upstart
-```
-
-
-## Next Steps
-
-Congratulations, you have successfully installed Apache Zeppelin! Here are few steps you might find useful:
-
-#### New to Apache Zeppelin...
- * For an in-depth overview, head to [Explore Apache Zeppelin UI](../quickstart/explorezeppelinui.html).
- * And then, try run [tutorial](http://localhost:8080/#/notebook/2A94M5J1Z) notebook in your Zeppelin.
- * And see how to change [configurations](./configuration.html) like port number, etc.
-
-#### Zeppelin with Apache Spark ...
- * To know more about deep integration with [Apache Spark](http://spark.apache.org/), check [Spark Interpreter](../interpreter/spark.html).
-
-#### Zeppelin with JDBC data sources ...
- * Check [JDBC Interpreter](../interpreter/jdbc.html) to know more about configure and uses multiple JDBC data sources.
-
-#### Zeppelin with Python ...
- * Check [Python interpreter](../interpreter/python.html) to know more about Matplotlib, Pandas, Conda/Docker environment integration.
-
-
-#### Multi-user environment ...
- * Turn on [authentication](../security/shiroauthentication.html).
- * Manage your [notebook permission](../security/notebook_authorization.html).
- * For more informations, go to **More** -> **Security** section.
-
-#### Other useful information ...
- * Learn how [Display System](../displaysystem/basicdisplaysystem.html) works.
- * Use [Service Manager](#start-apache-zeppelin-with-a-service-manager) to start Zeppelin.
- * If you're using previous version please see [Upgrade Zeppelin version](./upgrade.html).
-
-
-## Building Apache Zeppelin from Source
-
-If you want to build from source instead of using binary package, follow the instructions [here](./build.html).
-

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4b6d3e55/docs/install/spark_cluster_mode.md
----------------------------------------------------------------------
diff --git a/docs/install/spark_cluster_mode.md b/docs/install/spark_cluster_mode.md
deleted file mode 100644
index 36ba6f7..0000000
--- a/docs/install/spark_cluster_mode.md
+++ /dev/null
@@ -1,237 +0,0 @@
----
-layout: page
-title: "Apache Zeppelin on Spark cluster mode"
-description: "This document will guide you how you can build and configure the environment on 3 types of Spark cluster manager(Standalone, Hadoop Yarn, Apache Mesos) with Apache Zeppelin using docker scripts."
-group: install
----
-<!--
-Licensed 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.
--->
-{% include JB/setup %}
-
-# Apache Zeppelin on Spark Cluster Mode
-
-<div id="toc"></div>
-
-## Overview
-[Apache Spark](http://spark.apache.org/) has supported three cluster manager types([Standalone](http://spark.apache.org/docs/latest/spark-standalone.html), [Apache Mesos](http://spark.apache.org/docs/latest/running-on-mesos.html) and [Hadoop YARN](http://spark.apache.org/docs/latest/running-on-yarn.html)) so far.
-This document will guide you how you can build and configure the environment on 3 types of Spark cluster manager with Apache Zeppelin using [Docker](https://www.docker.com/) scripts.
-So [install docker](https://docs.docker.com/engine/installation/) on the machine first.
-
-## Spark standalone mode
-[Spark standalone](http://spark.apache.org/docs/latest/spark-standalone.html) is a simple cluster manager included with Spark that makes it easy to set up a cluster.
-You can simply set up Spark standalone environment with below steps.
-
-> **Note :** Since Apache Zeppelin and Spark use same `8080` port for their web UI, you might need to change `zeppelin.server.port` in `conf/zeppelin-site.xml`.
-
-
-### 1. Build Docker file
-You can find docker script files under `scripts/docker/spark-cluster-managers`.
-
-```
-cd $ZEPPELIN_HOME/scripts/docker/spark-cluster-managers/spark_standalone
-docker build -t "spark_standalone" .
-```
-
-### 2. Run docker
-
-```
-docker run -it \
--p 8080:8080 \
--p 7077:7077 \
--p 8888:8888 \
--p 8081:8081 \
--h sparkmaster \
---name spark_standalone \
-spark_standalone bash;
-```
-
-Note that `sparkmaster` hostname used here to run docker container should be defined in your `/etc/hosts`.
-
-### 3. Configure Spark interpreter in Zeppelin
-Set Spark master as `spark://<hostname>:7077` in Zeppelin **Interpreters** setting page.
-
-<img src="../assets/themes/zeppelin/img/docs-img/standalone_conf.png" />
-
-### 4. Run Zeppelin with Spark interpreter
-After running single paragraph with Spark interpreter in Zeppelin, browse `https://<hostname>:8080` and check whether Spark cluster is running well or not.
-
-<img src="../assets/themes/zeppelin/img/docs-img/spark_ui.png" />
-
-You can also simply verify that Spark is running well in Docker with below command.
-
-```
-ps -ef | grep spark
-```
-
-
-## Spark on YARN mode
-You can simply set up [Spark on YARN](http://spark.apache.org/docs/latest/running-on-yarn.html) docker environment with below steps.
-
-> **Note :** Since Apache Zeppelin and Spark use same `8080` port for their web UI, you might need to change `zeppelin.server.port` in `conf/zeppelin-site.xml`.
-
-### 1. Build Docker file
-You can find docker script files under `scripts/docker/spark-cluster-managers`.
-
-```
-cd $ZEPPELIN_HOME/scripts/docker/spark-cluster-managers/spark_yarn_cluster
-docker build -t "spark_yarn" .
-```
-
-### 2. Run docker
-
-```
-docker run -it \
- -p 5000:5000 \
- -p 9000:9000 \
- -p 9001:9001 \
- -p 8088:8088 \
- -p 8042:8042 \
- -p 8030:8030 \
- -p 8031:8031 \
- -p 8032:8032 \
- -p 8033:8033 \
- -p 8080:8080 \
- -p 7077:7077 \
- -p 8888:8888 \
- -p 8081:8081 \
- -p 50010:50010 \
- -p 50075:50075 \
- -p 50020:50020 \
- -p 50070:50070 \
- --name spark_yarn \
- -h sparkmaster \
- spark_yarn bash;
-```
-
-Note that `sparkmaster` hostname used here to run docker container should be defined in your `/etc/hosts`.
-
-### 3. Verify running Spark on YARN.
-
-You can simply verify the processes of Spark and YARN are running well in Docker with below command.
-
-```
-ps -ef
-```
-
-You can also check each application web UI for HDFS on `http://<hostname>:50070/`, YARN on `http://<hostname>:8088/cluster` and Spark on `http://<hostname>:8080/`.
-
-### 4. Configure Spark interpreter in Zeppelin
-Set following configurations to `conf/zeppelin-env.sh`.
-
-```
-export MASTER=yarn-client
-export HADOOP_CONF_DIR=[your_hadoop_conf_path]
-export SPARK_HOME=[your_spark_home_path]
-```
-
-`HADOOP_CONF_DIR`(Hadoop configuration path) is defined in `/scripts/docker/spark-cluster-managers/spark_yarn_cluster/hdfs_conf`.
-
-Don't forget to set Spark `master` as `yarn-client` in Zeppelin **Interpreters** setting page like below.
-
-<img src="../assets/themes/zeppelin/img/docs-img/zeppelin_yarn_conf.png" />
-
-### 5. Run Zeppelin with Spark interpreter
-After running a single paragraph with Spark interpreter in Zeppelin, browse `http://<hostname>:8088/cluster/apps` and check Zeppelin application is running well or not.
-
-<img src="../assets/themes/zeppelin/img/docs-img/yarn_applications.png" />
-
-
-
-## Spark on Mesos mode
-You can simply set up [Spark on Mesos](http://spark.apache.org/docs/latest/running-on-mesos.html) docker environment with below steps.
-
-
-### 1. Build Docker file
-
-```
-cd $ZEPPELIN_HOME/scripts/docker/spark-cluster-managers/spark_mesos
-docker build -t "spark_mesos" .
-```
-
-
-### 2. Run docker
-
-```
-docker run --net=host -it \
--p 8080:8080 \
--p 7077:7077 \
--p 8888:8888 \
--p 8081:8081 \
--p 8082:8082 \
--p 5050:5050 \
--p 5051:5051 \
--p 4040:4040 \
--h sparkmaster \
---name spark_mesos \
-spark_mesos bash;
-```
-
-Note that `sparkmaster` hostname used here to run docker container should be defined in your `/etc/hosts`.
-
-### 3. Verify running Spark on Mesos.
-
-You can simply verify the processes of Spark and Mesos are running well in Docker with below command.
-
-```
-ps -ef
-```
-
-You can also check each application web UI for Mesos on `http://<hostname>:5050/cluster` and Spark on `http://<hostname>:8080/`.
-
-
-### 4. Configure Spark interpreter in Zeppelin
-
-```
-export MASTER=mesos://127.0.1.1:5050
-export MESOS_NATIVE_JAVA_LIBRARY=[PATH OF libmesos.so]
-export SPARK_HOME=[PATH OF SPARK HOME]
-```
-
-
-Don't forget to set Spark `master` as `mesos://127.0.1.1:5050` in Zeppelin **Interpreters** setting page like below.
-
-<img src="../assets/themes/zeppelin/img/docs-img/zeppelin_mesos_conf.png" />
-
-
-### 5. Run Zeppelin with Spark interpreter
-After running a single paragraph with Spark interpreter in Zeppelin, browse `http://<hostname>:5050/#/frameworks` and check Zeppelin application is running well or not.
-
-<img src="../assets/themes/zeppelin/img/docs-img/mesos_frameworks.png" />
-
-### Troubleshooting for Spark on Mesos
-
-- If you have problem with hostname, use `--add-host` option when executing `dockerrun`
-
-```
-## use `--add-host=moby:127.0.0.1` option to resolve
-## since docker container couldn't resolve `moby`
-
-: java.net.UnknownHostException: moby: moby: Name or service not known
-        at java.net.InetAddress.getLocalHost(InetAddress.java:1496)
-        at org.apache.spark.util.Utils$.findLocalInetAddress(Utils.scala:789)
-        at org.apache.spark.util.Utils$.org$apache$spark$util$Utils$$localIpAddress$lzycompute(Utils.scala:782)
-        at org.apache.spark.util.Utils$.org$apache$spark$util$Utils$$localIpAddress(Utils.scala:782)
-```
-
-- If you have problem with mesos master, try `mesos://127.0.0.1` instead of `mesos://127.0.1.1`
-
-```
-I0103 20:17:22.329269   340 sched.cpp:330] New master detected at master@127.0.1.1:5050
-I0103 20:17:22.330749   340 sched.cpp:341] No credentials provided. Attempting to register without authentication
-W0103 20:17:22.333531   340 sched.cpp:736] Ignoring framework registered message because it was sentfrom 'master@127.0.0.1:5050' instead of the leading master 'master@127.0.1.1:5050'
-W0103 20:17:24.040252   339 sched.cpp:736] Ignoring framework registered message because it was sentfrom 'master@127.0.0.1:5050' instead of the leading master 'master@127.0.1.1:5050'
-W0103 20:17:26.150250   339 sched.cpp:736] Ignoring framework registered message because it was sentfrom 'master@127.0.0.1:5050' instead of the leading master 'master@127.0.1.1:5050'
-W0103 20:17:26.737604   339 sched.cpp:736] Ignoring framework registered message because it was sentfrom 'master@127.0.0.1:5050' instead of the leading master 'master@127.0.1.1:5050'
-W0103 20:17:35.241714   336 sched.cpp:736] Ignoring framework registered message because it was sentfrom 'master@127.0.0.1:5050' instead of the leading master 'master@127.0.1.1:5050'
-```
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4b6d3e55/docs/install/upgrade.md
----------------------------------------------------------------------
diff --git a/docs/install/upgrade.md b/docs/install/upgrade.md
deleted file mode 100644
index 61d2d68..0000000
--- a/docs/install/upgrade.md
+++ /dev/null
@@ -1,63 +0,0 @@
----
-layout: page
-title: "Manual Zeppelin version upgrade procedure"
-description: "This document will guide you through a procedure of manual upgrade your Apache Zeppelin instance to a newer version. Apache Zeppelin keeps backward compatibility for the notebook file format."
-group: install
----
-<!--
-Licensed 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.
--->
-{% include JB/setup %}
-
-# Manual upgrade procedure for Zeppelin
-
-<div id="toc"></div>
-
-Basically, newer version of Zeppelin works with previous version notebook directory and configurations.
-So, copying `notebook` and `conf` directory should be enough.
-
-## Instructions
-1. Stop Zeppelin
-
-    ```
-    bin/zeppelin-daemon.sh stop
-    ```
-
-1. Copy your `notebook` and `conf` directory into a backup directory
-
-1. Download newer version of Zeppelin and Install. See [Install page](./install.html#installation).
-
-1. Copy backup `notebook` and `conf` directory into newer version of Zeppelin `notebook` and `conf` directory
-
-1. Start Zeppelin
-
-   ```
-   bin/zeppelin-daemon.sh start
-   ```
-
-## Migration Guide
-
-### Upgrading from Zeppelin 0.6 to 0.7
-
- - From 0.7, we don't use `ZEPPELIN_JAVA_OPTS` as default value of `ZEPPELIN_INTP_JAVA_OPTS` and also the same for `ZEPPELIN_MEM`/`ZEPPELIN_INTP_MEM`. If user want to configure the jvm opts of interpreter process, please set `ZEPPELIN_INTP_JAVA_OPTS` and `ZEPPELIN_INTP_MEM` explicitly. If you don't set `ZEPPELIN_INTP_MEM`, Zeppelin will set it to `-Xms1024m -Xmx1024m -XX:MaxPermSize=512m` by default.
- - Mapping from `%jdbc(prefix)` to `%prefix` is no longer available. Instead, you can use %[interpreter alias] with multiple interpreter setttings on GUI.
- - Usage of `ZEPPELIN_PORT` is not supported in ssl mode. Instead use `ZEPPELIN_SSL_PORT` to configure the ssl port. Value from `ZEPPELIN_PORT` is used only when `ZEPPELIN_SSL` is set to `false`.
- - The support on Spark 1.1.x to 1.3.x is deprecated.
- - From 0.7, we uses `pegdown` as the `markdown.parser.type` option for the `%md` interpreter. Rendered markdown might be different from what you expected
- - From 0.7 note.json format has been changed to support multiple outputs in a paragraph. Zeppelin will automatically convert old format to new format. 0.6 or lower version can read new note.json format but output will not be displayed. For the detail, see [ZEPPELIN-212](http://issues.apache.org/jira/browse/ZEPPELIN-212) and [pull request](https://github.com/apache/zeppelin/pull/1658).
- - From 0.7 note storage layer will utilize `GitNotebookRepo` by default instead of `VFSNotebookRepo` storage layer, which is an extension of latter one with versioning capabilities on top of it.
-
-### Upgrading from Zeppelin 0.7 to 0.8
-
- - From 0.8, we recommend to use `PYSPARK_PYTHON` and `PYSPARK_DRIVER_PYTHON` instead of `zeppelin.pyspark.python` as `zeppelin.pyspark.python` only effects driver. You can use `PYSPARK_PYTHON` and `PYSPARK_DRIVER_PYTHON` as using them in spark.
- - From 0.8, depending on your device, the keyboard shortcut `Ctrl-L` or `Command-L` which goes to the line somewhere user wants is not supported. 
\ No newline at end of file


Mime
View raw message