update website, add TM mark, added 2 companies on powered by page.

Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/9457552e
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/9457552e
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/9457552e

Branch: refs/heads/master
Commit: 9457552e07555a67a5b8c0389981cb5eadd59214
Parents: 95bc7df
Author: lukehan <luke...@apache.org>
Authored: Fri Dec 4 22:50:44 2015 +0800
Committer: lukehan <luke...@apache.org>
Committed: Fri Dec 4 22:50:44 2015 +0800

----------------------------------------------------------------------
 website/_data/contributors.yml | 30 ++++++++++++++++++++++++------
 website/community/poweredby.md |  5 +++++
 website/download/index.cn.md   |  2 +-
 website/download/index.md      |  2 +-
 website/index.cn.md            |  7 +++----
 website/index.md               |  7 +++----
 6 files changed, 37 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/9457552e/website/_data/contributors.yml
----------------------------------------------------------------------
diff --git a/website/_data/contributors.yml b/website/_data/contributors.yml
index dfc3d9b..17b9e38 100644
--- a/website/_data/contributors.yml
+++ b/website/_data/contributors.yml
@@ -39,7 +39,7 @@
   githubId: julianhyde
   org: Hortonworks
   role: Mentor
-- name: Luke Han (韩卿) 
+- name: Luke Han (韩卿) (Chair)
   apacheId: lukehan
   githubId: lukehan
   org: eBay
@@ -74,12 +74,12 @@
   apacheId: xduo
   githubId: xduo
   org: Alipay
-  role: PMC
+  role: Emeritus PMC
 - name: Ankur Bansal
   apacheId: abansal
   githubId: abansal
   org: eBay
-  role: PMC
+  role: Emeritus PMC
 - name: Xu Jiang (蒋旭)
   apacheId: jiangxu
   githubId: jiangxuchina
@@ -94,12 +94,30 @@
   apacheId: 
   githubId: gaodayue
   org: Meituan
-  role: committer
+  role: PMC
 - name: Hua Huang (黄桦)
   apacheId: 
   githubId: superhua
   org: MiningLAMP
+  role: PMC 
+- name: Dong Li (李栋)
+  apacheId: 
+  githubId: 
+  org: eBay
+  role: committer   
+- name: Xiaoyu Wang (王晓雨)
+  apacheId: 
+  githubId: 
+  org: JD.com
   role: committer 
-
-
+- name: Dong Li (李栋)
+  apacheId: 
+  githubId: lidongsjtu
+  org: eBay
+  role: committer 
+- name: Yerui Sun (孙叶锐)
+  apacheId: sunyerui
+  githubId: 
+  org: Meituan
+  role: PMC
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/9457552e/website/community/poweredby.md
----------------------------------------------------------------------
diff --git a/website/community/poweredby.md b/website/community/poweredby.md
index 10d1b93..27448cc 100644
--- a/website/community/poweredby.md
+++ b/website/community/poweredby.md
@@ -25,4 +25,9 @@ __Companies & Organizations__
     * DreamSoft is using Apache Kylin as Big Data Analytics Engine for their 
customers coming from Retail, Manufacturing, Finance and others.
 * [Exponential](http://www.exponential.com)
        * Using Kylin as a component in it's data platform LAMBDA to power 
inventory, campaign, behavior and demand analysis for advertising. It has been 
great at handling the size and speed constraints of old gen systems. With the 
first version already in production, we are looking forward to pushing more 
data into kylin and achieve near real time updates. 
+* [Baidu Map](http://map.baidu.com/)  (_NASDAQ: BIDU_)
+       * Apache Kylin is used for analysis Baidu Map's huge amounts of data 
about users, channels and etc, it performs quite fast with its own 
pre-calculation and index technologies along with the cubes.
+* [NetEase](http://www.163.com/)  (_NASDAQ: NTES_)
+       * Apache has been introduced as an OLAP engine for the data platform at 
NetEase, powering data analysis for various products & business with great 
performance.
+
     

http://git-wip-us.apache.org/repos/asf/kylin/blob/9457552e/website/download/index.cn.md
----------------------------------------------------------------------
diff --git a/website/download/index.cn.md b/website/download/index.cn.md
index 81afb2e..ff4cacb 100644
--- a/website/download/index.cn.md
+++ b/website/download/index.cn.md
@@ -4,7 +4,7 @@ title: 下载
 ---
 
 __最新发布(源代码)__  
-最新发布的Apache Kylin可以从ASF网站下载::
+最新发布的Apache Kylin™可以从ASF网站下载::
 
 * [Apache Kylin 
v1.1.1-incubating](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-1.1.1-incubating/)
 * [发布日志](http://kylin.apache.org/docs/release_notes.html)

http://git-wip-us.apache.org/repos/asf/kylin/blob/9457552e/website/download/index.md
----------------------------------------------------------------------
diff --git a/website/download/index.md b/website/download/index.md
index e834ccf..eed1a4b 100644
--- a/website/download/index.md
+++ b/website/download/index.md
@@ -5,7 +5,7 @@ permalink: /download/index.html
 ---
 
 __Latest Release(Source Code)__  
-The latest release of Apache Kylin can be downloaded from the ASF:
+The latest release of Apache Kylin™ can be downloaded from the ASF:
 
 * [Apache Kylin 
v1.1.1-incubating](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-1.1.1-incubating/)
 * [Release Notes](http://kylin.apache.org/docs/release_notes.html)

http://git-wip-us.apache.org/repos/asf/kylin/blob/9457552e/website/index.cn.md
----------------------------------------------------------------------
diff --git a/website/index.cn.md b/website/index.cn.md
index 08e35ca..a4637fc 100644
--- a/website/index.cn.md
+++ b/website/index.cn.md
@@ -10,11 +10,10 @@ title: 首页
       <header style=" padding:2em 0 4em 0">
         <div class="container" >
 
-          <h4 class="section-title"><span>Apache Kylin 概览</span></h4>
+          <h4 class="section-title"><span>Apache Kylin™ 概览</span></h4>
           <div class="row" style="margin-top:-20px;">
-            <div class="col-sm-12 col-md-12">
-              <p class="title_text"> Apache Kylin 
于2014年11月25日被接受会Apache孵化器项目</p>
-              <p class="title_text"> Apache 
Kylin一个开源的分布式分析引擎,提供Hadoop之上的SQL查询接口及多维分析(OLAP)能力以支持è¶
…大规模数据,最初由eBay Inc. 开发并贡献至开源社区。</p>
+            <div class="col-sm-12 col-md-12">              
+              <p class="title_text"> Apache 
Kylin™是一个开源的分布式分析引擎,提供Hadoop之上的SQL查询接口及多维分析(OLAP)能力以支持è¶
…大规模数据,最初由eBay Inc. 开发并贡献至开源社区。</p>
               <img id="diagram" src="{{ "/assets/images/kylin_diagram.png"| 
prepend: site.baseurl }}"> </div>
           </div>
         </div>

http://git-wip-us.apache.org/repos/asf/kylin/blob/9457552e/website/index.md
----------------------------------------------------------------------
diff --git a/website/index.md b/website/index.md
index f8bdbe3..9b64f17 100644
--- a/website/index.md
+++ b/website/index.md
@@ -10,11 +10,10 @@ title: Home
       <header style=" padding:2em 0 4em 0">
         <div class="container" >
 
-          <h4 class="section-title"><span>Apache Kylin Overview</span></h4>
+          <h4 class="section-title"><span>Apache Kylin™ Overview</span></h4>
           <div class="row" style="margin-top:-20px;">
-            <div class="col-sm-12 col-md-12">
-              <p class="title_text"> Apache Kylin has been accepted as Apache 
Incubator Project on Nov 25, 2014.</p>
-              <p class="title_text"> Apache Kylin is an open source 
Distributed Analytics Engine designed to provide SQL interface and 
multi-dimensional analysis (OLAP) on Hadoop supporting extremely large 
datasets, original contributed from eBay Inc.</p>
+            <div class="col-sm-12 col-md-12">              
+              <p class="title_text"> Apache Kylin™ is an open source 
Distributed Analytics Engine designed to provide SQL interface and 
multi-dimensional analysis (OLAP) on Hadoop supporting extremely large 
datasets, original contributed from eBay Inc.</p>
               <img id="diagram" src="assets/images/kylin_diagram.png"> </div>
           </div>
         </div>

Reply via email to