You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2018/06/13 10:18:20 UTC

[kylin] branch document updated (079ed11 -> 41a87af)

This is an automated email from the ASF dual-hosted git repository.

shaofengshi pushed a change to branch document
in repository https://gitbox.apache.org/repos/asf/kylin.git.


    from 079ed11  add tongji in header
     new 1dabe33  kylin webpages update
     new 41a87af  Refine document

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 website/_data/docs23.yml                           |   1 -
 .../howto/howto_build_cube_with_restapi.cn.md      |   4 +-
 website/_docs23/howto/howto_jdbc.md                |   2 +-
 website/_docs23/howto/howto_optimize_build.cn.md   |   2 +-
 website/_docs23/tutorial/Qlik.cn.md                |   2 +-
 website/_docs23/tutorial/acl.cn.md                 |   2 +-
 website/_docs23/tutorial/acl.md                    |   2 +-
 website/_docs23/tutorial/create_cube.cn.md         | 181 ++++++++++++++++-----
 website/_docs23/tutorial/create_cube.md            | 116 ++++++++-----
 website/_docs23/tutorial/cube_build_job.cn.md      |  40 +++--
 website/_docs23/tutorial/cube_build_job.md         |  16 +-
 website/_docs23/tutorial/kylin_client_tool.cn.md   |   2 +-
 website/_docs23/tutorial/odbc.cn.md                |   2 +-
 website/_docs23/tutorial/powerbi.cn.md             |   4 +-
 website/_docs23/tutorial/query_pushdown.cn.md      |   4 +-
 website/_docs23/tutorial/tableau.cn.md             |   2 +-
 website/_docs23/tutorial/tableau_91.cn.md          |   2 +-
 website/_docs23/tutorial/web.cn.md                 |  79 ++++-----
 website/_docs23/tutorial/web.md                    |  53 ++----
 .../1 action-build.png                             | Bin 179836 -> 20859 bytes
 .../10 cube-segment.png                            | Bin 149989 -> 19541 bytes
 .../3 date.PNG                                     | Bin 0 -> 11625 bytes
 .../4 jobs-page.png                                | Bin 143862 -> 21546 bytes
 .../5 job-progress.png                             | Bin 144015 -> 11496 bytes
 .../6 discard.png                                  | Bin 156756 -> 2671 bytes
 .../7 job-steps.png                                | Bin 243944 -> 63699 bytes
 .../8 hover-step.png                               | Bin 170826 -> 14046 bytes
 .../9 log-d.png                                    | Bin 213990 -> 34736 bytes
 .../9 log.png                                      | Bin 71393 -> 1020 bytes
 .../9 mrjob-d.png                                  | Bin 383848 -> 69751 bytes
 .../9 mrjob.png                                    | Bin 74037 -> 1559 bytes
 .../9 parameters-d.png                             | Bin 199314 -> 27031 bytes
 .../9 parameters.png                               | Bin 74876 -> 1952 bytes
 .../1 manage-prject.png                            | Bin 20645 -> 2052 bytes
 .../10 configuration.PNG                           | Bin 0 -> 11816 bytes
 .../Kylin-Cube-Creation-Tutorial/11 overview.PNG   | Bin 0 -> 7016 bytes
 .../Kylin-Cube-Creation-Tutorial/2 +project.png    | Bin 70968 -> 689 bytes
 .../Kylin-Cube-Creation-Tutorial/3 new-project.png | Bin 59611 -> 9367 bytes
 .../3.1 pj-created.png                             | Bin 51935 -> 7876 bytes
 .../Kylin-Cube-Creation-Tutorial/4 +table-tree.png | Bin 47857 -> 1986 bytes
 .../1.5/Kylin-Cube-Creation-Tutorial/4 +table.png  | Bin 46477 -> 1702 bytes
 .../5 hive-table-cardinality.png                   | Bin 130591 -> 30462 bytes
 .../5 hive-table-info.png                          | Bin 91887 -> 15214 bytes
 .../5 hive-table-tree.png                          | Bin 62040 -> 6376 bytes
 .../Kylin-Cube-Creation-Tutorial/5 hive-table.png  | Bin 53368 -> 9004 bytes
 .../1.5/Kylin-Cube-Creation-Tutorial/6 +model.png  | Bin 49263 -> 3565 bytes
 .../6 model-created.png                            | Bin 29384 -> 2404 bytes
 .../6 model-dimensions.png                         | Bin 123120 -> 7851 bytes
 .../6 model-fact-table.png                         | Bin 113046 -> 8111 bytes
 .../6 model-join-condition.png                     | Bin 118661 -> 4898 bytes
 .../6 model-lookup-table.png                       | Bin 111371 -> 20875 bytes
 .../6 model-measures.png                           | Bin 80940 -> 5147 bytes
 .../Kylin-Cube-Creation-Tutorial/6 model-name.png  | Bin 109929 -> 11940 bytes
 .../6 model-partition-column.png                   | Bin 82155 -> 19938 bytes
 .../7 cube-dimension-batch.png                     | Bin 99014 -> 25517 bytes
 .../Kylin-Cube-Creation-Tutorial/7 cube-info.png   | Bin 147909 -> 20239 bytes
 .../Kylin-Cube-Creation-Tutorial/7 new-cube.png    | Bin 36943 -> 3574 bytes
 .../Kylin-Cube-Creation-Tutorial/8 meas-+meas.png  | Bin 103579 -> 6571 bytes
 .../8 measure-count.png                            | Bin 59447 -> 6054 bytes
 .../8 measure-distinct.png                         | Bin 71554 -> 13579 bytes
 .../8 measure-extended_column.PNG                  | Bin 0 -> 12478 bytes
 .../Kylin-Cube-Creation-Tutorial/8 measure-max.png | Bin 64916 -> 9930 bytes
 .../Kylin-Cube-Creation-Tutorial/8 measure-min.png | Bin 65880 -> 9760 bytes
 .../8 measure-percentile.PNG                       | Bin 0 -> 8934 bytes
 .../Kylin-Cube-Creation-Tutorial/8 measure-sum.png | Bin 65951 -> 10880 bytes
 .../8 measure-topn.png                             | Bin 70942 -> 18803 bytes
 .../9 refresh-setting1.png                         | Bin 143698 -> 11082 bytes
 .../tutorial/1.5/Kylin-Web-Tutorial/1 login.png    | Bin 27793 -> 4577 bytes
 .../1.5/Kylin-Web-Tutorial/10 query-result.png     | Bin 79529 -> 25057 bytes
 .../1.5/Kylin-Web-Tutorial/11 save-query.png       | Bin 29373 -> 8418 bytes
 .../tutorial/1.5/Kylin-Web-Tutorial/12 general.png | Bin 26097 -> 10989 bytes
 .../tutorial/1.5/Kylin-Web-Tutorial/13 results.png | Bin 77124 -> 7938 bytes
 .../1.5/Kylin-Web-Tutorial/15 bar-chart.png        | Bin 79660 -> 133325 bytes
 .../tutorial/1.5/Kylin-Web-Tutorial/2 table.PNG    | Bin 0 -> 49621 bytes
 .../tutorial/1.5/Kylin-Web-Tutorial/3 cubes.png    | Bin 155306 -> 67739 bytes
 .../1.5/Kylin-Web-Tutorial/4 grid-view.PNG         | Bin 0 -> 26122 bytes
 .../tutorial/1.5/Kylin-Web-Tutorial/5 sql-view.png | Bin 171545 -> 29660 bytes
 .../tutorial/1.5/Kylin-Web-Tutorial/8 query.png    | Bin 191367 -> 22261 bytes
 .../1.5/Kylin-Web-Tutorial/9 query-table.png       | Bin 142843 -> 17085 bytes
 79 files changed, 299 insertions(+), 217 deletions(-)
 create mode 100644 website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/3 date.PNG
 create mode 100644 website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/10 configuration.PNG
 create mode 100644 website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/11 overview.PNG
 create mode 100644 website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-extended_column.PNG
 create mode 100644 website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-percentile.PNG
 create mode 100644 website/images/tutorial/1.5/Kylin-Web-Tutorial/2 table.PNG
 create mode 100644 website/images/tutorial/1.5/Kylin-Web-Tutorial/4 grid-view.PNG

-- 
To stop receiving notification emails like this one, please contact
shaofengshi@apache.org.

[kylin] 01/02: kylin webpages update

Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

shaofengshi pushed a commit to branch document
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit 1dabe3329a83781af84c5aec56b630183ad1e6ab
Author: GinaZhai <na...@kyligence.io>
AuthorDate: Tue Jun 12 14:26:08 2018 +0800

    kylin webpages update
    
    Signed-off-by: shaofengshi <sh...@apache.org>
---
 website/_docs23/tutorial/create_cube.cn.md         | 163 ++++++++++++++++-----
 website/_docs23/tutorial/create_cube.md            |  80 ++++++----
 website/_docs23/tutorial/cube_build_job.cn.md      |  46 +++---
 website/_docs23/tutorial/cube_build_job.md         |  16 +-
 website/_docs23/tutorial/web.cn.md                 |  81 ++++------
 website/_docs23/tutorial/web.md                    |  51 +++----
 .../1 action-build.png                             | Bin 179836 -> 20859 bytes
 .../10 cube-segment.png                            | Bin 149989 -> 19541 bytes
 .../3 date.PNG                                     | Bin 0 -> 11625 bytes
 .../4 jobs-page.png                                | Bin 143862 -> 21546 bytes
 .../5 job-progress.png                             | Bin 144015 -> 11496 bytes
 .../6 discard.png                                  | Bin 156756 -> 2671 bytes
 .../7 job-steps.png                                | Bin 243944 -> 63699 bytes
 .../8 hover-step.png                               | Bin 170826 -> 14046 bytes
 .../9 log-d.png                                    | Bin 213990 -> 34736 bytes
 .../9 log.png                                      | Bin 71393 -> 1020 bytes
 .../9 mrjob-d.png                                  | Bin 383848 -> 69751 bytes
 .../9 mrjob.png                                    | Bin 74037 -> 1559 bytes
 .../9 parameters-d.png                             | Bin 199314 -> 27031 bytes
 .../9 parameters.png                               | Bin 74876 -> 1952 bytes
 .../1 manage-prject.png                            | Bin 20645 -> 2052 bytes
 .../10 configuration.PNG                           | Bin 0 -> 11816 bytes
 .../Kylin-Cube-Creation-Tutorial/11 overview.PNG   | Bin 0 -> 7016 bytes
 .../Kylin-Cube-Creation-Tutorial/2 +project.png    | Bin 70968 -> 689 bytes
 .../Kylin-Cube-Creation-Tutorial/3 new-project.png | Bin 59611 -> 9367 bytes
 .../3.1 pj-created.png                             | Bin 51935 -> 7876 bytes
 .../Kylin-Cube-Creation-Tutorial/4 +table-tree.png | Bin 47857 -> 1986 bytes
 .../1.5/Kylin-Cube-Creation-Tutorial/4 +table.png  | Bin 46477 -> 1702 bytes
 .../5 hive-table-cardinality.png                   | Bin 130591 -> 30462 bytes
 .../5 hive-table-info.png                          | Bin 91887 -> 15214 bytes
 .../5 hive-table-tree.png                          | Bin 62040 -> 6376 bytes
 .../Kylin-Cube-Creation-Tutorial/5 hive-table.png  | Bin 53368 -> 9004 bytes
 .../1.5/Kylin-Cube-Creation-Tutorial/6 +model.png  | Bin 49263 -> 3565 bytes
 .../6 model-created.png                            | Bin 29384 -> 2404 bytes
 .../6 model-dimensions.png                         | Bin 123120 -> 7851 bytes
 .../6 model-fact-table.png                         | Bin 113046 -> 8111 bytes
 .../6 model-join-condition.png                     | Bin 118661 -> 4898 bytes
 .../6 model-lookup-table.png                       | Bin 111371 -> 20875 bytes
 .../6 model-measures.png                           | Bin 80940 -> 5147 bytes
 .../Kylin-Cube-Creation-Tutorial/6 model-name.png  | Bin 109929 -> 11940 bytes
 .../6 model-partition-column.png                   | Bin 82155 -> 19938 bytes
 .../7 cube-dimension-batch.png                     | Bin 99014 -> 25517 bytes
 .../Kylin-Cube-Creation-Tutorial/7 cube-info.png   | Bin 147909 -> 20239 bytes
 .../Kylin-Cube-Creation-Tutorial/7 new-cube.png    | Bin 36943 -> 3574 bytes
 .../Kylin-Cube-Creation-Tutorial/8 meas-+meas.png  | Bin 103579 -> 6571 bytes
 .../8 measure-count.png                            | Bin 59447 -> 6054 bytes
 .../8 measure-distinct.png                         | Bin 71554 -> 13579 bytes
 .../8 measure-extended_column.PNG                  | Bin 0 -> 12478 bytes
 .../Kylin-Cube-Creation-Tutorial/8 measure-max.png | Bin 64916 -> 9930 bytes
 .../Kylin-Cube-Creation-Tutorial/8 measure-min.png | Bin 65880 -> 9760 bytes
 .../8 measure-percentile.PNG                       | Bin 0 -> 8934 bytes
 .../Kylin-Cube-Creation-Tutorial/8 measure-sum.png | Bin 65951 -> 10880 bytes
 .../8 measure-topn.png                             | Bin 70942 -> 18803 bytes
 .../9 refresh-setting1.png                         | Bin 143698 -> 11082 bytes
 .../tutorial/1.5/Kylin-Web-Tutorial/1 login.png    | Bin 27793 -> 4577 bytes
 .../1.5/Kylin-Web-Tutorial/10 query-result.png     | Bin 79529 -> 25057 bytes
 .../1.5/Kylin-Web-Tutorial/11 save-query.png       | Bin 29373 -> 8418 bytes
 .../tutorial/1.5/Kylin-Web-Tutorial/12 general.png | Bin 26097 -> 10989 bytes
 .../tutorial/1.5/Kylin-Web-Tutorial/13 results.png | Bin 77124 -> 7938 bytes
 .../1.5/Kylin-Web-Tutorial/15 bar-chart.png        | Bin 79660 -> 133325 bytes
 .../tutorial/1.5/Kylin-Web-Tutorial/2 table.PNG    | Bin 0 -> 49621 bytes
 .../tutorial/1.5/Kylin-Web-Tutorial/3 cubes.png    | Bin 155306 -> 67739 bytes
 .../1.5/Kylin-Web-Tutorial/4 grid-view.PNG         | Bin 0 -> 26122 bytes
 .../tutorial/1.5/Kylin-Web-Tutorial/5 sql-view.png | Bin 171545 -> 29660 bytes
 .../tutorial/1.5/Kylin-Web-Tutorial/8 query.png    | Bin 191367 -> 22261 bytes
 .../1.5/Kylin-Web-Tutorial/9 query-table.png       | Bin 142843 -> 17085 bytes
 66 files changed, 254 insertions(+), 183 deletions(-)

diff --git a/website/_docs23/tutorial/create_cube.cn.md b/website/_docs23/tutorial/create_cube.cn.md
index a0a76e9..a293ce3 100644
--- a/website/_docs23/tutorial/create_cube.cn.md
+++ b/website/_docs23/tutorial/create_cube.cn.md
@@ -1,4 +1,4 @@
----
+---
 layout: docs23-cn
 title:  Kylin Cube 创建教程
 categories: 教程
@@ -9,15 +9,15 @@ since: v0.7.1
   
   
 ### I. 新建一个项目
-1. 由顶部菜单栏进入`Query`页面,然后点击`Manage Projects`。
+1. 由顶部菜单栏进入 `Model` 页面,然后点击 `Manage Projects`。
 
    ![](/images/Kylin-Cube-Creation-Tutorial/1 manage-prject.png)
 
-2. 点击`+ Project`按钮添加一个新的项目。
+2. 点击 `+ Project` 按钮添加一个新的项目或者忽略第一步并且点击 `Add Project`(第一张图片中右边的按钮)。
 
    ![](/images/Kylin-Cube-Creation-Tutorial/2 %2Bproject.png)
 
-3. 填写下列表单并点击`submit`按钮提交请求。
+3. 填写下列表单并点击 `submit` 按钮提交请求。
 
    ![](/images/Kylin-Cube-Creation-Tutorial/3 new-project.png)
 
@@ -26,62 +26,103 @@ since: v0.7.1
    ![](/images/Kylin-Cube-Creation-Tutorial/3.1 pj-created.png)
 
 ### II. 同步一张表
-1. 在顶部菜单栏点击`Tables`,然后点击`+ Sync`按钮加载hive表元数据。
+1. 在顶部菜单栏点击 `Model`,然后点击左边的 `Data Source` 标签,它会列出所有加载进Kylin的表,点击 `Load Table` 按钮。
 
    ![](/images/Kylin-Cube-Creation-Tutorial/4 %2Btable.png)
 
-2. 输入表名并点击`Sync`按钮提交请求。
+2. 输入表名并点击 `Sync` 按钮提交请求。
 
    ![](/images/Kylin-Cube-Creation-Tutorial/5 hive-table.png)
 
-### III. 新建一个cube
-首先,在顶部菜单栏点击`Cubes`。然后点击`+Cube`按钮进入cube designer页面。
+3. 【可选】如果你想要浏览hive数据库来选择表,点击 `Load Table From Tree` 按钮。
 
-![](/images/Kylin-Cube-Creation-Tutorial/6 %2Bcube.png)
+   ![](/images/Kylin-Cube-Creation-Tutorial/5 hive-table.png)
 
-**步骤1. Cube信息**
+4. 【可选】展开数据库节点,点击选择要加载的表,然后点击 `Sync` 按钮。
 
-填写cube基本信息。点击`Next`进入下一步。
+   ![](/images/Kylin-Cube-Creation-Tutorial/5 hive-table.png)
 
-你可以使用字母、数字和“_”来为你的cube命名(注意名字中不能使用空格)。
+5. 成功的消息将会弹出,在左边的 `Tables` 部分,新加载的表已经被添加进来。点击表将会展开列。
 
-![](/images/Kylin-Cube-Creation-Tutorial/7 cube-info.png)
+   ![](/images/Kylin-Cube-Creation-Tutorial/5 hive-table.png)
 
-**步骤2. 维度**
+6. 在后台,Kylin 将会执行 MapReduce 任务计算新 sync 表的 cardinality,任务完成后,刷新页面并点击表名,cardinality的值将会显示在表信息中。
 
-1. 建立事实表。
+   ![](/images/Kylin-Cube-Creation-Tutorial/5 hive-table.png)
+
+### III. 新建一个 Data Model
+创建 cube 前,需定义一个数据模型。数据模型定义为星形模型。一个模型可以被多个 cube 使用。
+
+![](/images/Kylin-Cube-Creation-Tutorial/6 %2Bcube.png)
+
+1. 点击顶部的 `Model` ,然后点击 `Models` 标签。点击 `+New` 按钮,在下拉框中选择 `New Model`。
+
+2. 输入 model 的名字和可选的 description。
+
+![](/images/Kylin-Cube-Creation-Tutorial/7 cube-info.png)
+
+3. 在 `Fact Table` 中,为模型选择事实表。
 
     ![](/images/Kylin-Cube-Creation-Tutorial/8 dim-factable.png)
 
-2. 点击`+Dimension`按钮添加一个新的维度。
+4. 【可选】点击 `Add Lookup Table` 按钮添加一个 lookup 表。选择表名和 join 类型(内连接或左连接)
 
     ![](/images/Kylin-Cube-Creation-Tutorial/8 dim-%2Bdim.png)
 
-3. 可以选择不同类型的维度加入一个cube。我们在这里列出其中一部分供你参考。
+5. 【可选】点击 `New Join Condition` 按钮,左边选择事实表的外键,右边选择 lookup 表的主键。如果有多于一个 join 列重复执行。
+
+    ![](/images/Kylin-Cube-Creation-Tutorial/8 dim-typeA.png)
 
-    * 从事实表获取维度。
-          ![](/images/Kylin-Cube-Creation-Tutorial/8 dim-typeA.png)
+6. 点击 “OK”,重复4,5步来添加更多的 lookup 表。完成后,点击 “Next”。
+   ![](/images/Kylin-Cube-Creation-Tutorial/8 dim-edit.png)
 
-    * 从查找表获取维度。
-        ![]( /images/Kylin-Cube-Creation-Tutorial/8 dim-typeB-1.png)
+7. `Dimensions` 页面允许选择在子 cube 中用作维度的列,然后点击 `Columns` 列,在下拉框中选择需要的列。
 
-        ![]( /images/Kylin-Cube-Creation-Tutorial/8 dim-typeB-2.png)
-   
-    * 从有分级结构的查找表获取维度。
-          ![](/images/Kylin-Cube-Creation-Tutorial/8 dim-typeC.png)
+8. 点击 “Next” 到达 “Measures” 页面,选择作为 measure 的列,其只能从事实表中选择。
+
+![](/images/Kylin-Cube-Creation-Tutorial/7 cube-info.png)
+
+9. 点击 “Next” 到达 “Settings” 页面,如果事实表中的数据每日增长,选择 `Partition Date Column` 中相应的 date 列以及 date 格式,否则就将其留白。
 
-    * 从有衍生维度(derived dimensions)的查找表获取维度。
-          ![](/images/Kylin-Cube-Creation-Tutorial/8 dim-typeD.png)
+    ![](/images/Kylin-Cube-Creation-Tutorial/8 dim-factable.png)
+
+10. 【可选】选择是否需要 “time of the day” 列,默认情况下为 `No`。如果选择 `Yes`, 选择 `Partition Time Column` 中相应的 time 列以及 time 格式
+
+    ![](/images/Kylin-Cube-Creation-Tutorial/8 dim-%2Bdim.png)
 
-4. 用户可以在保存维度后进行编辑。
+11. 【可选】如果一些 records 想从 cube 中移除出去,就像脏数据,可以在 `Filter` 中输入条件。
+
+    ![](/images/Kylin-Cube-Creation-Tutorial/8 dim-typeA.png)
+
+12. 点击 `Save` 然后选择 `Yes` 来保存 data model。创建完成,data model 就会列在左边 `Models` 列表中。
    ![](/images/Kylin-Cube-Creation-Tutorial/8 dim-edit.png)
 
+### III. 新建一个 Cube
+
+创建完 data model,可以开始创建 cube。
+点击顶部 `Model`,然后点击 `Models` 标签。点击 `+New` 按钮,在下拉框中选择 `New Cube`。
+
+**步骤1. Cube 信息**
+
+1. 选择 data model,输入 cube 名字;点击 `Next` 进行下一步。
+
+cube 名字可以使用字母,数字和下划线(空格也是允许的)。`Notification Email List` 是运用来通知job执行成功或失败情况的邮箱列表。`Notification Events` 是触发事件的状态。
+
+   ![](/images/Kylin-Cube-Creation-Tutorial/9 meas-%2Bmeas.png)
+
+**步骤2. 维度**
+
+1. 点击 `Add Dimension`,在弹窗中显示的事实表和lookup表里勾选输入需要的列。Lookup 表的列有2个选项:“Normal” 和 “Derived”(默认)。“Normal” 添加一个 normal 独立的维度列,“Derived” 添加一个 derived 维度。阅读更多【如何优化 cube】(/docs15/howto/howto_optimize_cubes.html)。
+
+2. 选择所有维度后点击 “Next”。
+
 **步骤3. 度量**
 
-1. 点击`+Measure`按钮添加一个新的度量。
+1. 点击 `+Measure` 按钮添加一个新的度量。
+
    ![](/images/Kylin-Cube-Creation-Tutorial/9 meas-%2Bmeas.png)
 
-2. 根据它的表达式共有5种不同类型的度量:`SUM`、`MAX`、`MIN`、`COUNT`和`COUNT_DISTINCT`。请谨慎选择返回类型,它与`COUNT(DISTINCT)`的误差率相关。
+2. 根据它的表达式共有8种不同类型的度量:`SUM`、`MAX`、`MIN`、`COUNT`、`COUNT_DISTINCT` `TOP_N`, `EXTENDED_COLUMN` 和 `PERCENTILE`。请合理选择 `COUNT_DISTINCT` 和 `TOP_N` 返回类型,它与 cube 的大小相关。
    * SUM
 
      ![](/images/Kylin-Cube-Creation-Tutorial/9 meas-sum.png)
@@ -99,31 +140,73 @@ since: v0.7.1
      ![](/images/Kylin-Cube-Creation-Tutorial/9 meas-count.png)
 
    * DISTINCT_COUNT
+   这个度量有两个实现:
+   1)近似实现 HyperLogLog,选择可接受的错误率,低错误率需要更多存储;
+   2)精确实现 bitmap(具体限制请看 https://issues.apache.org/jira/browse/KYLIN-1186)
+
+     ![](/images/Kylin-Cube-Creation-Tutorial/9 meas-distinct.png)
+    
+    注意:distinct 是一种非常重的数据类型,和其他度量相比构建和查询会更慢。
+    
+   * TOP_N
+   TopN 度量在每个维度结合时预计算,它比未预计算的在查询时间上性能更好;需要两个参数:一是被用来作为 Top 记录的度量列;二是 literal ID,代表记录就像 seller_id;
+   
+   合理的选择返回类型,将决定多少 top 记录被监察:top 10, top 100, top 500, top 1000, top 5000 or top 10000。
 
      ![](/images/Kylin-Cube-Creation-Tutorial/9 meas-distinct.png)
 
-**步骤4. 过滤器**
+   * EXTENDED_COLUMN
+   Extended_Column 作为度量比作为维度更节省空间。一列和零一列可以生成新的列。
 
-这一步骤是可选的。你可以使用`SQL`格式添加一些条件过滤器。
+   * PERCENTILE
+   Percentile 代表了百分比。值越大,错误就越少。100为最合适的值。
 
-![](/images/Kylin-Cube-Creation-Tutorial/10 filter.png)
+     ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-percentile.png)
 
-**步骤5. 更新设置**
+**步骤4. 更新设置**
 
-这一步骤是为增量构建cube而设计的。
+这一步骤是为增量构建 cube 而设计的。
 
-![](/images/Kylin-Cube-Creation-Tutorial/11 refresh-setting1.png)
+`Auto Merge Thresholds`: 自动合并小的 segments 到中等甚至更大的 segment。如果不想自动合并,删除默认2个选项。
 
-选择分区类型、分区列和开始日期。
+`Volatile Range`: 默认为0,会自动合并所有可能的 cube segments,或者用 'Auto Merge' 将不会合并最新的 [Volatile Range] 天的 cube segments。
+
+`Retention Threshold`: 只会保存 cube 过去几天的 segment,旧的 segment 将会自动从头部删除;0表示不启用这个功能。
+
+`Partition Start Date`: cube 的开始日期.
 
 ![](/images/Kylin-Cube-Creation-Tutorial/11 refresh-setting2.png)
 
-**步骤6. 高级设置**
+**步骤5. 高级设置**
+
+`Aggregation Groups`: 默认 kylin 会把所有维度放在一个聚合组;如果你很好的了解你的查询模式,那么你可以创建多个聚合组。对于 "Mandatory Dimensions", "Hierarchy Dimensions" 和 "Joint Dimensions", 请阅读这个博客: [新的聚合组](/blog/2016/02/18/new-aggregation-group/)
+
+`Rowkeys`: 是由维度编码值组成。"Dictionary" 是默认的编码方式; 如果维度和字典不符合(比如 cardinality > 1千万), 选择 "false" 然后为维度输入合适的长度,通常是那列的最大值; 如果超过最大值,他将会被截断。请注意,如果没有字典编码,cube 的大小将会变的非常大。
+
+你可以拖拽维度列去调整其在 rowkey 中位置; 将 mandantory 维度放在开头, 然后是在过滤 ( where 条件)中起到很大作用的维度. 将高 cardinality 的维度放在低 cardinality 的维度前.
+
+`Mandatory Cuboids`: 确保你想要构建的 cuboid 能顺利构建。
+
+`Cube Engine`: cube 构建引擎。有两种类型:MapReduce and Spark。
 
-![](/images/Kylin-Cube-Creation-Tutorial/12 advanced.png)
+`Advanced Dictionaries`: "Global Dictionary" 是准确计算不同度量的默认字典, 支持在所有 segments 汇总。
+
+"Segment Dictionary" 是准确计算不同度量的专用字典, 是基于一个 segment 的并且不支持在所有 segments 汇总。特别地,如果你的 cube 不是分区的或者你能保证你的所有 SQL 按照 partition_column 进行 group by, 那么你应该使用 "Segment Dictionary" 而不是 "Global Dictionary"。
+
+`Advanced Snapshot Table`: 为全局 lookup 表而设计,提供不同的存储类型。
+
+`Advanced ColumnFamily`: 如果有超过一个超高的 cardinality 精确的计算不同的度量, 你可以将它们放在更多列簇中。
+
+**步骤6. 重写配置**
+
+Cube 级别的属性将会覆盖 kylin.properties 中的配置, 如果你没有要配置的,点击 `Next` 按钮。
+
+![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/10 configuration.png)
 
 **步骤7. 概览 & 保存**
 
-你可以概览你的cube并返回之前的步骤进行修改。点击`Save`按钮完成cube创建。
+你可以概览你的 cube 并返回之前的步骤进行修改。点击 `Save` 按钮完成 cube 创建。
 
 ![](/images/Kylin-Cube-Creation-Tutorial/13 overview.png)
+
+恭喜,cube 创建好了,你可以去构建和玩它了。
diff --git a/website/_docs23/tutorial/create_cube.md b/website/_docs23/tutorial/create_cube.md
index 31dbf99..b5adce8 100644
--- a/website/_docs23/tutorial/create_cube.md
+++ b/website/_docs23/tutorial/create_cube.md
@@ -1,4 +1,4 @@
----
+---
 layout: docs23
 title:  Cube Wizard
 categories: tutorial
@@ -8,15 +8,15 @@ permalink: /docs23/tutorial/create_cube.html
 This tutorial will guide you to create a cube. It need you have at least 1 sample table in Hive. If you don't have, you can follow this to create some data.
   
 ### I. Create a Project
-1. Go to `Query` page in top menu bar, then click `Manage Projects`.
+1. Go to `Model` page in top menu bar, then click `Manage Projects`.
 
    ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/1 manage-prject.png)
 
-2. Click the `+ Project` button to add a new project.
+2. Click the `+ Project` button to add a new project or ignore the first step and click `Add Project`(button on the right) of the first picture.
 
    ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/2 +project.png)
 
-3. Enter a project name, e.g, "Tutorial", with a description (optional), then click `submit` button to send the request.
+3. Enter a project name, e.g, "Tutorial", with a description (optional) and the config (optional), then click `submit` button to send the request.
 
    ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/3 new-project.png)
 
@@ -25,7 +25,7 @@ This tutorial will guide you to create a cube. It need you have at least 1 sampl
    ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/3.1 pj-created.png)
 
 ### II. Sync up Hive Table
-1. Click `Model` in top bar and then click `Data Source` tab in the left part, it lists all the tables loaded into Kylin; click `Load Hive Table` button.
+1. Click `Model` in top bar and then click `Data Source` tab in the left part, it lists all the tables loaded into Kylin; click `Load Table` button.
 
    ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/4 +table.png)
 
@@ -33,7 +33,7 @@ This tutorial will guide you to create a cube. It need you have at least 1 sampl
 
    ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/5 hive-table.png)
 
-3. [Optional] If you want to browser the hive database to pick tables, click the `Load Hive Table From Tree` button.
+3. [Optional] If you want to browser the hive database to pick tables, click the `Load Table From Tree` button.
 
    ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/4 +table-tree.png)
 
@@ -65,7 +65,7 @@ Before create a cube, need define a data model. The data model defines the star
 
     ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-fact-table.png)
 
-4. [Optional] Click `Add Lookup Table` button to add a lookup table. Select the table name and join type (inner or left).
+4. [Optional] Click `Add Lookup Table` button to add a lookup table. Select the table name and join type (inner join or left join).
 
     ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-lookup-table.png)
 
@@ -85,11 +85,10 @@ Before create a cube, need define a data model. The data model defines the star
 
 9. Click "Next" to the "Settings" page. If the data in fact table increases by day, select the corresponding date column in the `Partition Date Column`, and select the date format, otherwise leave it as blank.
 
-10. [Optional] Select `Cube Size`, which is an indicator on the scale of the cube, by default it is `MEDIUM`.
+10. [Optional] Choose whether has a separate "time of the day" column, by default it is `No`. If choose `Yes`, select the corresponding time column in the `Partition Time Column`, and select the time format.
 
 11. [Optional] If some records want to excluded from the cube, like dirty data, you can input the condition in `Filter`.
 
-
     ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-partition-column.png)
 
 12. Click `Save` and then select `Yes` to save the data model. After created, the data model will be shown in the left `Models` list.
@@ -100,41 +99,32 @@ Before create a cube, need define a data model. The data model defines the star
 After the data model be created, you can start to create cube. 
 
 Click `Model` in top bar, and then click `Models` tab. Click `+New` button, in the drop-down list select `New Cube`.
-    ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/7 new-cube.png)
 
+    ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/7 new-cube.png)
 
 **Step 1. Cube Info**
 
 Select the data model, enter the cube name; Click `Next` to enter the next step.
 
-You can use letters, numbers and '_' to name your cube (blank space in name is not allowed). `Notification List` is a list of email addresses which be notified on cube job success/failure.
+You can use letters, numbers and '_' to name your cube (blank space in name is not allowed). `Notification Email List` is a list of email addresses which be notified on cube job success/failure. `Notification Events` is the status to trigger events.
+
     ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/7 cube-info.png)
     
-
 **Step 2. Dimensions**
 
-1. Click `Add Dimension`, it popups two option: "Normal" and "Derived": "Normal" is to add a normal independent dimension column, "Derived" is to add a derived dimension column. Read more in [How to optimize cubes](/docs15/howto/howto_optimize_cubes.html).
-
-2. Click "Normal" and then select a dimension column, give it a meaningful name.
-
-    ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/7 cube-dimension-normal.png)
-    
-3. [Optional] Click "Derived" and then pickup 1 more multiple columns on lookup table, give them a meaningful name.
-
-   ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/7 cube-dimension-derived.png)
-
-4. Repeate 2 and 3 to add all dimension columns; you can do this in batch for "Normal" dimension with the button `Auto Generator`. 
+1. Click `Add Dimension`, it pops up a window: tick columns that you need from FactTable and LookupTable. There are two options for LookupTable columns: "Normal" and "Derived" (default)。"Normal" is to add a normal independent dimension column, "Derived" is to add a derived dimension column. Read more in [How to optimize cubes](/docs15/howto/howto_optimize_cubes.html).
 
    ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/7 cube-dimension-batch.png)
 
-5. Click "Next" after select all dimensions.
+2. Click "Next" after select all dimensions.
 
 **Step 3. Measures**
 
 1. Click the `+Measure` to add a new measure.
+
    ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 meas-+meas.png)
 
-2. There are 6 types of measure according to its expression: `SUM`, `MAX`, `MIN`, `COUNT`, `COUNT_DISTINCT` and `TOP_N`. Properly select the return type for `COUNT_DISTINCT` and `TOP_N`, as it will impact on the cube size.
+2. There are 8 types of measure according to its expression: `SUM`, `MAX`, `MIN`, `COUNT`, `COUNT_DISTINCT`, `TOP_N`, `EXTENDED_COLUMN` and `PERCENTILE`. Properly select the return type for `COUNT_DISTINCT` and `TOP_N`, as it will impact on the cube size.
    * SUM
 
      ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-sum.png)
@@ -163,18 +153,29 @@ You can use letters, numbers and '_' to name your cube (blank space in name is n
    * TOP_N
    Approximate TopN measure pre-calculates the top records in each dimension combination, it will provide higher performance in query time than no pre-calculation; Need specify two parameters here: the first is the column will be used as metrics for Top records (aggregated with SUM and then sorted in descending order); the second is the literal ID, represents the record like seller_id;
 
-   Properly select the return type, depends on how many top records to inspect: top 10, top 100 or top 1000. 
+   Properly select the return type, depends on how many top records to inspect: top 10, top 100, top 500, top 1000, top 5000 or top 10000. 
 
      ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-topn.png)
 
+* EXTENDED_COLUMN
+   Extended_Column as a measure rather than a dimension is to save space. One column with another column can generate new columns.
+
+     ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-extended_column.png)
+
+* PERCENTILE
+   Percentile represent the percentage. The larger the value, the smaller the error. 100 is the most suitable.
+
+     ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-percentile.png)
 
 **Step 4. Refresh Setting**
 
 This step is designed for incremental cube build. 
 
-`Auto Merge Time Ranges (days)`: merge the small segments into medium and large segment automatically. If you don't want to auto merge, remove the default two ranges.
+`Auto Merge Thresholds`: merge the small segments into medium and large segment automatically. If you don't want to auto merge, remove the default two ranges.
 
-`Retention Range (days)`: only keep the segment whose data is in past given days in cube, the old segment will be automatically dropped from head; 0 means not enable this feature.
+`Volatile Range`: by default it is 0, which will auto merge all possible cube segments, or 'Auto Merge' will not merge latest [Volatile Range] days cube segments.
+
+`Retention Threshold`: only keep the segment whose data is in past given days in cube, the old segment will be automatically dropped from head; 0 means not enable this feature.
 
 `Partition Start Date`: the start date of this cube.
 
@@ -184,15 +185,32 @@ This step is designed for incremental cube build.
 
 `Aggregation Groups`: by default Kylin put all dimensions into one aggregation group; you can create multiple aggregation groups by knowing well about your query patterns. For the concepts of "Mandatory Dimensions", "Hierarchy Dimensions" and "Joint Dimensions", read this blog: [New Aggregation Group](/blog/2016/02/18/new-aggregation-group/)
 
-`Rowkeys`: the rowkeys are composed by the dimension encoded values. "Dictionary" is the default encoding method; If a dimension is not fit with dictionary (e.g., cardinality > 10 million), select "false" and then enter the fixed length for that dimension, usually that is the max. length of that column; if a value is longer than that size it will be truncated. Please note, without dictionary encoding, the cube size might be much bigger.
+`Rowkeys`: the rowkeys are composed by the dimension encoded values. "Dictionary" is the default encoding method; If a dimension is not fit with dictionary (e.g., cardinality > 10 million), select "false" and then enter the fixed length for that dimension, usually that is the max length of that column; if a value is longer than that size it will be truncated. Please note, without dictionary encoding, the cube size might be much bigger.
 
 You can drag & drop a dimension column to adjust its position in rowkey; Put the mandantory dimension at the begining, then followed the dimensions that heavily involved in filters (where condition). Put high cardinality dimensions ahead of low cardinality dimensions.
 
+`Mandatory Cuboids`: ensure the cuboid that you want to build can build smoothly.
+
+`Cube Engine`: the engine for building cube. There are 2 types: MapReduce and Spark.
+
+`Advanced Dictionaries`: "Global Dictionary" is the default dict for precise count distinct measure, which support rollup among all segments.
+
+"Segment Dictionary" is the special dict for precise count distinct measure, which is based on one segment and could not support rollup among segments. Specifically, if your cube isn't partitioned or you can ensure all your SQLs will group by your partition_column, you could use "Segment Dictionary" instead of "Global Dictionary".
+
+`Advanced Snapshot Table`: design for global lookup table and provide different storage type.
+
+`Advanced ColumnFamily`: If there are more than one ultrahigh cardinality precise count distinct measures, you could assign these measures to more column family.
+
+**Step 6. Configuration Overwrites**
+
+Cube level properties will overwrite configuration in kylin.properties, if you don't have anything to config, click `Next` button.
+
+![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/10 configuration.png)
 
-**Step 6. Overview & Save**
+**Step 7. Overview & Save**
 
 You can overview your cube and go back to previous step to modify it. Click the `Save` button to complete the cube creation.
 
-![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/10 overview.png)
+![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/11 overview.png)
 
 Cheers! now the cube is created, you can go ahead to build and play it.
diff --git a/website/_docs23/tutorial/cube_build_job.cn.md b/website/_docs23/tutorial/cube_build_job.cn.md
index e00e624..d94edc1 100644
--- a/website/_docs23/tutorial/cube_build_job.cn.md
+++ b/website/_docs23/tutorial/cube_build_job.cn.md
@@ -1,51 +1,60 @@
----
+---
+
 layout: docs23-cn
+
 title:  Kylin Cube 建立和Job监控教程
+
 categories: 教程
+
 permalink: /cn/docs23/tutorial/cube_build_job.html
+
 version: v1.2
+
 since: v0.7.1
+
 ---
 
+
+
 ### Cube建立
-首先,确认你拥有你想要建立的cube的权限。
 
-1. 在`Cubes`页面中,点击cube栏右侧的`Action`下拉按钮并选择`Build`操作。
+首先,确认你拥有你想要建立的 cube 的权限。
+
+1. 在 `Models` 页面中,点击 cube 栏右侧的 `Action` 下拉按钮并选择 `Build` 操作。
 
    ![]( /images/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/1 action-build.png)
 
-2. 选择后会出现一个弹出窗口。
+2. 选择后会出现一个弹出窗口,点击 `Start Date` 或者 `End Date` 输入框选择这个增量 cube 构建的起始日期。
 
    ![]( /images/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/2 pop-up.png)
 
-3. 点击`END DATE`输入框选择增量构建这个cube的结束日期。
-
-   ![]( /images/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/3 end-date.png)
-
-4. 点击`Submit`提交请求。
+3. 点击 `Submit` 提交请求。成功之后,你将会在 `Monitor` 页面看到新建的 job。
 
-   ![]( /images/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/4 submit.png)
+   ![]( /images/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/5 jobs-page.png)
 
-   ![]( /images/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/4.1 success.png)
+4. 新建的 job 是 “pending” 状态;一会儿,它就会开始运行并且你可以通过刷新 web 页面或者点击刷新按钮来查看进度。
 
-   提交请求成功后,你将会看到`Jobs`页面新建了job。
+5. 等待 job 完成。期间如要放弃这个 job ,点击 `Actions` -> `Discard` 按钮。
 
-   ![]( /images/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/5 jobs-page.png)
+   ![]( /images/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/6 discard.png)
 
-5. 如要放弃这个job,点击`Discard`按钮。
+6. 等到 job 100%完成,cube 的状态就会变为 “Ready”, 意味着它已经准备好进行 SQL 查询。在 `Model` 页,找到 cube,然后点击 cube 名展开消息,在 “Storage” 标签下,列出 cube segments。每一个 segment 都有 start/end 时间;Hbase 表的信息也会列出。
 
    ![]( /images/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/6 discard.png)
 
+如果你有更多的源数据,重复以上的步骤将它们构建进 cube。
+
 ### Job监控
-在`Jobs`页面,点击job详情按钮查看显示于右侧的详细信息。
+
+在 `Monitor` 页面,点击job详情按钮查看显示于右侧的详细信息。
 
 ![]( /images/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/7 job-steps.png)
 
-job详细信息为跟踪一个job提供了它的每一步记录。你可以将光标停放在一个步骤状态图标上查看基本状态和信息。
+job 详细信息为跟踪一个 job 提供了它的每一步记录。你可以将光标停放在一个步骤状态图标上查看基本状态和信息。
 
 ![]( /images/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/8 hover-step.png)
 
-点击每个步骤显示的图标按钮查看详情:`Parameters`、`Log`、`MRJob`、`EagleMonitoring`。
+点击每个步骤显示的图标按钮查看详情:`Parameters`、`Log`、`MRJob`。
 
 * Parameters
 
@@ -54,7 +63,7 @@ job详细信息为跟踪一个job提供了它的每一步记录。你可以将
    ![]( /images/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 parameters-d.png)
 
 * Log
-        
+
    ![]( /images/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 log.png)
 
    ![]( /images/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 log-d.png)
@@ -64,3 +73,4 @@ job详细信息为跟踪一个job提供了它的每一步记录。你可以将
    ![]( /images/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 mrjob.png)
 
    ![]( /images/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 mrjob-d.png)
+
diff --git a/website/_docs23/tutorial/cube_build_job.md b/website/_docs23/tutorial/cube_build_job.md
index 4561a60..b9f58a4 100644
--- a/website/_docs23/tutorial/cube_build_job.md
+++ b/website/_docs23/tutorial/cube_build_job.md
@@ -1,4 +1,4 @@
----
+---
 layout: docs23
 title:  Cube Build and Job Monitoring
 categories: tutorial
@@ -12,28 +12,28 @@ First of all, make sure that you have authority of the cube you want to build.
 
    ![](/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/1 action-build.png)
 
-2. There is a pop-up window after the selection, click `END DATE` input box to select end date of this incremental cube build.
+2. There is a pop-up window after the selection, click `Start Date` or `End Date` input box to select start or end date of this incremental cube build.
 
-   ![](/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/3 end-date.png)
+   ![](/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/3 date.png)
 
-4. Click `Submit` to send the build request. After success, you will see the new job in the `Monitor` page.
+3. Click `Submit` to send the build request. After success, you will see the new job in the `Monitor` page.
 
    ![](/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/4 jobs-page.png)
 
-5. The new job is in "pending" status; after a while, it will be started to run and you will see the progress by refresh the web page or click the refresh button.
+4. The new job is in "pending" status; after a while, it will be started to run and you will see the progress by refresh the web page or click the refresh button.
 
    ![](/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/5 job-progress.png)
 
 
-6. Wait the job to finish. In the between if you want to discard it, click `Actions` -> `Discard` button.
+5. Wait the job to finish. In the between if you want to discard it, click `Actions` -> `Discard` button.
 
    ![](/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/6 discard.png)
 
-7. After the job is 100% finished, the cube's status becomes to "Ready", means it is ready to serve SQL queries. In the `Model` tab, find the cube, click cube name to expand the section, in the "HBase" tab, it will list the cube segments. Each segment has a start/end time; Its underlying HBase table information is also listed.
+6. After the job is 100% finished, the cube's status becomes to "Ready", means it is ready to serve SQL queries. In the `Model` tab, find the cube, click cube name to expand the section, in the "Storage" tab, it will list the cube segments. Each segment has a start/end time; Its underlying HBase table information is also listed.
 
    ![](/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/10 cube-segment.png)
 
-If you have more source data, repeate the steps above to build them into the cube.
+If you have more source data, repeat the steps above to build them into the cube.
 
 ### Job Monitoring
 In the `Monitor` page, click the job detail button to see detail information show in the right side.
diff --git a/website/_docs23/tutorial/web.cn.md b/website/_docs23/tutorial/web.cn.md
index d0971ba..6e34423 100644
--- a/website/_docs23/tutorial/web.cn.md
+++ b/website/_docs23/tutorial/web.cn.md
@@ -1,4 +1,4 @@
----
+---
 layout: docs23-cn
 title:  Kylin网页版教程
 categories: 教程
@@ -14,87 +14,78 @@ version: v1.2
 
 ## 1. 访问 & 登陆
 访问主机: http://hostname:7070
-使用用户名/密码登陆:ADMIN/KYLIN
+使用用户名登陆:ADMIN
+使用密码登陆:KYLIN
 
 ![]( /images/Kylin-Web-Tutorial/1 login.png)
 
-## 2. Kylin中可用的Hive表
-虽然Kylin使用SQL作为查询接口并利用Hive元数据,Kylin不会让用户查询所有的hive表,因为到目前为止它是一个预构建OLAP(MOLAP)系统。为了使表在Kylin中可用,使用"Sync"方法能够方便地从Hive中同步表。
+## 2. Kylin 中可用的 Hive 表
+虽然 Kylin 使用 SQL 作为查询接口并利用 Hive 元数据,Kylin 不会让用户查询所有的 hive 表,因为到目前为止它是一个预构建 OLAP(MOLAP) 系统。为了使表在 Kylin 中可用,使用 "Sync" 方法能够方便地从 Hive 中同步表。
 
 ![]( /images/Kylin-Web-Tutorial/2 tables.png)
 
 ## 3. Kylin OLAP Cube
-Kylin的OLAP Cube是从星型模式的Hive表中获取的预计算数据集,这是供用户探索、管理所有cube的网页管理页面。由菜单栏进入`Cubes`页面,系统中所有可用的cube将被列出。
+Kylin 的 OLAP Cube 是从星型模式的 Hive 表中获取的预计算数据集,这是供用户探索、管理所有 cube 的网页管理页面。由菜单栏进入 `Model` 页面,系统中所有可用的 cube 将被列出。
 
 ![]( /images/Kylin-Web-Tutorial/3 cubes.png)
 
-探索更多关于Cube的详细信息
+探索更多关于 Cube 的详细信息
 
-* 表格视图:
+* Grid 视图:
 
    ![]( /images/Kylin-Web-Tutorial/4 form-view.png)
 
-* SQL 视图 (Hive查询读取数据以生成cube):
+* SQL 视图 (Hive 查询读取数据以生成 cube):
 
    ![]( /images/Kylin-Web-Tutorial/5 sql-view.png)
 
-* 可视化 (显示这个cube背后的星型模式):
-
-   ![]( /images/Kylin-Web-Tutorial/6 visualization.png)
-
-* 访问 (授予用户/角色权限,beta版中授予权限操作仅对管理员开放):
-
-   ![]( /images/Kylin-Web-Tutorial/7 access.png)
-
-## 4. 在网页上编写和运行SQL
-Kelin的网页版为用户提供了一个简单的查询工具来运行SQL以探索现存的cube,验证结果并探索使用#5中的Pivot analysis与可视化分析的结果集。
+## 4. 在网页上编写和运行 SQL
+Kylin 的网页版为用户提供了一个简单的查询工具来运行 SQL 以探索现存的 cube,验证结果并探索使用下一章中的 Pivot analysis 与可视化的结果集。
 
 > **查询限制**
 > 
-> 1. 仅支持SELECT查询
-> 
-> 2. 为了避免从服务器到客户端产生巨大的网络流量,beta版中的扫描范围阀值被设置为1,000,000。
+> 1. 仅支持 SELECT 查询
 > 
-> 3. beta版中,SQL在cube中无法找到的数据将不会重定向到Hive
+> 2. 支持聚合函数和 group by
 
-由菜单栏进入“Query”页面:
+由菜单栏进入 “Insight” 页面:
 
 ![]( /images/Kylin-Web-Tutorial/8 query.png)
 
 * 源表:
 
-   浏览器当前可用表(与Hive相同的结构和元数据):
+   浏览器当前可用表(与 Hive 相同的结构和元数据):
   
    ![]( /images/Kylin-Web-Tutorial/9 query-table.png)
 
 * 新的查询:
 
-   你可以编写和运行你的查询并探索结果。这里提供一个查询供你参考:
+   你可以编写和运行你的查询并探索结果。
 
    ![]( /images/Kylin-Web-Tutorial/10 query-result.png)
 
-* 已保存的查询:
+* 已保存的查询(只在 LDAP security 有效后才能使用):
 
    与用户账号关联,你将能够从不同的浏览器甚至机器上获取已保存的查询。
-   在结果区域点击“Save”,将会弹出名字和描述来保存当前查询:
+   在结果区域点击 “Save”,将会弹出用来保存当前查询名字和描述:
 
    ![]( /images/Kylin-Web-Tutorial/11 save-query.png)
 
-   点击“Saved Queries”探索所有已保存的查询,你可以直接重新提交它来运行或删除它:
+   点击 “Saved Queries” 浏览所有已保存的查询,你可以直接重新提交它或删除它:
 
    ![]( /images/Kylin-Web-Tutorial/11 save-query-2.png)
 
 * 查询历史:
 
-   仅保存当前用户在当前浏览器中的查询历史,这将需要启用cookie,并且如果你清理浏览器缓存将会丢失数据。点击“Query History”标签,你可以直接重新提交其中的任何一条并再次运行。
+   仅保存当前用户在当前浏览器中的查询历史,这将需要启用 cookie,并且如果你清理浏览器缓存将会丢失数据。点击 “Query History” 标签,你可以直接重新提交其中的任何一条并再次运行。
 
-## 5. Pivot Analysis与可视化
-Kylin的网页版提供一个简单的Pivot与可视化分析工具供用户探索他们的查询结果:
+## 5. Pivot Analysis 与可视化
+Kylin 的网页版提供一个简单的 Pivot 与可视化分析工具供用户探索他们的查询结果:
 
 * 一般信息:
 
-   当查询运行成功后,它将呈现一个成功指标与被访问的cube名字。
-   同时它将会呈现这个查询在后台引擎运行了多久(不包括从Kylin服务器到浏览器的网络通信):
+   当查询运行成功后,它将呈现一个成功指标与被访问的 cube 名字。
+   同时它将会呈现这个查询在后台引擎运行了多久(不包括从 Kylin 服务器到浏览器的网络通信):
 
    ![]( /images/Kylin-Web-Tutorial/12 general.png)
 
@@ -104,31 +95,17 @@ Kylin的网页版提供一个简单的Pivot与可视化分析工具供用户探
 
    ![]( /images/Kylin-Web-Tutorial/13 results.png)
 
-* 导出到CSV文件
+* 导出到 CSV 文件
 
-   点击“Export”按钮以CSV文件格式保存当前结果。
-
-* Pivot表:
-
-   将一个或多个列拖放到标头,结果将根据这些列的值分组:
-
-   ![]( /images/Kylin-Web-Tutorial/14 drag.png)
+   点击 “Export” 按钮以 CSV 文件格式保存当前结果。
 
 * 可视化:
 
-   同时,结果集将被方便地显示在“可视化”的不同图表中:
+   同时,结果集将被方便地显示在 “可视化” 的不同图表中,总共有3种类型的图表:线性图、饼图和条形图
 
-   注意:线形图仅当至少一个从Hive表中获取的维度有真实的“Date”数据类型列时才是可用的。
+   注意:线形图仅当至少一个从 Hive 表中获取的维度有真实的 “Date” 数据类型列时才是可用的。
 
-   * 条形图:
+* 条形图:
 
    ![]( /images/Kylin-Web-Tutorial/15 bar-chart.png)
-   
-   * 饼图:
-
-   ![]( /images/Kylin-Web-Tutorial/16 pie-chart.png)
-
-   * 线形图:
-
-   ![]( /images/Kylin-Web-Tutorial/17 line-chart.png)
 
diff --git a/website/_docs23/tutorial/web.md b/website/_docs23/tutorial/web.md
index a13ac24..d0d15e9 100644
--- a/website/_docs23/tutorial/web.md
+++ b/website/_docs23/tutorial/web.md
@@ -1,4 +1,4 @@
----
+---
 layout: docs23
 title:  Web Interface
 categories: tutorial
@@ -11,7 +11,8 @@ permalink: /docs23/tutorial/web.html
 
 ## 1. Access & Login
 Host to access: http://hostname:7070
-Login with username/password: ADMIN/KYLIN
+Login with username: ADMIN
+Login with password:KYLIN
 
 ![](/images/tutorial/1.5/Kylin-Web-Tutorial/1 login.png)
 
@@ -21,53 +22,49 @@ Although Kylin will using SQL as query interface and leverage Hive metadata, kyl
 ![](/images/tutorial/1.5/Kylin-Web-Tutorial/2 tables.png)
 
 ## 3. Kylin OLAP Cube
-Kylin's OLAP Cubes are pre-calculation datasets from star schema tables, Here's the web interface for user to explorer, manage all cubes. Go to `Model` menu, it will list all cubes available in system:
+Kylin's OLAP Cubes are pre-calculation datasets from star schema tables, Here's the web interface for user to explore, manage all cubes. Go to `Model` menu, it will list all cubes available in system.
 
 ![](/images/tutorial/1.5/Kylin-Web-Tutorial/3 cubes.png)
 
-To explore more detail about the Cube
+To explore more detail about the Cube.
 
-* Form View:
+* Grid View:
 
-   ![](/images/tutorial/1.5/Kylin-Web-Tutorial/4 form-view.png)
+   ![](/images/tutorial/1.5/Kylin-Web-Tutorial/4 grid-view.png)
 
 * SQL View (Hive Query to read data to generate the cube):
 
    ![](/images/tutorial/1.5/Kylin-Web-Tutorial/5 sql-view.png)
 
-* Access (Grant user/role privileges, grant operation only open to Admin):
-
-   ![](/images/tutorial/1.5/Kylin-Web-Tutorial/7 access.png)
-
 ## 4. Write and Execute SQL on web
-Kylin's web offer a simple query tool for user to run SQL to explorer existing cube, verify result and explorer the result set using #5's Pivot analysis and visualization
+Kylin's web offer a simple query tool for user to run SQL to explore existing cube, verify result and explore the result set using Pivot analysis and visualization next chapter.
 
 > **Query Limit**
 > 
 > 1. Only SELECT query be supported
 > 
-> 2. SQL will not be redirect to Hive
+> 2. Aggregation function and GROUP BY are supported
 
-Go to "Insight" menu:
+Go to "Insight" menu.
 
 ![](/images/tutorial/1.5/Kylin-Web-Tutorial/8 query.png)
 
 * Source Tables:
 
-   Browser current available tables (same structure and metadata as Hive):
+   Browser current available tables (same structure and metadata as Hive).
   
    ![](/images/tutorial/1.5/Kylin-Web-Tutorial/9 query-table.png)
 
 * New Query:
 
-   You can write and execute your query and explorer the result.
+   You can write and execute your query and explore the result.
 
    ![](/images/tutorial/1.5/Kylin-Web-Tutorial/10 query-result.png)
 
 * Saved Query (only work after enable LDAP security):
 
    Associate with user account, you can get saved query from different browsers even machines.
-   Click "Save" in Result area, it will popup for name and description to save current query:
+   Click "Save" in Result area, it will popup for name and description to save current query.
 
    ![](/images/tutorial/1.5/Kylin-Web-Tutorial/11 save-query.png)
 
@@ -78,12 +75,12 @@ Go to "Insight" menu:
    Only keep the current user's query history in current bowser, it will require cookie enabled and will lost if you clean up bowser's cache. Click "Query History" tab, you could directly resubmit any of them to execute again.
 
 ## 5. Pivot Analysis and Visualization
-There's one simple pivot and visualization analysis tool in Kylin's web for user to explore their query result:
+There's one simple pivot and visualization analysis tool in Kylin's web for user to explore their query result.
 
 * General Information:
 
    When the query execute success, it will present a success indictor and also a cube's name which be hit. 
-   Also it will present how long this query be executed in backend engine (not cover network traffic from Kylin server to browser):
+   Also it will present how long this query be executed in backend engine (not cover network traffic from Kylin server to browser).
 
    ![](/images/tutorial/1.5/Kylin-Web-Tutorial/12 general.png)
 
@@ -93,31 +90,17 @@ There's one simple pivot and visualization analysis tool in Kylin's web for user
 
    ![](/images/tutorial/1.5/Kylin-Web-Tutorial/13 results.png)
 
-* Export to CSV File
+* Export to CSV File:
 
    Click "Export" button to save current result as CSV file.
 
-* Pivot Table:
-
-   Drag and drop one or more columns into the header, the result will grouping by such column's value:
-
-   ![](/images/tutorial/1.5/Kylin-Web-Tutorial/14 drag.png)
-
 * Visualization:
 
-   Also, the result set will be easy to show with different charts in "Visualization":
+   Also, the result set will be easy to show with different charts in "Visualization". There are 3 types of charts: line chart, pie chart and bar chart.
 
    note: line chart only available when there's at least one dimension with real "Date" data type of column from Hive Table.
 
    * Bar Chart:
 
    ![](/images/tutorial/1.5/Kylin-Web-Tutorial/15 bar-chart.png)
-   
-   * Pie Chart:
-
-   ![](/images/tutorial/1.5/Kylin-Web-Tutorial/16 pie-chart.png)
-
-   * Line Chart
-
-   ![](/images/tutorial/1.5/Kylin-Web-Tutorial/17 line-chart.png)
 
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/1 action-build.png b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/1 action-build.png
index b240f2f..4a67b97 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/1 action-build.png and b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/1 action-build.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/10 cube-segment.png b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/10 cube-segment.png
index 4b2704c..9fbf112 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/10 cube-segment.png and b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/10 cube-segment.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/3 date.PNG b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/3 date.PNG
new file mode 100644
index 0000000..6aeb311
Binary files /dev/null and b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/3 date.PNG differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/4 jobs-page.png b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/4 jobs-page.png
index 2dd941f..8ccb13c 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/4 jobs-page.png and b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/4 jobs-page.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/5 job-progress.png b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/5 job-progress.png
index c758be9..1b873c5 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/5 job-progress.png and b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/5 job-progress.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/6 discard.png b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/6 discard.png
index 9241ab2..9645acc 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/6 discard.png and b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/6 discard.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/7 job-steps.png b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/7 job-steps.png
index e53cebc..ccf091e 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/7 job-steps.png and b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/7 job-steps.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/8 hover-step.png b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/8 hover-step.png
index e09e082..65d516d 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/8 hover-step.png and b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/8 hover-step.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 log-d.png b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 log-d.png
index 6ee209f..82e63f2 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 log-d.png and b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 log-d.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 log.png b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 log.png
index 32c3c12..022ae4a 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 log.png and b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 log.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 mrjob-d.png b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 mrjob-d.png
index a044ff4..f6b0dc8 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 mrjob-d.png and b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 mrjob-d.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 mrjob.png b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 mrjob.png
index 76ba924..a0997b0 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 mrjob.png and b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 mrjob.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 parameters-d.png b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 parameters-d.png
index 619ee99..82ac988 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 parameters-d.png and b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 parameters-d.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 parameters.png b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 parameters.png
index 41ddfe5..1f47090 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 parameters.png and b/website/images/tutorial/1.5/Kylin-Cube-Build-and-Job-Monitoring-Tutorial/9 parameters.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/1 manage-prject.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/1 manage-prject.png
index 40e8be9..30d776c 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/1 manage-prject.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/1 manage-prject.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/10 configuration.PNG b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/10 configuration.PNG
new file mode 100644
index 0000000..707f01a
Binary files /dev/null and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/10 configuration.PNG differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/11 overview.PNG b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/11 overview.PNG
new file mode 100644
index 0000000..35ae11b
Binary files /dev/null and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/11 overview.PNG differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/2 +project.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/2 +project.png
index ec07eb9..443efc7 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/2 +project.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/2 +project.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/3 new-project.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/3 new-project.png
index 8c6da08..e368327 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/3 new-project.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/3 new-project.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/3.1 pj-created.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/3.1 pj-created.png
index bb351f8..daad26e 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/3.1 pj-created.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/3.1 pj-created.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/4 +table-tree.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/4 +table-tree.png
index a3ecf40..9e1e86b 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/4 +table-tree.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/4 +table-tree.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/4 +table.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/4 +table.png
index 6061202..24b2a58 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/4 +table.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/4 +table.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/5 hive-table-cardinality.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/5 hive-table-cardinality.png
index 6b41cbe..79b0438 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/5 hive-table-cardinality.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/5 hive-table-cardinality.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/5 hive-table-info.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/5 hive-table-info.png
index 9d8a701..cf88eaa 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/5 hive-table-info.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/5 hive-table-info.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/5 hive-table-tree.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/5 hive-table-tree.png
index f6873a3..c63c237 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/5 hive-table-tree.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/5 hive-table-tree.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/5 hive-table.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/5 hive-table.png
index 48b59cd..35a717d 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/5 hive-table.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/5 hive-table.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 +model.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 +model.png
index 642528f..19ab2b0 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 +model.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 +model.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-created.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-created.png
index 4ab98c1..7f66b26 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-created.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-created.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-dimensions.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-dimensions.png
index 301f108..71d58de 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-dimensions.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-dimensions.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-fact-table.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-fact-table.png
index 5bf1e08..88f2250 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-fact-table.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-fact-table.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-join-condition.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-join-condition.png
index dc87ad8..897490a 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-join-condition.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-join-condition.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-lookup-table.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-lookup-table.png
index 355e490..8f9b638 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-lookup-table.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-lookup-table.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-measures.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-measures.png
index 835300e..574e05f 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-measures.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-measures.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-name.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-name.png
index 67c36b8..f599651 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-name.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-name.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-partition-column.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-partition-column.png
index 7652ca7..78c9907 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-partition-column.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-partition-column.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/7 cube-dimension-batch.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/7 cube-dimension-batch.png
index 9413537..f42f9ab 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/7 cube-dimension-batch.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/7 cube-dimension-batch.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/7 cube-info.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/7 cube-info.png
index 1553cf6..eb75ded 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/7 cube-info.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/7 cube-info.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/7 new-cube.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/7 new-cube.png
index f759cf4..bb5b2cf 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/7 new-cube.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/7 new-cube.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 meas-+meas.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 meas-+meas.png
index 0f65ced..c1cdcfa 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 meas-+meas.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 meas-+meas.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-count.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-count.png
index a55c354..7e7c853 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-count.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-count.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-distinct.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-distinct.png
index 45f7cf5..b09d32b 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-distinct.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-distinct.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-extended_column.PNG b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-extended_column.PNG
new file mode 100644
index 0000000..82d0fe6
Binary files /dev/null and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-extended_column.PNG differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-max.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-max.png
index 3d88b1f..3a3e7dd 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-max.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-max.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-min.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-min.png
index 246cd72..7666312 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-min.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-min.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-percentile.PNG b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-percentile.PNG
new file mode 100644
index 0000000..e125941
Binary files /dev/null and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-percentile.PNG differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-sum.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-sum.png
index f353186..be70339 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-sum.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-sum.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-topn.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-topn.png
index 8de7597..50dc927 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-topn.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/8 measure-topn.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/9 refresh-setting1.png b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/9 refresh-setting1.png
index 0df975a..610c899 100644
Binary files a/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/9 refresh-setting1.png and b/website/images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/9 refresh-setting1.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Web-Tutorial/1 login.png b/website/images/tutorial/1.5/Kylin-Web-Tutorial/1 login.png
index e05ce90..998abd9 100644
Binary files a/website/images/tutorial/1.5/Kylin-Web-Tutorial/1 login.png and b/website/images/tutorial/1.5/Kylin-Web-Tutorial/1 login.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Web-Tutorial/10 query-result.png b/website/images/tutorial/1.5/Kylin-Web-Tutorial/10 query-result.png
index 5838488..c0a5ae3 100644
Binary files a/website/images/tutorial/1.5/Kylin-Web-Tutorial/10 query-result.png and b/website/images/tutorial/1.5/Kylin-Web-Tutorial/10 query-result.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Web-Tutorial/11 save-query.png b/website/images/tutorial/1.5/Kylin-Web-Tutorial/11 save-query.png
index ab63aa7..adc6375 100644
Binary files a/website/images/tutorial/1.5/Kylin-Web-Tutorial/11 save-query.png and b/website/images/tutorial/1.5/Kylin-Web-Tutorial/11 save-query.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Web-Tutorial/12 general.png b/website/images/tutorial/1.5/Kylin-Web-Tutorial/12 general.png
index 6f31a6a..c13fec2 100644
Binary files a/website/images/tutorial/1.5/Kylin-Web-Tutorial/12 general.png and b/website/images/tutorial/1.5/Kylin-Web-Tutorial/12 general.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Web-Tutorial/13 results.png b/website/images/tutorial/1.5/Kylin-Web-Tutorial/13 results.png
index cc17841..699bf6d 100644
Binary files a/website/images/tutorial/1.5/Kylin-Web-Tutorial/13 results.png and b/website/images/tutorial/1.5/Kylin-Web-Tutorial/13 results.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Web-Tutorial/15 bar-chart.png b/website/images/tutorial/1.5/Kylin-Web-Tutorial/15 bar-chart.png
index dc7a75d..86edb73 100644
Binary files a/website/images/tutorial/1.5/Kylin-Web-Tutorial/15 bar-chart.png and b/website/images/tutorial/1.5/Kylin-Web-Tutorial/15 bar-chart.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Web-Tutorial/2 table.PNG b/website/images/tutorial/1.5/Kylin-Web-Tutorial/2 table.PNG
new file mode 100644
index 0000000..355277e
Binary files /dev/null and b/website/images/tutorial/1.5/Kylin-Web-Tutorial/2 table.PNG differ
diff --git a/website/images/tutorial/1.5/Kylin-Web-Tutorial/3 cubes.png b/website/images/tutorial/1.5/Kylin-Web-Tutorial/3 cubes.png
index 1d3246e..38e9f77 100644
Binary files a/website/images/tutorial/1.5/Kylin-Web-Tutorial/3 cubes.png and b/website/images/tutorial/1.5/Kylin-Web-Tutorial/3 cubes.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Web-Tutorial/4 grid-view.PNG b/website/images/tutorial/1.5/Kylin-Web-Tutorial/4 grid-view.PNG
new file mode 100644
index 0000000..44b04da
Binary files /dev/null and b/website/images/tutorial/1.5/Kylin-Web-Tutorial/4 grid-view.PNG differ
diff --git a/website/images/tutorial/1.5/Kylin-Web-Tutorial/5 sql-view.png b/website/images/tutorial/1.5/Kylin-Web-Tutorial/5 sql-view.png
index 1fa1d1b..878a13e 100644
Binary files a/website/images/tutorial/1.5/Kylin-Web-Tutorial/5 sql-view.png and b/website/images/tutorial/1.5/Kylin-Web-Tutorial/5 sql-view.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Web-Tutorial/8 query.png b/website/images/tutorial/1.5/Kylin-Web-Tutorial/8 query.png
index 38ce4b8..7e537d2 100644
Binary files a/website/images/tutorial/1.5/Kylin-Web-Tutorial/8 query.png and b/website/images/tutorial/1.5/Kylin-Web-Tutorial/8 query.png differ
diff --git a/website/images/tutorial/1.5/Kylin-Web-Tutorial/9 query-table.png b/website/images/tutorial/1.5/Kylin-Web-Tutorial/9 query-table.png
index ffde5fc..cf9f68b 100644
Binary files a/website/images/tutorial/1.5/Kylin-Web-Tutorial/9 query-table.png and b/website/images/tutorial/1.5/Kylin-Web-Tutorial/9 query-table.png differ

-- 
To stop receiving notification emails like this one, please contact
shaofengshi@apache.org.

[kylin] 02/02: Refine document

Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

shaofengshi pushed a commit to branch document
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit 41a87af884c3ce655e19bfda6d6d2d5843fed7c4
Author: shaofengshi <sh...@apache.org>
AuthorDate: Wed Jun 13 18:17:20 2018 +0800

    Refine document
---
 website/_data/docs23.yml                           |  1 -
 .../howto/howto_build_cube_with_restapi.cn.md      |  4 +-
 website/_docs23/howto/howto_jdbc.md                |  2 +-
 website/_docs23/howto/howto_optimize_build.cn.md   |  2 +-
 website/_docs23/tutorial/Qlik.cn.md                |  2 +-
 website/_docs23/tutorial/acl.cn.md                 |  2 +-
 website/_docs23/tutorial/acl.md                    |  2 +-
 website/_docs23/tutorial/create_cube.cn.md         | 74 ++++++++++++----------
 website/_docs23/tutorial/create_cube.md            | 66 ++++++++++---------
 website/_docs23/tutorial/cube_build_job.cn.md      | 10 +--
 website/_docs23/tutorial/kylin_client_tool.cn.md   |  2 +-
 website/_docs23/tutorial/odbc.cn.md                |  2 +-
 website/_docs23/tutorial/powerbi.cn.md             |  4 +-
 website/_docs23/tutorial/query_pushdown.cn.md      |  4 +-
 website/_docs23/tutorial/tableau.cn.md             |  2 +-
 website/_docs23/tutorial/tableau_91.cn.md          |  2 +-
 website/_docs23/tutorial/web.cn.md                 |  6 +-
 website/_docs23/tutorial/web.md                    |  8 +--
 18 files changed, 103 insertions(+), 92 deletions(-)

diff --git a/website/_data/docs23.yml b/website/_data/docs23.yml
index 44efdef..e27a82a 100644
--- a/website/_data/docs23.yml
+++ b/website/_data/docs23.yml
@@ -41,7 +41,6 @@
   - tutorial/web
   - tutorial/create_cube
   - tutorial/cube_build_job
-  - tutorial/acl
   - tutorial/project_level_acl
   - tutorial/cube_spark
   - tutorial/cube_build_performance
diff --git a/website/_docs23/howto/howto_build_cube_with_restapi.cn.md b/website/_docs23/howto/howto_build_cube_with_restapi.cn.md
index c5e8fc3..555f07e 100644
--- a/website/_docs23/howto/howto_build_cube_with_restapi.cn.md
+++ b/website/_docs23/howto/howto_build_cube_with_restapi.cn.md
@@ -1,6 +1,6 @@
 ---
 layout: docs23-cn
-title:  用API构建cube
+title:  用 API 构建 Cube
 categories: 帮助
 permalink: /cn/docs23/howto/howto_build_cube_with_restapi.html
 ---
@@ -50,5 +50,5 @@ Content-Type: application/json;charset=UTF-8
 *   `GET http://localhost:7070/kylin/api/jobs/{job_uuid}`
 *   返回的 `job_status` 代表job的当前状态。
 
-### 5.	如果构建任务出现错误,可以重新开始它
+	## 5.	如果构建任务出现错误,可以重新开始它
 *   `PUT http://localhost:7070/kylin/api/jobs/{job_uuid}/resume`
diff --git a/website/_docs23/howto/howto_jdbc.md b/website/_docs23/howto/howto_jdbc.md
index 7243436..71cbf2c 100644
--- a/website/_docs23/howto/howto_jdbc.md
+++ b/website/_docs23/howto/howto_jdbc.md
@@ -1,6 +1,6 @@
 ---
 layout: docs23
-title:  Kylin JDBC Driver
+title:  JDBC Driver
 categories: howto
 permalink: /docs23/howto/howto_jdbc.html
 ---
diff --git a/website/_docs23/howto/howto_optimize_build.cn.md b/website/_docs23/howto/howto_optimize_build.cn.md
index 6103acf..2ac7cd3 100644
--- a/website/_docs23/howto/howto_optimize_build.cn.md
+++ b/website/_docs23/howto/howto_optimize_build.cn.md
@@ -1,6 +1,6 @@
 ---
 layout: docs23-cn
-title:  优化cube构建
+title:  优化 Cube 构建
 categories: 帮助
 permalink: /cn/docs23/howto/howto_optimize_build.html
 ---
diff --git a/website/_docs23/tutorial/Qlik.cn.md b/website/_docs23/tutorial/Qlik.cn.md
index 796d474..c3d9450 100644
--- a/website/_docs23/tutorial/Qlik.cn.md
+++ b/website/_docs23/tutorial/Qlik.cn.md
@@ -1,6 +1,6 @@
 ---
 layout: docs23-cn
-title:  与Qlik Sense集成
+title:  Qlik Sense 集成
 categories: tutorial
 permalink: /cn/docs23/tutorial/Qlik.html
 since: v2.2
diff --git a/website/_docs23/tutorial/acl.cn.md b/website/_docs23/tutorial/acl.cn.md
index 2042478..3282480 100644
--- a/website/_docs23/tutorial/acl.cn.md
+++ b/website/_docs23/tutorial/acl.cn.md
@@ -1,6 +1,6 @@
 ---
 layout: docs23-cn
-title:  Kylin Cube 权限授予教程
+title:  Cube 权限授予(v2.1)
 categories: 教程
 permalink: /cn/docs23/tutorial/acl.html
 version: v1.2
diff --git a/website/_docs23/tutorial/acl.md b/website/_docs23/tutorial/acl.md
index 0f9a864..b51d815 100644
--- a/website/_docs23/tutorial/acl.md
+++ b/website/_docs23/tutorial/acl.md
@@ -1,6 +1,6 @@
 ---
 layout: docs23
-title: Cube Permission (v2.1.x)
+title: Cube Permission (v2.1)
 categories: tutorial
 permalink: /docs23/tutorial/acl.html
 since: v0.7.1
diff --git a/website/_docs23/tutorial/create_cube.cn.md b/website/_docs23/tutorial/create_cube.cn.md
index a293ce3..824ac7a 100644
--- a/website/_docs23/tutorial/create_cube.cn.md
+++ b/website/_docs23/tutorial/create_cube.cn.md
@@ -1,19 +1,19 @@
----
+---
 layout: docs23-cn
-title:  Kylin Cube 创建教程
+title:  Cube 创建
 categories: 教程
 permalink: /cn/docs23/tutorial/create_cube.html
 version: v1.2
 since: v0.7.1
 ---
-  
-  
-### I. 新建一个项目
+
+
+### I. 新建项目
 1. 由顶部菜单栏进入 `Model` 页面,然后点击 `Manage Projects`。
 
    ![](/images/Kylin-Cube-Creation-Tutorial/1 manage-prject.png)
 
-2. 点击 `+ Project` 按钮添加一个新的项目或者忽略第一步并且点击 `Add Project`(第一张图片中右边的按钮)。
+2. 点击 `+ Project` 按钮添加一个新的项目。
 
    ![](/images/Kylin-Cube-Creation-Tutorial/2 %2Bproject.png)
 
@@ -25,8 +25,8 @@ since: v0.7.1
 
    ![](/images/Kylin-Cube-Creation-Tutorial/3.1 pj-created.png)
 
-### II. 同步一张表
-1. 在顶部菜单栏点击 `Model`,然后点击左边的 `Data Source` 标签,它会列出所有加载进Kylin的表,点击 `Load Table` 按钮。
+### II. 同步Hive表
+1. 在顶部菜单栏点击 `Model`,然后点击左边的 `Data Source` 标签,它会列出所有加载进 Kylin 的表,点击 `Load Table` 按钮。
 
    ![](/images/Kylin-Cube-Creation-Tutorial/4 %2Btable.png)
 
@@ -34,7 +34,7 @@ since: v0.7.1
 
    ![](/images/Kylin-Cube-Creation-Tutorial/5 hive-table.png)
 
-3. 【可选】如果你想要浏览hive数据库来选择表,点击 `Load Table From Tree` 按钮。
+3. 【可选】如果你想要浏览 hive 数据库来选择表,点击 `Load Table From Tree` 按钮。
 
    ![](/images/Kylin-Cube-Creation-Tutorial/5 hive-table.png)
 
@@ -46,18 +46,18 @@ since: v0.7.1
 
    ![](/images/Kylin-Cube-Creation-Tutorial/5 hive-table.png)
 
-6. 在后台,Kylin 将会执行 MapReduce 任务计算新 sync 表的 cardinality,任务完成后,刷新页面并点击表名,cardinality的值将会显示在表信息中。
+6. 在后台,Kylin 将会执行 MapReduce 任务计算新同步表的基数(cardinality),任务完成后,刷新页面并点击表名,基数值将会显示在表信息中。
 
    ![](/images/Kylin-Cube-Creation-Tutorial/5 hive-table.png)
 
-### III. 新建一个 Data Model
-创建 cube 前,需定义一个数据模型。数据模型定义为星形模型。一个模型可以被多个 cube 使用。
+### III. 新建 Data Model
+创建 cube 前,需定义一个数据模型。数据模型定义了一个星型(star schema)或雪花(snowflake schema)模型。一个模型可以被多个 cube 使用。
 
 ![](/images/Kylin-Cube-Creation-Tutorial/6 %2Bcube.png)
 
 1. 点击顶部的 `Model` ,然后点击 `Models` 标签。点击 `+New` 按钮,在下拉框中选择 `New Model`。
 
-2. 输入 model 的名字和可选的 description。
+2. 输入 model 的名字和可选的描述。
 
 ![](/images/Kylin-Cube-Creation-Tutorial/7 cube-info.png)
 
@@ -65,11 +65,11 @@ since: v0.7.1
 
     ![](/images/Kylin-Cube-Creation-Tutorial/8 dim-factable.png)
 
-4. 【可选】点击 `Add Lookup Table` 按钮添加一个 lookup 表。选择表名和 join 类型(内连接或左连接)
+4. 【可选】点击 `Add Lookup Table` 按钮添加一个 lookup 表。选择表名和关联类型(内连接或左连接)
 
     ![](/images/Kylin-Cube-Creation-Tutorial/8 dim-%2Bdim.png)
 
-5. 【可选】点击 `New Join Condition` 按钮,左边选择事实表的外键,右边选择 lookup 表的主键。如果有多于一个 join 列重复执行。
+5. 点击 `New Join Condition` 按钮,左边选择事实表的外键,右边选择 lookup 表的主键。如果有多于一个 join 列重复执行。
 
     ![](/images/Kylin-Cube-Creation-Tutorial/8 dim-typeA.png)
 
@@ -82,7 +82,7 @@ since: v0.7.1
 
 ![](/images/Kylin-Cube-Creation-Tutorial/7 cube-info.png)
 
-9. 点击 “Next” 到达 “Settings” 页面,如果事实表中的数据每日增长,选择 `Partition Date Column` 中相应的 date 列以及 date 格式,否则就将其留白。
+9. 点击 “Next” 到达 “Settings” 页面,如果事实表中的数据每日增长,选择 `Partition Date Column` 中相应的 日期列以及日期格式,否则就将其留白。
 
     ![](/images/Kylin-Cube-Creation-Tutorial/8 dim-factable.png)
 
@@ -90,14 +90,14 @@ since: v0.7.1
 
     ![](/images/Kylin-Cube-Creation-Tutorial/8 dim-%2Bdim.png)
 
-11. 【可选】如果一些 records 想从 cube 中移除出去,就像脏数据,可以在 `Filter` 中输入条件。
+11. 【可选】如果在从 hive 抽取数据时候想做一些筛选,可以在 `Filter` 中输入筛选条件。
 
     ![](/images/Kylin-Cube-Creation-Tutorial/8 dim-typeA.png)
 
 12. 点击 `Save` 然后选择 `Yes` 来保存 data model。创建完成,data model 就会列在左边 `Models` 列表中。
    ![](/images/Kylin-Cube-Creation-Tutorial/8 dim-edit.png)
 
-### III. 新建一个 Cube
+### III. 新建 Cube
 
 创建完 data model,可以开始创建 cube。
 点击顶部 `Model`,然后点击 `Models` 标签。点击 `+New` 按钮,在下拉框中选择 `New Cube`。
@@ -106,13 +106,13 @@ since: v0.7.1
 
 1. 选择 data model,输入 cube 名字;点击 `Next` 进行下一步。
 
-cube 名字可以使用字母,数字和下划线(空格也是允许的)。`Notification Email List` 是运用来通知job执行成功或失败情况的邮箱列表。`Notification Events` 是触发事件的状态。
+cube 名字可以使用字母,数字和下划线(空格不允许)。`Notification Email List` 是运用来通知job执行成功或失败情况的邮箱列表。`Notification Events` 是触发事件的状态。
 
    ![](/images/Kylin-Cube-Creation-Tutorial/9 meas-%2Bmeas.png)
 
 **步骤2. 维度**
 
-1. 点击 `Add Dimension`,在弹窗中显示的事实表和lookup表里勾选输入需要的列。Lookup 表的列有2个选项:“Normal” 和 “Derived”(默认)。“Normal” 添加一个 normal 独立的维度列,“Derived” 添加一个 derived 维度。阅读更多【如何优化 cube】(/docs15/howto/howto_optimize_cubes.html)。
+1. 点击 `Add Dimension`,在弹窗中显示的事实表和 lookup 表里勾选输入需要的列。Lookup 表的列有2个选项:“Normal” 和 “Derived”(默认)。“Normal” 添加一个普通独立的维度列,“Derived” 添加一个 derived 维度,derived 维度不会计算入 cube,将由事实表的外键推算出。阅读更多【如何优化 cube】(/docs15/howto/howto_optimize_cubes.html)。
 
 2. 选择所有维度后点击 “Next”。
 
@@ -145,11 +145,11 @@ cube 名字可以使用字母,数字和下划线(空格也是允许的)。
    2)精确实现 bitmap(具体限制请看 https://issues.apache.org/jira/browse/KYLIN-1186)
 
      ![](/images/Kylin-Cube-Creation-Tutorial/9 meas-distinct.png)
-    
+   
     注意:distinct 是一种非常重的数据类型,和其他度量相比构建和查询会更慢。
-    
+   
    * TOP_N
-   TopN 度量在每个维度结合时预计算,它比未预计算的在查询时间上性能更好;需要两个参数:一是被用来作为 Top 记录的度量列;二是 literal ID,代表记录就像 seller_id;
+   TopN 度量在每个维度结合时预计算,它比未预计算的在查询时间上性能更好;需要两个参数:一是被用来作为 Top 记录的度量列,Kylin 将计算它的 SUM 值并做倒序排列;二是 literal ID,代表最 Top 的记录,例如 seller_id;
    
    合理的选择返回类型,将决定多少 top 记录被监察:top 10, top 100, top 500, top 1000, top 5000 or top 10000。
 
@@ -179,27 +179,37 @@ cube 名字可以使用字母,数字和下划线(空格也是允许的)。
 
 **步骤5. 高级设置**
 
-`Aggregation Groups`: 默认 kylin 会把所有维度放在一个聚合组;如果你很好的了解你的查询模式,那么你可以创建多个聚合组。对于 "Mandatory Dimensions", "Hierarchy Dimensions" 和 "Joint Dimensions", 请阅读这个博客: [新的聚合组](/blog/2016/02/18/new-aggregation-group/)
+`Aggregation Groups`: Cube 中的维度可以划分到多个聚合组中。默认 kylin 会把所有维度放在一个聚合组,当维度较多时,产生的组合数可能是巨大的,会造成 Cube 爆炸;如果你很好的了解你的查询模式,那么你可以创建多个聚合组。在每个聚合组内,使用 "Mandatory Dimensions", "Hierarchy Dimensions" 和 "Joint Dimensions" 来进一步优化维度组合。
+
+`Mandatory Dimensions`: 必要维度,用于总是出现的维度。例如,如果你的查询中总是会带有 "ORDER_DATE" 做为 group by 或 过滤条件, 那么它可以被声明为必要维度。这样一来,所有不含此维度的 cuboid 就可以被跳过计算。
+
+`Hierarchy Dimensions`: 层级维度,例如 "国家" -> "省" -> "市" 是一个层级;不符合此层级关系的 cuboid 可以被跳过计算,例如 ["省"], ["市"]. 定义层级维度时,将父级别维度放在子维度的左边。
+
+`Joint Dimensions`:联合维度,有些维度往往一起出现,或者它们的基数非常接近(有1:1映射关系)。例如 "user_id" 和 "email"。把多个维度定义为组合关系后,所有不符合此关系的 cuboids 会被跳过计算。 
+
+关于更多维度优化,请阅读这个博客: [新的聚合组](/blog/2016/02/18/new-aggregation-group/)
+
+`Rowkeys`: 是由维度编码值组成。"Dictionary" (字典)是默认的编码方式; 字典只能处理中低基数(少于一千万)的维度;如果维度基数很高(如大于1千万), 选择 "false" 然后为维度输入合适的长度,通常是那列的最大长度值; 如果超过最大值,会被截断。请注意,如果没有字典编码,cube 的大小可能会非常大。
 
-`Rowkeys`: 是由维度编码值组成。"Dictionary" 是默认的编码方式; 如果维度和字典不符合(比如 cardinality > 1千万), 选择 "false" 然后为维度输入合适的长度,通常是那列的最大值; 如果超过最大值,他将会被截断。请注意,如果没有字典编码,cube 的大小将会变的非常大。
+你可以拖拽维度列去调整其在 rowkey 中位置; 位于rowkey前面的列,将可以用来大幅缩小查询的范围。通常建议将 mandantory 维度放在开头, 然后是在过滤 ( where 条件)中起到很大作用的维度;如果多个列都会被用于过滤,将高基数的维度(如 user_id)放在低基数的维度(如 age)的前面。
 
-你可以拖拽维度列去调整其在 rowkey 中位置; 将 mandantory 维度放在开头, 然后是在过滤 ( where 条件)中起到很大作用的维度. 将高 cardinality 的维度放在低 cardinality 的维度前.
+`Mandatory Cuboids`: 维度组合白名单。确保你想要构建的 cuboid 能被构建。
 
-`Mandatory Cuboids`: 确保你想要构建的 cuboid 能顺利构建。
+`Cube Engine`: cube 构建引擎。有两种:MapReduce 和 Spark。如果你的 cube 只有简单度量(SUM, MIN, MAX),建议使用 Spark。如果 cube 中有复杂类型度量(COUNT DISTINCT, TOP_N),建议使用 MapReduce。 
 
-`Cube Engine`: cube 构建引擎。有两种类型:MapReduce and Spark。
+`Advanced Dictionaries`: "Global Dictionary" 是用于精确计算 COUNT DISTINCT 的字典, 它会将一个非 integer的值转成 integer,以便于 bitmap 进行去重。如果你要计算 COUNT DISTINCT 的列本身已经是 integer 类型,那么不需要定义 Global Dictionary。 Global Dictionary 会被所有 segment 共享,因此支持在跨 segments 之间做上卷去重操作。请注意,Global Dictionary 随着数据的加载,可能会不断变大。
 
-`Advanced Dictionaries`: "Global Dictionary" 是准确计算不同度量的默认字典, 支持在所有 segments 汇总。
+"Segment Dictionary" 是另一个用于精确计算 COUNT DISTINCT 的字典,与 Global Dictionary 不同的是,它是基于一个 segment 的值构建的,因此不支持跨 segments 的汇总计算。如果你的 cube 不是分区的或者能保证你的所有 SQL 按照 partition_column 进行 group by, 那么你应该使用 "Segment Dictionary" 而不是 "Global Dictionary",这样可以避免单个字典过大的问题。
 
-"Segment Dictionary" 是准确计算不同度量的专用字典, 是基于一个 segment 的并且不支持在所有 segments 汇总。特别地,如果你的 cube 不是分区的或者你能保证你的所有 SQL 按照 partition_column 进行 group by, 那么你应该使用 "Segment Dictionary" 而不是 "Global Dictionary"。
+请注意:"Global Dictionary" 和 "Segment Dictionary" 都是单向编码的字典,仅用于 COUNT DISTINCT 计算(将非 integer 类型转成 integer 用于 bitmap计算),他们不支持解码,因此不能为普通维度编码。
 
 `Advanced Snapshot Table`: 为全局 lookup 表而设计,提供不同的存储类型。
 
-`Advanced ColumnFamily`: 如果有超过一个超高的 cardinality 精确的计算不同的度量, 你可以将它们放在更多列簇中。
+`Advanced ColumnFamily`: 如果有超过一个的COUNT DISTINCT 或 TopN 度量, 你可以将它们放在更多列簇中,以优化与HBase 的I/O。
 
 **步骤6. 重写配置**
 
-Cube 级别的属性将会覆盖 kylin.properties 中的配置, 如果你没有要配置的,点击 `Next` 按钮。
+Kylin 允许在 Cube 级别覆盖部分 kylin.properties 中的配置,你可以在这里定义覆盖的属性。如果你没有要配置的,点击 `Next` 按钮。
 
 ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/10 configuration.png)
 
diff --git a/website/_docs23/tutorial/create_cube.md b/website/_docs23/tutorial/create_cube.md
index b5adce8..6947ff7 100644
--- a/website/_docs23/tutorial/create_cube.md
+++ b/website/_docs23/tutorial/create_cube.md
@@ -1,4 +1,4 @@
----
+---
 layout: docs23
 title:  Cube Wizard
 categories: tutorial
@@ -6,21 +6,19 @@ permalink: /docs23/tutorial/create_cube.html
 ---
 
 This tutorial will guide you to create a cube. It need you have at least 1 sample table in Hive. If you don't have, you can follow this to create some data.
-  
+
 ### I. Create a Project
 1. Go to `Model` page in top menu bar, then click `Manage Projects`.
 
    ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/1 manage-prject.png)
 
-2. Click the `+ Project` button to add a new project or ignore the first step and click `Add Project`(button on the right) of the first picture.
-
-   ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/2 +project.png)
+2. Click the `+ Project` button to add a new project.
 
-3. Enter a project name, e.g, "Tutorial", with a description (optional) and the config (optional), then click `submit` button to send the request.
+3. Enter a project name, e.g, "Tutorial", with a description (optional) and the overwritten Kylin configuration properties (optional), then click `submit` button.
 
    ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/3 new-project.png)
 
-4. After success, the project will show in the table.
+4. After success, the project will show in the table. You can switch the current project with the dropdown in the top of the page.
 
    ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/3.1 pj-created.png)
 
@@ -29,7 +27,7 @@ This tutorial will guide you to create a cube. It need you have at least 1 sampl
 
    ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/4 +table.png)
 
-2. Enter the hive table names, separated with commad, and then click `Sync` to send the request.
+2. Enter the hive table names, separated with commad, and then click `Sync` .
 
    ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/5 hive-table.png)
 
@@ -41,7 +39,7 @@ This tutorial will guide you to create a cube. It need you have at least 1 sampl
 
    ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/5 hive-table-tree.png)
 
-5. A success message will pop up. In the left `Tables` section, the newly loaded table is added. Click the table name will expand the columns.
+5.  In the left `Tables` section, the newly loaded table is added. Click the table name will shows the columns.
 
    ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/5 hive-table-info.png)
 
@@ -51,7 +49,7 @@ This tutorial will guide you to create a cube. It need you have at least 1 sampl
 
 
 ### III. Create Data Model
-Before create a cube, need define a data model. The data model defines the star schema. One data model can be reused in multiple cubes.
+Before creating a cube, you need to define a data model. The data model defines a star/snowflake schema. But it doesn't define the aggregation policies. One data model can be referenced by multiple cubes.
 
 1. Click `Model` in top bar, and then click `Models` tab. Click `+New` button, in the drop-down list select `New Model`.
 
@@ -69,34 +67,34 @@ Before create a cube, need define a data model. The data model defines the star
 
     ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-lookup-table.png)
 
-5. [Optional] Click `New Join Condition` button, select the FK column of fact table in the left, and select the PK column of lookup table in the right side. Repeat this if have more than one join columns.
+5. Click `New Join Condition` button, select the FK column of fact table in the left, and select the PK column of lookup table in the right side. Repeat this step if have more than one join columns.
 
     ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-join-condition.png)
 
 6. Click "OK", repeat step 4 and 5 to add more lookup tables if any. After finished, click "Next".
 
-7. The "Dimensions" page allows to select the columns that will be used as dimension in the child cubes. Click the `Columns` cell of a table, in the drop-down list select the column to the list. 
+7. The "Dimensions" page allows to select the columns that will be used as dimension in the cubes. Click the `Columns` cell of a table, in the drop-down list select the column to the list. Usually all "Varchar", "String", "Date" columns should be declared as dimension. Only a column in this list can be added into a cube as dimension, so please add all possible dimension columns here.
 
     ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-dimensions.png)
 
-8. Click "Next" go to the "Measures" page, select the columns that will be used in measure/metrics. The measure column can only from fact table. 
+8. Click "Next" go to the "Measures" page, select the columns that will be used in measure/metrics. The measure column can only from fact table. Usually the "long", "int", "double", "decimal" columns are declared as measures. 
 
     ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-measures.png)
 
 9. Click "Next" to the "Settings" page. If the data in fact table increases by day, select the corresponding date column in the `Partition Date Column`, and select the date format, otherwise leave it as blank.
 
-10. [Optional] Choose whether has a separate "time of the day" column, by default it is `No`. If choose `Yes`, select the corresponding time column in the `Partition Time Column`, and select the time format.
+10. [Optional] Choose whether has a separate "time of the day" column, by default it is `No`. If choose `Yes`, select the corresponding time column in the `Partition Time Column`, and select the time format.![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-partition-column.png)
 
-11. [Optional] If some records want to excluded from the cube, like dirty data, you can input the condition in `Filter`.
+11. [Optional] If some conditions need to be applied when extracting data from Hive,  you can input the condition in `Filter`.
 
-    ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-partition-column.png)
+    
 
 12. Click `Save` and then select `Yes` to save the data model. After created, the data model will be shown in the left `Models` list.
 
     ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/6 model-created.png)
 
 ### IV. Create Cube
-After the data model be created, you can start to create cube. 
+After the data model be created, you can start to create a cube. 
 
 Click `Model` in top bar, and then click `Models` tab. Click `+New` button, in the drop-down list select `New Cube`.
 
@@ -109,14 +107,14 @@ Select the data model, enter the cube name; Click `Next` to enter the next step.
 You can use letters, numbers and '_' to name your cube (blank space in name is not allowed). `Notification Email List` is a list of email addresses which be notified on cube job success/failure. `Notification Events` is the status to trigger events.
 
     ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/7 cube-info.png)
-    
+
 **Step 2. Dimensions**
 
-1. Click `Add Dimension`, it pops up a window: tick columns that you need from FactTable and LookupTable. There are two options for LookupTable columns: "Normal" and "Derived" (default)。"Normal" is to add a normal independent dimension column, "Derived" is to add a derived dimension column. Read more in [How to optimize cubes](/docs15/howto/howto_optimize_cubes.html).
+1. Click `Add Dimension`, it pops up a window: tick columns that you need from FactTable and LookupTable. There are two options for LookupTable columns: "Normal" and "Derived" (default). "Normal" is to add a normal independent dimension column, "Derived" is to add a derived dimension column (deriving from the FK of the fact table). Read more in [How to optimize cubes](/docs15/howto/howto_optimize_cubes.html).
 
    ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/7 cube-dimension-batch.png)
 
-2. Click "Next" after select all dimensions.
+2. Click "Next" after select all other dimensions.
 
 **Step 3. Measures**
 
@@ -151,7 +149,7 @@ You can use letters, numbers and '_' to name your cube (blank space in name is n
    Pleaste note: distinct count is a very heavy data type, it is slower to build and query comparing to other measures.
 
    * TOP_N
-   Approximate TopN measure pre-calculates the top records in each dimension combination, it will provide higher performance in query time than no pre-calculation; Need specify two parameters here: the first is the column will be used as metrics for Top records (aggregated with SUM and then sorted in descending order); the second is the literal ID, represents the record like seller_id;
+   Approximate TopN measure pre-calculates the top records in each dimension combination, it will provide higher performance in query time than no pre-calculation; Need specify two parameters here: the first is the column will be used as metrics for Top records (aggregated with SUM and then sorted in descending order); the second is the literal ID, represents the entity like seller_id;
 
    Properly select the return type, depends on how many top records to inspect: top 10, top 100, top 500, top 1000, top 5000 or top 10000. 
 
@@ -183,27 +181,37 @@ This step is designed for incremental cube build.
 
 **Step 5. Advanced Setting**
 
-`Aggregation Groups`: by default Kylin put all dimensions into one aggregation group; you can create multiple aggregation groups by knowing well about your query patterns. For the concepts of "Mandatory Dimensions", "Hierarchy Dimensions" and "Joint Dimensions", read this blog: [New Aggregation Group](/blog/2016/02/18/new-aggregation-group/)
+`Aggregation Groups`: The dimensions can be divided into multiple groups, each group is called an "agg group". By default Kylin put all dimensions into one aggregation group. When you have many dimensions, that will cause cube explosion. You can create multiple agg groups by knowing well about your query patterns. In each agg group, you can use the concepts of "Mandatory Dimensions", "Hierarchy Dimensions" and "Joint Dimensions" to further optimize the dimension combinations. 
+
+`Mandatory Dimensions`: Dimensions that appears always. For example, if all your queries have "ORDER_DATE" as the group by or filtering condition, then it can be marked as mandatory. The cuboids that doesn't have this dimension can be omitted for building.
+
+`Hierarchy Dimensions`: For example "Country" -> "State" -> "City" is a logic hierarchy; The cuboids that doesn't comply with this hierarchy can be omitted for building, for example ["STATE", "CITY"], ["CITY"]. When defining a hierarchy, put the parent level dimension before the child level dimension.
+
+`Joint Dimensions`:Some dimensions will always appear together, or their cardinality is close (near 1:1). For example, "user_id" and "email". Defining them as a joint relationship, then the cuboids only has partial of them can be omitted. 
+
+For more please read this blog: [New Aggregation Group](/blog/2016/02/18/new-aggregation-group/)
 
 `Rowkeys`: the rowkeys are composed by the dimension encoded values. "Dictionary" is the default encoding method; If a dimension is not fit with dictionary (e.g., cardinality > 10 million), select "false" and then enter the fixed length for that dimension, usually that is the max length of that column; if a value is longer than that size it will be truncated. Please note, without dictionary encoding, the cube size might be much bigger.
 
 You can drag & drop a dimension column to adjust its position in rowkey; Put the mandantory dimension at the begining, then followed the dimensions that heavily involved in filters (where condition). Put high cardinality dimensions ahead of low cardinality dimensions.
 
-`Mandatory Cuboids`: ensure the cuboid that you want to build can build smoothly.
+`Mandatory Cuboids`: Whitelist of the cuboids that you want to build.
+
+`Cube Engine`: The engine for building cube. There are 2 engines: MapReduce and Spark. If your cube only has simple measures (COUNT, SUM, MIN, MAX), Spark can gain better performance; If cube has complex measures (COUNT DISTINCT, TOP_N), MapReduce is more stable.
 
-`Cube Engine`: the engine for building cube. There are 2 types: MapReduce and Spark.
+`Advanced Dictionaries`: "Global Dictionary" is the default dictionary for precise count distinct measure, it can ensure one value always be encoded into one consistent integer, so it can support "COUNT DISTINCT" rollup among multiple segments. But global dictionary may grow to very big size as time go.
 
-`Advanced Dictionaries`: "Global Dictionary" is the default dict for precise count distinct measure, which support rollup among all segments.
+"Segment Dictionary" is a special dictionary for precise count distinct measure, which is built on one segment and could not support rollup among segments. Its size can be much smaller than global dictionary. Specifically, if your cube isn't partitioned or you can ensure all your SQLs will group by your partition_column, you could use "Segment Dictionary" instead of "Global Dictionary".
 
-"Segment Dictionary" is the special dict for precise count distinct measure, which is based on one segment and could not support rollup among segments. Specifically, if your cube isn't partitioned or you can ensure all your SQLs will group by your partition_column, you could use "Segment Dictionary" instead of "Global Dictionary".
+Please note: "Global Dictionary" and "Segment Dictionary" are one-way dictionary for COUNT DISTINCT (converting a non-integer value to integer for bitmap), they couldn't be used as the encoding for a dimension.
 
 `Advanced Snapshot Table`: design for global lookup table and provide different storage type.
 
-`Advanced ColumnFamily`: If there are more than one ultrahigh cardinality precise count distinct measures, you could assign these measures to more column family.
+`Advanced ColumnFamily`: If there are more than one ultra-high cardinality precise count distinct or TopN measures, you could divide these measures to more column family to optimize the I/O from HBase.
 
 **Step 6. Configuration Overwrites**
 
-Cube level properties will overwrite configuration in kylin.properties, if you don't have anything to config, click `Next` button.
+Kylin allows overwritting system configurations (conf/kylin.properties) at Cube level . You can add the key/values that you want to overwrite here. If you don't have anything to config, click `Next` button.
 
 ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/10 configuration.png)
 
@@ -213,4 +221,4 @@ You can overview your cube and go back to previous step to modify it. Click the
 
 ![]( /images/tutorial/1.5/Kylin-Cube-Creation-Tutorial/11 overview.png)
 
-Cheers! now the cube is created, you can go ahead to build and play it.
+Cheers! Now the cube is created, you can go ahead to build and play it.
diff --git a/website/_docs23/tutorial/cube_build_job.cn.md b/website/_docs23/tutorial/cube_build_job.cn.md
index d94edc1..3040115 100644
--- a/website/_docs23/tutorial/cube_build_job.cn.md
+++ b/website/_docs23/tutorial/cube_build_job.cn.md
@@ -1,15 +1,9 @@
----
-
+---
 layout: docs23-cn
-
-title:  Kylin Cube 建立和Job监控教程
-
+title: Cube 构建和 Job 监控
 categories: 教程
-
 permalink: /cn/docs23/tutorial/cube_build_job.html
-
 version: v1.2
-
 since: v0.7.1
 
 ---
diff --git a/website/_docs23/tutorial/kylin_client_tool.cn.md b/website/_docs23/tutorial/kylin_client_tool.cn.md
index d240017..df2754a 100644
--- a/website/_docs23/tutorial/kylin_client_tool.cn.md
+++ b/website/_docs23/tutorial/kylin_client_tool.cn.md
@@ -1,6 +1,6 @@
 ---
 layout: docs23-cn
-title:  Kylin Python 客户端工具库
+title:  Python 客户端工具库
 categories: 教程
 permalink: /cn/docs23/tutorial/kylin_client_tool.html
 ---
diff --git a/website/_docs23/tutorial/odbc.cn.md b/website/_docs23/tutorial/odbc.cn.md
index ddcd8c7..6515bfc 100644
--- a/website/_docs23/tutorial/odbc.cn.md
+++ b/website/_docs23/tutorial/odbc.cn.md
@@ -1,6 +1,6 @@
 ---
 layout: docs23-cn
-title:  Kylin ODBC 驱动程序教程
+title:  ODBC 驱动程序
 categories: 教程
 permalink: /cn/docs23/tutorial/odbc.html
 version: v1.2
diff --git a/website/_docs23/tutorial/powerbi.cn.md b/website/_docs23/tutorial/powerbi.cn.md
index c4d6b8a..2dd3223 100644
--- a/website/_docs23/tutorial/powerbi.cn.md
+++ b/website/_docs23/tutorial/powerbi.cn.md
@@ -1,6 +1,6 @@
 ---
 layout: docs23-cn
-title:  微软Excel及Power BI教程
+title:  MS Excel及Power BI教程
 categories: tutorial
 permalink: /cn/docs23/tutorial/powerbi.html
 version: v1.2
@@ -28,7 +28,7 @@ Microsoft Power BI 是由微软推出的商业智能的专业分析工具,给
 
 > 为了简化连接字符串的输入,推荐创建Apache Kylin的DSN,可以将连接字符串简化为DSN=[YOUR_DSN_NAME],有关DSN的创建请参考:[https://support.microsoft.com/en-us/kb/305599](https://support.microsoft.com/en-us/kb/305599)。
 
- 
+
 3. 如果您选择不输入SQL语句,Power Query将会列出所有的数据库表,您可以根据需要对整张表的数据进行加载。但是,Apache Kylin暂不支持原数据的查询,部分表的加载可能因此受限
 ![](/images/tutorial/odbc/ms_tool/Picture3.png)
 
diff --git a/website/_docs23/tutorial/query_pushdown.cn.md b/website/_docs23/tutorial/query_pushdown.cn.md
index ca3e6cb..0e5ebc1 100644
--- a/website/_docs23/tutorial/query_pushdown.cn.md
+++ b/website/_docs23/tutorial/query_pushdown.cn.md
@@ -6,7 +6,7 @@ permalink: /cn/docs23/tutorial/query_pushdown.html
 since: v2.1
 ---
 
-### Kylin支持查询下压
+### Kylin 支持查询下压
 
 对于没有cube能查得结果的sql,Kylin支持将这类查询通过JDBC下压至备用查询引擎如Hive, SparkSQL, Impala等来查得结果。以下以Hive为例说明开启步骤,由于Kylin本事就将Hive作为数据源,作为Query Pushdown引擎也更易使用与配置。
 
@@ -20,7 +20,7 @@ since: v2.1
     - *kylin.query.pushdown.jdbc.url*:Hive JDBC的URL.
 
     - *kylin.query.pushdown.jdbc.driver*:Hive Jdbc的driver类名
-        
+      
     - *kylin.query.pushdown.jdbc.username*:Hive Jdbc对应数据库的用户名
 
     - *kylin.query.pushdown.jdbc.password*:Hive Jdbc对应数据库的密码
diff --git a/website/_docs23/tutorial/tableau.cn.md b/website/_docs23/tutorial/tableau.cn.md
index 57868d1..8e33ac4 100644
--- a/website/_docs23/tutorial/tableau.cn.md
+++ b/website/_docs23/tutorial/tableau.cn.md
@@ -1,6 +1,6 @@
 ---
 layout: docs23-cn
-title:  Tableau教程
+title:  Tableau
 categories: 教程
 permalink: /cn/docs23/tutorial/tableau.html
 version: v1.2
diff --git a/website/_docs23/tutorial/tableau_91.cn.md b/website/_docs23/tutorial/tableau_91.cn.md
index 9693b7a..9d20866 100644
--- a/website/_docs23/tutorial/tableau_91.cn.md
+++ b/website/_docs23/tutorial/tableau_91.cn.md
@@ -1,6 +1,6 @@
 ---
 layout: docs23-cn
-title:  Tableau 9 教程
+title:  Tableau 9 
 categories: tutorial
 permalink: /cn/docs23/tutorial/tableau_91.html
 version: v1.2
diff --git a/website/_docs23/tutorial/web.cn.md b/website/_docs23/tutorial/web.cn.md
index 6e34423..ad311d3 100644
--- a/website/_docs23/tutorial/web.cn.md
+++ b/website/_docs23/tutorial/web.cn.md
@@ -1,6 +1,6 @@
----
+---
 layout: docs23-cn
-title:  Kylin网页版教程
+title:  Web 界面
 categories: 教程
 permalink: /cn/docs23/tutorial/web.html
 version: v1.2
@@ -64,7 +64,7 @@ Kylin 的网页版为用户提供了一个简单的查询工具来运行 SQL 以
 
    ![]( /images/Kylin-Web-Tutorial/10 query-result.png)
 
-* 已保存的查询(只在 LDAP security 有效后才能使用):
+* 已保存的查询:
 
    与用户账号关联,你将能够从不同的浏览器甚至机器上获取已保存的查询。
    在结果区域点击 “Save”,将会弹出用来保存当前查询名字和描述:
diff --git a/website/_docs23/tutorial/web.md b/website/_docs23/tutorial/web.md
index d0d15e9..8257099 100644
--- a/website/_docs23/tutorial/web.md
+++ b/website/_docs23/tutorial/web.md
@@ -1,4 +1,4 @@
----
+---
 layout: docs23
 title:  Web Interface
 categories: tutorial
@@ -17,12 +17,12 @@ Login with password:KYLIN
 ![](/images/tutorial/1.5/Kylin-Web-Tutorial/1 login.png)
 
 ## 2. Sync Hive Table into Kylin
-Although Kylin will using SQL as query interface and leverage Hive metadata, kylin will not enable user to query all hive tables since it's a pre-build OLAP (MOLAP) system so far. To enable Table in Kylin, it will be easy to using "Sync" function to sync up tables from Hive.
+Although Kylin will using SQL as query interface and leverage Hive metadata, kylin will not enable user to query all hive tables since it's a pre-build OLAP (MOLAP) system so far. To enable Table in Kylin, use "Sync" function to sync up hive table metadata to Kylin.
 
 ![](/images/tutorial/1.5/Kylin-Web-Tutorial/2 tables.png)
 
 ## 3. Kylin OLAP Cube
-Kylin's OLAP Cubes are pre-calculation datasets from star schema tables, Here's the web interface for user to explore, manage all cubes. Go to `Model` menu, it will list all cubes available in system.
+Kylin's OLAP Cubes are pre-calculation datasets from star/snowflake schema tables, Here's the web interface for user to explore, manage all cubes. Go to `Model` menu, it will list all cubes available in system.
 
 ![](/images/tutorial/1.5/Kylin-Web-Tutorial/3 cubes.png)
 
@@ -61,7 +61,7 @@ Go to "Insight" menu.
 
    ![](/images/tutorial/1.5/Kylin-Web-Tutorial/10 query-result.png)
 
-* Saved Query (only work after enable LDAP security):
+* Saved Query:
 
    Associate with user account, you can get saved query from different browsers even machines.
    Click "Save" in Result area, it will popup for name and description to save current query.

-- 
To stop receiving notification emails like this one, please contact
shaofengshi@apache.org.