You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by ov...@apache.org on 2020/07/16 09:50:18 UTC
[incubator-echarts-doc] 03/03: feat: add trademarks
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts-doc.git
commit 4c8aa89dce882cf6404ae9e78f28757907856f11
Author: Ovilia <zw...@gmail.com>
AuthorDate: Thu Jul 16 17:36:53 2020 +0800
feat: add trademarks
---
en/tutorial/aria.md | 2 +-
en/tutorial/basic-concepts-overview.md | 2 +-
en/tutorial/custom-build.md | 2 +-
en/tutorial/custom-series.md | 4 +++-
en/tutorial/data-zoom.md | 2 +-
en/tutorial/dataset.md | 2 +-
en/tutorial/drag-example.md | 2 +-
en/tutorial/dynamic-data.md | 14 +++++++-------
en/tutorial/echarts-feature.md | 2 +-
en/tutorial/event.md | 2 +-
en/tutorial/getting-started.md | 2 +-
en/tutorial/headless.md | 2 +-
en/tutorial/media-query.md | 2 +-
en/tutorial/npm-webpack.md | 2 +-
en/tutorial/renderer.md | 2 +-
en/tutorial/rich-text.md | 2 +-
en/tutorial/style-overview.md | 2 +-
en/tutorial/styling.md | 2 +-
en/tutorial/visual-map.md | 2 +-
zh/tutorial/aria.md | 2 +-
zh/tutorial/basic-concepts-overview.md | 2 +-
zh/tutorial/calendar-example.md | 4 ++--
zh/tutorial/custom-build.md | 2 +-
zh/tutorial/custom-series.md | 4 +++-
zh/tutorial/data-zoom.md | 2 +-
zh/tutorial/dataset.md | 2 +-
zh/tutorial/drag-example.md | 2 +-
zh/tutorial/dynamic-data.md | 2 +-
zh/tutorial/echarts-feature.md | 2 +-
zh/tutorial/echarts-gl.md | 2 +-
zh/tutorial/event.md | 2 +-
zh/tutorial/getting-started.md | 2 +-
zh/tutorial/headless.md | 2 +-
zh/tutorial/media-query.md | 2 +-
zh/tutorial/npm-webpack.md | 2 +-
zh/tutorial/renderer.md | 2 +-
zh/tutorial/rich-text.md | 2 +-
zh/tutorial/style-overview.md | 2 +-
zh/tutorial/styling.md | 2 +-
zh/tutorial/sunburst-series.md | 2 +-
zh/tutorial/visual-map.md | 2 +-
zh/tutorial/weixin-application.md | 2 +-
42 files changed, 53 insertions(+), 49 deletions(-)
diff --git a/en/tutorial/aria.md b/en/tutorial/aria.md
index 11e1b70..f93e761 100644
--- a/en/tutorial/aria.md
+++ b/en/tutorial/aria.md
@@ -2,7 +2,7 @@
# Supporting ARIA in Charts
-W3C defined the Accessible Rich Internet Applications Suite ([WAI-ARIA](https://www.w3.org/WAI/intro/aria)) to make Web content and Web applications more accessible to the disabled. From ECharts 4.0, we support ARIA by generating description for charts automatically.
+W3C defined the Accessible Rich Internet Applications Suite ([WAI-ARIA](https://www.w3.org/WAI/intro/aria)) to make Web content and Web applications more accessible to the disabled. From Apache ECharts (incubating)<sup>TM</sup> 4.0, we support ARIA by generating description for charts automatically.
By default, ARIA is disabled. To enable it, you should set [aria.show](~aria.show) to be `true`. After enabling, it will generate descriptions based on charts, series, data, and so on. Users may change the generated description.
diff --git a/en/tutorial/basic-concepts-overview.md b/en/tutorial/basic-concepts-overview.md
index 09e6ee5..0dfec62 100644
--- a/en/tutorial/basic-concepts-overview.md
+++ b/en/tutorial/basic-concepts-overview.md
@@ -2,7 +2,7 @@
# ECharts Basic Concepts Overview
-This chapter describes some of the common concepts and terms of echarts.
+This chapter describes some of the common concepts and terms of Apache ECharts (incubating)<sup>TM</sup>.
## ECharts instance
diff --git a/en/tutorial/custom-build.md b/en/tutorial/custom-build.md
index f85c6ca..a5cef7c 100644
--- a/en/tutorial/custom-build.md
+++ b/en/tutorial/custom-build.md
@@ -3,7 +3,7 @@
# Create Custom Build of ECharts
-In most cases, ECharts builds can be get from [CDN](https://www.jsdelivr.com/package/npm/echarts) or from the `echarts/dist` directory in our [GitHub project](https://github.com/apache/incubator-echarts/releases), where
+In most cases, Apache ECharts (incubating)<sup>TM</sup> builds can be get from [CDN](https://www.jsdelivr.com/package/npm/echarts) or from the `echarts/dist` directory in our [GitHub project](https://github.com/apache/incubator-echarts/releases), where
these pre-builds are provided:
+ Complete verion: `echarts/dist/echarts.js`, including all charts and components (see `echarts/echarts.all.js` for detail), but has maximum file size.
diff --git a/en/tutorial/custom-series.md b/en/tutorial/custom-series.md
index 6032d6a..f1390d9 100644
--- a/en/tutorial/custom-series.md
+++ b/en/tutorial/custom-series.md
@@ -4,7 +4,9 @@
[custom series](option.html#series-custom) is a type of series, which enable develpers to customize graphic elements rendering and generate new types of chart.
-Why echarts supports `custom series`? There are endless chart types in the world of data visualization, which are not enumerable. Thus only most common used chart types are built-in supported in echarts. For other chart types, it is necessary to provide an approach to make new types of chart for developers. This approach should be as simple as possible, which had better not to bothered developers with some details of implementation, such as creating and deleting graphic elements, transit [...]
+Why does Apache ECharts (incubating)<sup>TM</sup> supports `custom series`?
+
+There are endless chart types in the world of data visualization, which are not enumerable. Thus only most common used chart types are built-in supported in echarts. For other chart types, it is necessary to provide an approach to make new types of chart for developers. This approach should be as simple as possible, which had better not to bothered developers with some details of implementation, such as creating and deleting graphic elements, transition animation, tooltip supporting, wor [...]
**For example, a "x-range" chart is made by custom sereis:**
~[800x500](${galleryViewPath}custom-profile&reset=1&edit=1)
diff --git a/en/tutorial/data-zoom.md b/en/tutorial/data-zoom.md
index dfaa2c2..bd1f6ab 100644
--- a/en/tutorial/data-zoom.md
+++ b/en/tutorial/data-zoom.md
@@ -3,7 +3,7 @@
# Add interaction to the chart component
-Echarts provides many interaction components besides chart. For example:
+Apache ECharts (incubating)<sup>TM</sup> provides many interaction components besides chart. For example:
`legend component` [legend](option.html#legend)、`title component` [title](option.html#title)、`visualmap component` [visualMap](option.html#visualMap)、`datazoom component` [dataZoom](option.html#dataZoom)、`dataline component` [timeline](option.html#timeline)
diff --git a/en/tutorial/dataset.md b/en/tutorial/dataset.md
index 0ed62fd..0a55f42 100644
--- a/en/tutorial/dataset.md
+++ b/en/tutorial/dataset.md
@@ -3,7 +3,7 @@
# Dataset
-`dataset` component is published since ECharts 4. `dataset` brings convenience in data management separated with styles and enables data reuse by different series. More importantly, it enables data encoding from data to visual, which brings convenience in some scenarios.
+`dataset` component is published since Apache ECharts (incubating)<sup>TM</sup> 4. `dataset` brings convenience in data management separated with styles and enables data reuse by different series. More importantly, it enables data encoding from data to visual, which brings convenience in some scenarios.
Before ECharts 4, data was only able to declared in each series, for example:
diff --git a/en/tutorial/drag-example.md b/en/tutorial/drag-example.md
index bf19a37..d284bfb 100644
--- a/en/tutorial/drag-example.md
+++ b/en/tutorial/drag-example.md
@@ -2,7 +2,7 @@
# An Example: Implement Dragging
-This is a tiny example, introducing how to implement dragging of graphic elements in echarts. From this example, we will see how to make an application with rich intractivity based on echarts API.
+This is a tiny example, introducing how to implement dragging of graphic elements in Apache ECharts (incubating)<sup>TM</sup>. From this example, we will see how to make an application with rich intractivity based on echarts API.
~[600x400](${galleryViewPath}line-draggable&edit=1&reset=1)
diff --git a/en/tutorial/dynamic-data.md b/en/tutorial/dynamic-data.md
index 7064457..6ee5c38 100644
--- a/en/tutorial/dynamic-data.md
+++ b/en/tutorial/dynamic-data.md
@@ -4,7 +4,7 @@
## Asynchronous Loading
-Data in [Get started](~getting-started) is directly filled in `setOption` after initialization, but in some cases, data may be filled after asynchronous loading. Data updating asynchronously in `ECharts` is very easy. After initialization, you can pass in data and configuration item through `setOption` after data obtained through jQuery and other tools at any time.
+Data in [Get started](~getting-started) is directly filled in `setOption` after initialization, but in some cases, data may be filled after asynchronous loading. Data updating asynchronously in Apache ECharts (incubating)<sup>TM</sup> is very easy. After initialization, you can pass in data and configuration item through `setOption` after data obtained through jQuery and other tools at any time.
```js
var myChart = echarts.init(document.getElementById('main'));
@@ -55,7 +55,7 @@ myChart.setOption({
}]
});
-// Asynchronous data loading
+// Asynchronous data loading
$.get('data.json').done(function (data) {
// fill in data
myChart.setOption({
@@ -71,15 +71,15 @@ $.get('data.json').done(function (data) {
});
```
-For example:
+For example:
~[400x300](${galleryViewPath}doc-example/tutorial-async&edit=1&reset=1)
-In ECharts, updating data need to find the corresponding series through `name`. In the above example, updating can be performed correctly according to series order if `name` is not defined. But in most cases, it is recommended to update data with series `name` information.
+In ECharts, updating data need to find the corresponding series through `name`. In the above example, updating can be performed correctly according to series order if `name` is not defined. But in most cases, it is recommended to update data with series `name` information.
## Loading Animation
-If data loading time is too long, an empty axis on the canvas may confuse users. In this case, a loading animation is needed to tell the user that it's still loading.
+If data loading time is too long, an empty axis on the canvas may confuse users. In this case, a loading animation is needed to tell the user that it's still loading.
ECharts provides a simple loading animation by default. You only need [showLoading](api.html#echartsInstance.showLoading) to show, and then use [hideLoading](api.html#echartsInstance.hideLoading) to hide loading animation after data loading.
```js
@@ -90,7 +90,7 @@ $.get('data.json').done(function (data) {
});
```
-Effects are as followed:
+Effects are as followed:
~[400x300](${galleryViewPath}doc-example/tutorial-loading&edit=1&reset=1)
@@ -98,7 +98,7 @@ Effects are as followed:
ECharts is driven by data. Change of data changes the presentation of chart, therefore, implementing dynamic data updating is extremely easy.
-All data updating are through [setOption](~api.html#echartsInstance.setOption). You only need to get data as you wish, fill in data to [setOption](~api.html#echartsInstance.setOption) without considering the changes brought by data, ECharts will find the difference between two group of data and present the difference through proper animation.
+All data updating are through [setOption](~api.html#echartsInstance.setOption). You only need to get data as you wish, fill in data to [setOption](~api.html#echartsInstance.setOption) without considering the changes brought by data, ECharts will find the difference between two group of data and present the difference through proper animation.
>In ECharts 3, addData in ECharts 2 is removed.If a single data needs to be added, you can first data.push(value) and then setOption.
diff --git a/en/tutorial/echarts-feature.md b/en/tutorial/echarts-feature.md
index 1e411bb..7ecf4c6 100644
--- a/en/tutorial/echarts-feature.md
+++ b/en/tutorial/echarts-feature.md
@@ -1,7 +1,7 @@
{{ target: echarts-feature }}
# Introduction of ECharts features
-ECharts, a pure Javascript chart library, can run smoothly on PC and mobile devices, being compatible with most of current Web browsers (IE8/9/10/11, Chrome, Firefox, Safari and so on), it relies on a lightweight Canvas library [ZRender](https://github.com/ecomfe/zrender), and provides intuitive, vivid, interactive, and highly customizable data visualization charts.
+Apache ECharts (incubating)<sup>TM</sup>, a pure Javascript chart library, can run smoothly on PC and mobile devices, being compatible with most of current Web browsers (IE8/9/10/11, Chrome, Firefox, Safari and so on), it relies on a lightweight Canvas library [ZRender](https://github.com/ecomfe/zrender), and provides intuitive, vivid, interactive, and highly customizable data visualization charts.
More over, ECharts 3 adds richer interactive functions and more visualization effects, and optimizes more deeply on mobile end.
diff --git a/en/tutorial/event.md b/en/tutorial/event.md
index 5a69c9b..a152920 100644
--- a/en/tutorial/event.md
+++ b/en/tutorial/event.md
@@ -2,7 +2,7 @@
# Events and Actions in ECharts
-User interactions trigger corresponding events in ECharts. Developers can listen to these events and handle accordingly through callback functions, e.g., redirecting to an address, popping out a dialog box, or drilling down data and so on.
+User interactions trigger corresponding events in Apache ECharts (incubating)<sup>TM</sup>. Developers can listen to these events and handle accordingly through callback functions, e.g., redirecting to an address, popping out a dialog box, or drilling down data and so on.
Binding events in ECharts 3 is though [on](api.html#EChartsInstance.on) method, same as in ECharts 2. But event names are much simpler than it is in 2. Event names in ECharts 3 are the same as DOM event names, in lowercases. Below is an example of binding clicking operation.
diff --git a/en/tutorial/getting-started.md b/en/tutorial/getting-started.md
index 556833a..ebe4b0f 100644
--- a/en/tutorial/getting-started.md
+++ b/en/tutorial/getting-started.md
@@ -3,7 +3,7 @@
## Installing ECharts
-First, install ECharts using one of the following methods:
+First, install Apache ECharts (incubating)<sup>TM</sup> using one of the following methods:
* Download official source release from [Apache ECharts (incubating) website](${websitePath}/en/download.html). Then [build](https://github.com/apache/incubator-echarts#build) from the source release.
diff --git a/en/tutorial/headless.md b/en/tutorial/headless.md
index 54a72f4..ccef6bd 100644
--- a/en/tutorial/headless.md
+++ b/en/tutorial/headless.md
@@ -3,7 +3,7 @@
# Server-side Rendering
-ECharts can be rendered at server-side. For example, the thumbnails in the [official examples page](https://echarts.apache.org/examples/en/index.html/) are generated at a server.
+Apache ECharts (incubating)<sup>TM</sup> can be rendered at server-side. For example, the thumbnails in the [official examples page](https://echarts.apache.org/examples/en/index.html/) are generated at a server.
Commonly used headless tool is required, for example, [puppeteer](https://github.com/GoogleChrome/puppeteer), [headless chrome](https://chromium.googlesource.com/chromium/src/+/lkgr/headless/README.md), [node-canvas](https://github.com/Automattic/node-canvas), [jsdom](https://github.com/jsdom/jsdom), [PhantomJS](http://phantomjs.org/), etc.
diff --git a/en/tutorial/media-query.md b/en/tutorial/media-query.md
index dd72abd..f126031 100644
--- a/en/tutorial/media-query.md
+++ b/en/tutorial/media-query.md
@@ -3,7 +3,7 @@
# Responsive Mobile-End
-ECharts works in DOM nodes with user defined width and height. ECharts *component* and *series* are both in this DOM node, whose location can be assigned by user seperately. Inner components of charts are not suitable for implementing DOM flow layout. Instead, we use a simpler and more understandable layout similar to absolute layout. But sometimes when container is of extreme size, this method cannot avoid component overlapping automatically, especially on small screens on mobile-end.
+Apache ECharts (incubating)<sup>TM</sup> works in DOM nodes with user defined width and height. ECharts *component* and *series* are both in this DOM node, whose location can be assigned by user seperately. Inner components of charts are not suitable for implementing DOM flow layout. Instead, we use a simpler and more understandable layout similar to absolute layout. But sometimes when container is of extreme size, this method cannot avoid component overlapping automatically, especially [...]
Besides, sometimes one chart may need to be displayed on both PC and mobile-end, which involves the ability of ECharts inner components to be responsive with different container sizes.
diff --git a/en/tutorial/npm-webpack.md b/en/tutorial/npm-webpack.md
index 3922b06..e07c04a 100644
--- a/en/tutorial/npm-webpack.md
+++ b/en/tutorial/npm-webpack.md
@@ -3,7 +3,7 @@
# Use ECharts with webpack
-[Webpack](https://webpack.js.org//) is a popular module packaging tool, which can be used easily to import and packaging ECharts. Here we assume you already have certain understanding about webpack and used it in your project.
+[Webpack](https://webpack.js.org//) is a popular module packaging tool, which can be used easily to import and packaging Apache ECharts (incubating)<sup>TM</sup>. Here we assume you already have certain understanding about webpack and used it in your project.
## Use npm to install ECharts
diff --git a/en/tutorial/renderer.md b/en/tutorial/renderer.md
index 5c5fbb6..3546f00 100644
--- a/en/tutorial/renderer.md
+++ b/en/tutorial/renderer.md
@@ -2,7 +2,7 @@
# Render by Canvas or SVG
-Most of browser-side charting libraries use SVG or Canvas as their underlying renderer. In the scope of charts, they are usually alternative, without critical differences. But in some environment and scenarios, they show notable differences in performance or functionality.
+Most of browser-side charting libraries use SVG or Canvas as their underlying renderer. In the scope of Apache ECharts (incubating)<sup>TM</sup>, they are usually alternative, without critical differences. But in some environment and scenarios, they show notable differences in performance or functionality.
ECharts has been using Canvas as its renderer (use VML for IE8-) from the begining. Now, from [ECharts v3.8](https://github.com/apache/incubator-echarts/releases) we provide a SVG renderer (beta version) as another option. Either of them can be used by specifing parameter [renderer](api.html#echarts.init) as `'canvas'` or `'svg'` when initailizing a chart instance.
diff --git a/en/tutorial/rich-text.md b/en/tutorial/rich-text.md
index 4d9da14..a34981a 100644
--- a/en/tutorial/rich-text.md
+++ b/en/tutorial/rich-text.md
@@ -3,7 +3,7 @@
# Rich Text
-Rich text can be used in labels of series, axis or other components. For example:
+Rich text can be used in Apache ECharts (incubating)<sup>TM</sup> labels of series, axis or other components. For example:
~[800x400](${galleryViewPath}pie-rich-text&edit=1&reset=1)
diff --git a/en/tutorial/style-overview.md b/en/tutorial/style-overview.md
index 6036410..7d3ba8e 100644
--- a/en/tutorial/style-overview.md
+++ b/en/tutorial/style-overview.md
@@ -2,7 +2,7 @@
# Overview of Style Customization
-This article provides an overview of the different approaches about style customization. For example, how to config the color, size, shadow of the graphic elements and labels.
+This article provides an overview of the different approaches about Apache ECharts (incubating)<sup>TM</sup> style customization. For example, how to config the color, size, shadow of the graphic elements and labels.
> The term "style" may not follow the convention of data visualization, but we use it in this article because it is popular and easy to understand.
diff --git a/en/tutorial/styling.md b/en/tutorial/styling.md
index 6932f91..6c31907 100644
--- a/en/tutorial/styling.md
+++ b/en/tutorial/styling.md
@@ -1,7 +1,7 @@
{{ target: styling }}
# Customized Chart Styles
-ECharts provides a rich amount of configurable items, which can be set in global, series, and data three different levels. Next, let's see an example of how to use ECharts to implement the following Nightingale rose chart:
+Apache ECharts (incubating)<sup>TM</sup> provides a rich amount of configurable items, which can be set in global, series, and data three different levels. Next, let's see an example of how to use ECharts to implement the following Nightingale rose chart:
~[500x400](${galleryViewPath}doc-example/tutorial-styling-step5&edit=1&reset=1)
diff --git a/en/tutorial/visual-map.md b/en/tutorial/visual-map.md
index 1b951a6..a33c8bc 100644
--- a/en/tutorial/visual-map.md
+++ b/en/tutorial/visual-map.md
@@ -5,7 +5,7 @@
Data visualization is a procedure of mapping data into visual elements. This procedure can also be called visual coding, and visual elements can also be called visual tunnels.
-Every type of charts in ECharts has this built-in mapping procedure. For example, line charts map data into *lines*, bar charts map data into *length*. Some more complicated charts, like `graph`, `themeRiver`, and `treemap` have their own built-in mapping.
+Every type of charts in Apache ECharts (incubating)<sup>TM</sup> has this built-in mapping procedure. For example, line charts map data into *lines*, bar charts map data into *length*. Some more complicated charts, like `graph`, `themeRiver`, and `treemap` have their own built-in mapping.
Besides, ECharts provides [visualMap component](option.html#visualMap) for general visual mapping. Visual elements allowed in `visualMap` component are:<br>
`symbol`, `symbolSize`<br>
diff --git a/zh/tutorial/aria.md b/zh/tutorial/aria.md
index e3a831d..e085b1b 100644
--- a/zh/tutorial/aria.md
+++ b/zh/tutorial/aria.md
@@ -2,7 +2,7 @@
# 在图表中支持无障碍访问
-W3C 制定了无障碍富互联网应用规范集（[WAI-ARIA](https://www.w3.org/WAI/intro/aria)，the Accessible Rich Internet Applications Suite），致力于使得网页内容和网页应用能够被更多残障人士访问。ECharts 4.0 遵从这一规范，支持自动根据图表配置项智能生成描述，使得盲人可以在朗读设备的帮助下了解图表内容，让图表可以被更多人群访问。
+W3C 制定了无障碍富互联网应用规范集（[WAI-ARIA](https://www.w3.org/WAI/intro/aria)，the Accessible Rich Internet Applications Suite），致力于使得网页内容和网页应用能够被更多残障人士访问。Apache ECharts (incubating)<sup>TM</sup> 4.0 遵从这一规范，支持自动根据图表配置项智能生成描述，使得盲人可以在朗读设备的帮助下了解图表内容，让图表可以被更多人群访问。
默认关闭，需要通过将 [aria.show](option.html#aria.show) 设置为 `true` 开启。开启后，会根据图表、数据、标题等情况，自动智能生成关于图表的描述，用户也可以通过配置项修改描述。
diff --git a/zh/tutorial/basic-concepts-overview.md b/zh/tutorial/basic-concepts-overview.md
index 9b5e185..092969d 100644
--- a/zh/tutorial/basic-concepts-overview.md
+++ b/zh/tutorial/basic-concepts-overview.md
@@ -2,7 +2,7 @@
# ECharts 基础概念概览
-本文介绍 echarts 最基本的名词和概念。
+本文介绍 Apache ECharts (incubating)<sup>TM</sup> 最基本的名词和概念。
## echarts 实例
diff --git a/zh/tutorial/calendar-example.md b/zh/tutorial/calendar-example.md
index 5055a89..1f2e35e 100644
--- a/zh/tutorial/calendar-example.md
+++ b/zh/tutorial/calendar-example.md
@@ -2,13 +2,13 @@
# 小例子：实现日历图
-在ECharts中，我们新增了日历坐标系，如何快速写出一个日历图呢？
+在 Apache ECharts (incubating)<sup>TM</sup> 中，我们新增了日历坐标系，如何快速写出一个日历图呢？
~[800x300](${galleryViewPath}calendar-simple&edit=1&reset=1)
通过以下三个步骤即可实现上述效果：
## 第一步：引入js文件
-下载的最新完整版本echarts.min.js即可，无需再单独引入其他文件哦
+下载的最新完整版本 echarts.min.js 即可，无需再单独引入其他文件哦
```html
<script src="echarts.min.js"></script>
diff --git a/zh/tutorial/custom-build.md b/zh/tutorial/custom-build.md
index e45c3c9..ca692e4 100644
--- a/zh/tutorial/custom-build.md
+++ b/zh/tutorial/custom-build.md
@@ -2,7 +2,7 @@
# 自定义构建 ECharts
-一般来说，可以直接从 [CDN](https://www.jsdelivr.com/package/npm/echarts) 中获取构建后的 echarts，也可以从 [GitHub](https://github.com/apache/incubator-echarts/releases) 中的 `echarts/dist` 文件夹中获取构建好的 echarts，这都可以直接在浏览器端项目中使用。这些构建好的 echarts 提供了下面这几种定制：
+一般来说，可以直接从 [CDN](https://www.jsdelivr.com/package/npm/echarts) 中获取构建后的 Apache ECharts (incubating)<sup>TM</sup>，也可以从 [GitHub](https://github.com/apache/incubator-echarts/releases) 中的 `echarts/dist` 文件夹中获取构建好的 echarts，这都可以直接在浏览器端项目中使用。这些构建好的 echarts 提供了下面这几种定制：
+ 完全版：`echarts/dist/echarts.js`，体积最大，包含所有的图表和组件，所包含内容参见：`echarts/echarts.all.js`。
+ 常用版：`echarts/dist/echarts.common.js`，体积适中，包含常见的图表和组件，所包含内容参见：`echarts/echarts.common.js`。
diff --git a/zh/tutorial/custom-series.md b/zh/tutorial/custom-series.md
index 7a4254e..e918d03 100644
--- a/zh/tutorial/custom-series.md
+++ b/zh/tutorial/custom-series.md
@@ -4,7 +4,9 @@
[自定义系列（custom series）](option.html#series-custom)，是一种系列的类型。它把绘制图形元素这一步留给开发者去做，从而开发者能在坐标系中自由绘制出自己需要的图表。
-echarts 为什么会要支持 `自定义系列` 呢？echarts 内置支持的图表类型是最常见的图表类型，但是图表类型是难于穷举的，有很多小众的需求 echarts 并不能内置的支持。那么就需要提供一种方式来让开发者自己扩展。另一方面，所提供的扩展方式要尽可能得简单，例如图形元素创建和释放、过渡动画、tooltip、[数据区域缩放（dataZoom）](option.html#dataZoom)、[视觉映射（visualMap）](option.html#visualMap)等功能，尽量在 echarts 中内置得处理，使开发者不必纠结于这些细节。综上考虑形成了 [自定义系列（custom series）](option.html#series-custom)。
+Apache ECharts (incubating)<sup>TM</sup> 为什么会要支持 `自定义系列` 呢？
+
+ECharts 内置支持的图表类型是最常见的图表类型，但是图表类型是难于穷举的，有很多小众的需求 echarts 并不能内置的支持。那么就需要提供一种方式来让开发者自己扩展。另一方面，所提供的扩展方式要尽可能得简单，例如图形元素创建和释放、过渡动画、tooltip、[数据区域缩放（dataZoom）](option.html#dataZoom)、[视觉映射（visualMap）](option.html#visualMap)等功能，尽量在 ECharts 中内置得处理，使开发者不必纠结于这些细节。综上考虑形成了 [自定义系列（custom series）](option.html#series-custom)。
**例如，下面的例子使用 custom series 扩展出了 x-range 图：**
~[800x500](${galleryViewPath}custom-profile&reset=1&edit=1)
diff --git a/zh/tutorial/data-zoom.md b/zh/tutorial/data-zoom.md
index 4c3b28b..bb49c0f 100644
--- a/zh/tutorial/data-zoom.md
+++ b/zh/tutorial/data-zoom.md
@@ -3,7 +3,7 @@
# 在图表中加入交互组件
-除了图表外 ECharts 中，提供了很多交互组件。例如：
+除了图表外 Apache ECharts (incubating)<sup>TM</sup> 中，提供了很多交互组件。例如：
`图例组件` [legend](option.html#legend)、`标题组件` [title](option.html#title)、`视觉映射组件` [visualMap](option.html#visualMap)、`数据区域缩放组件` [dataZoom](option.html#dataZoom)、`时间线组件` [timeline](option.html#timeline)
diff --git a/zh/tutorial/dataset.md b/zh/tutorial/dataset.md
index 456aab5..23efb7d 100644
--- a/zh/tutorial/dataset.md
+++ b/zh/tutorial/dataset.md
@@ -3,7 +3,7 @@
# 使用 dataset 管理数据
-ECharts 4 开始支持了 `dataset` 组件用于单独的数据集声明，从而数据可以单独管理，被多个组件复用，并且可以基于数据指定数据到视觉的映射。这在不少场景下能带来使用上的方便。
+Apache ECharts (incubating)<sup>TM</sup> 4 开始支持了 `dataset` 组件用于单独的数据集声明，从而数据可以单独管理，被多个组件复用，并且可以基于数据指定数据到视觉的映射。这在不少场景下能带来使用上的方便。
ECharts 4 以前，数据只能声明在各个“系列（series）”中，例如：
diff --git a/zh/tutorial/drag-example.md b/zh/tutorial/drag-example.md
index df1533a..b9359f8 100644
--- a/zh/tutorial/drag-example.md
+++ b/zh/tutorial/drag-example.md
@@ -2,7 +2,7 @@
# 小例子：自己实现拖拽
-介绍一个实现拖拽的小例子。这个例子是在原生 echarts 基础上做了些小小扩展，带有一定的交互性。通过这个例子，我们可以了解到，如何使用 echarts 提供的 API 实现定制化的富交互的功能。
+介绍一个实现拖拽的小例子。这个例子是在原生 Apache ECharts (incubating)<sup>TM</sup> 基础上做了些小小扩展，带有一定的交互性。通过这个例子，我们可以了解到，如何使用 ECharts 提供的 API 实现定制化的富交互的功能。
~[600x400](${galleryViewPath}line-draggable&edit=1&reset=1)
diff --git a/zh/tutorial/dynamic-data.md b/zh/tutorial/dynamic-data.md
index ba1ff55..b007d4e 100644
--- a/zh/tutorial/dynamic-data.md
+++ b/zh/tutorial/dynamic-data.md
@@ -4,7 +4,7 @@
## 异步加载
-[入门示例](~getting-started)中的数据是在初始化后`setOption`中直接填入的，但是很多时候可能数据需要异步加载后再填入。`ECharts` 中实现异步数据的更新非常简单，在图表初始化后不管任何时候只要通过 jQuery 等工具异步获取数据后通过 `setOption` 填入数据和配置项就行。
+[入门示例](~getting-started)中的数据是在初始化后 `setOption` 中直接填入的，但是很多时候可能数据需要异步加载后再填入。Apache ECharts (incubating)<sup>TM</sup> 中实现异步数据的更新非常简单，在图表初始化后不管任何时候只要通过 jQuery 等工具异步获取数据后通过 `setOption` 填入数据和配置项就行。
```js
var myChart = echarts.init(document.getElementById('main'));
diff --git a/zh/tutorial/echarts-feature.md b/zh/tutorial/echarts-feature.md
index 55ee14e..8f61e07 100644
--- a/zh/tutorial/echarts-feature.md
+++ b/zh/tutorial/echarts-feature.md
@@ -1,7 +1,7 @@
{{ target: echarts-feature }}
# ECharts 特性介绍
-ECharts，一个纯 Javascript 的图表库，可以流畅的运行在 PC 和移动设备上，兼容当前绝大部分浏览器（IE8/9/10/11，Chrome，Firefox，Safari等），底层依赖轻量级的 Canvas 类库 [ZRender](https://github.com/ecomfe/zrender)，提供直观，生动，可交互，可高度个性化定制的数据可视化图表。
+Apache ECharts (incubating)<sup>TM</sup>，一个纯 Javascript 的图表库，可以流畅的运行在 PC 和移动设备上，兼容当前绝大部分浏览器（IE8/9/10/11，Chrome，Firefox，Safari等），底层依赖轻量级的 Canvas 类库 [ZRender](https://github.com/ecomfe/zrender)，提供直观，生动，可交互，可高度个性化定制的数据可视化图表。
ECharts 3 中更是加入了更多丰富的交互功能以及更多的可视化效果，并且对移动端做了深度的优化。
diff --git a/zh/tutorial/echarts-gl.md b/zh/tutorial/echarts-gl.md
index b493b02..3408496 100644
--- a/zh/tutorial/echarts-gl.md
+++ b/zh/tutorial/echarts-gl.md
@@ -2,7 +2,7 @@
# 使用 ECharts GL 实现基础的三维可视化
-ECharts GL （后面统一简称 GL）为 ECharts 补充了丰富的三维可视化组件，这篇文章我们会简单介绍如何基于 GL 实现一些常见的三维可视化作品。实际上如果你对 ECharts 有一定了解的话，也可以很快的上手 GL，GL 的配置项完全是按照 ECharts 的标准和上手难度来设计的。
+ECharts GL （后面统一简称 GL）为 Apache ECharts (incubating)<sup>TM</sup> 补充了丰富的三维可视化组件，这篇文章我们会简单介绍如何基于 GL 实现一些常见的三维可视化作品。实际上如果你对 ECharts 有一定了解的话，也可以很快的上手 GL，GL 的配置项完全是按照 ECharts 的标准和上手难度来设计的。
在看完文章之后，你可以前往 [官方示例](${websitePath}/examples/zh/index.html#chart-type-globe) 和 [Gallery](https://gallery.echartsjs.com/explore.html#tags=echarts-gl) 去了解更多使用 GL 制作的示例，对于文章中我们没法解释到的代码，也可以前往 [GL 配置项手册](option-gl.html) 查看具体的配置项使用方法。
diff --git a/zh/tutorial/event.md b/zh/tutorial/event.md
index c033d11..421fb63 100644
--- a/zh/tutorial/event.md
+++ b/zh/tutorial/event.md
@@ -2,7 +2,7 @@
# ECharts 中的事件和行为
-在 ECharts 的图表中用户的操作将会触发相应的事件。开发者可以监听这些事件，然后通过回调函数做相应的处理，比如跳转到一个地址，或者弹出对话框，或者做数据下钻等等。
+在 Apache ECharts (incubating)<sup>TM</sup> 的图表中用户的操作将会触发相应的事件。开发者可以监听这些事件，然后通过回调函数做相应的处理，比如跳转到一个地址，或者弹出对话框，或者做数据下钻等等。
在 ECharts 3 中绑定事件跟 2 一样都是通过 [on](api.html#EChartsInstance.on) 方法，但是事件名称比 2 更加简单了。ECharts 3 中，事件名称对应 DOM 事件名称，均为小写的字符串，如下是一个绑定点击操作的示例。
diff --git a/zh/tutorial/getting-started.md b/zh/tutorial/getting-started.md
index cab56ad..6c056ef 100644
--- a/zh/tutorial/getting-started.md
+++ b/zh/tutorial/getting-started.md
@@ -3,7 +3,7 @@
## 获取 ECharts
-你可以通过以下几种方式获取 ECharts。
+你可以通过以下几种方式获取 Apache ECharts (incubating)<sup>TM</sup>。
* 从 [Apache ECharts (incubating) 官网下载界面](${websitePath}/zh/download.html) 获取官方源码包后构建。
diff --git a/zh/tutorial/headless.md b/zh/tutorial/headless.md
index 8a91f5b..a745ce6 100644
--- a/zh/tutorial/headless.md
+++ b/zh/tutorial/headless.md
@@ -3,7 +3,7 @@
# 服务端渲染
-ECharts 可以在服务端进行渲染。例如 [官方示例](https://echarts.apache.org/examples/zh/index.html) 里的一个个小截图，就是在服务端预生成出来的。
+Apache ECharts (incubating)<sup>TM</sup> 可以在服务端进行渲染。例如 [官方示例](https://echarts.apache.org/examples/zh/index.html) 里的一个个小截图，就是在服务端预生成出来的。
服务端渲染可以使用流行的 headless 环境，例如 [puppeteer](https://github.com/GoogleChrome/puppeteer)、[headless chrome](https://chromium.googlesource.com/chromium/src/+/lkgr/headless/README.md)、[node-canvas](https://github.com/Automattic/node-canvas)、[jsdom](https://github.com/jsdom/jsdom)、[PhantomJS](http://phantomjs.org/) 等。
diff --git a/zh/tutorial/media-query.md b/zh/tutorial/media-query.md
index b187aef..02c559d 100644
--- a/zh/tutorial/media-query.md
+++ b/zh/tutorial/media-query.md
@@ -3,7 +3,7 @@
# 移动端自适应
-ECharts 工作在用户指定高宽的 DOM 节点（容器）中。ECharts 的『组件』和『系列』都在这个 DOM 节点中，每个节点都可以由用户指定位置。图表库内部并不适宜实现 DOM 文档流布局，因此采用类似绝对布局的简单容易理解的布局方式。但是有时候容器尺寸极端时，这种方式并不能自动避免组件重叠的情况，尤其在移动端小屏的情况下。
+Apache ECharts (incubating)<sup>TM</sup> 工作在用户指定高宽的 DOM 节点（容器）中。ECharts 的『组件』和『系列』都在这个 DOM 节点中，每个节点都可以由用户指定位置。图表库内部并不适宜实现 DOM 文档流布局，因此采用类似绝对布局的简单容易理解的布局方式。但是有时候容器尺寸极端时，这种方式并不能自动避免组件重叠的情况，尤其在移动端小屏的情况下。
另外，有时会出现一个图表需要同时在PC、移动端上展现的场景。这需要 ECharts 内部组件随着容器尺寸变化而变化的能力。
diff --git a/zh/tutorial/npm-webpack.md b/zh/tutorial/npm-webpack.md
index ab12f8a..804795f 100644
--- a/zh/tutorial/npm-webpack.md
+++ b/zh/tutorial/npm-webpack.md
@@ -3,7 +3,7 @@
# 在 webpack 中使用 ECharts
-[Webpack](https://webpack.js.org//) 是目前比较流行的模块打包工具，你可以在使用 webpack 的项目中轻松的引入和打包 ECharts，这里假设你已经对 webpack 具有一定的了解并且在自己的项目中使用。
+[Webpack](https://webpack.js.org//) 是目前比较流行的模块打包工具，你可以在使用 webpack 的项目中轻松的引入和打包 Apache ECharts (incubating)<sup>TM</sup>，这里假设你已经对 webpack 具有一定的了解并且在自己的项目中使用。
## npm 安装 ECharts
diff --git a/zh/tutorial/renderer.md b/zh/tutorial/renderer.md
index 3df036e..282d0cc 100644
--- a/zh/tutorial/renderer.md
+++ b/zh/tutorial/renderer.md
@@ -4,7 +4,7 @@
浏览器端图表库大多会选择 SVG 或者 Canvas 进行渲染。对于绘制图表来说，这两种技术往往是可替换的，效果相近。但是在一些场景中，他们的表现和能力又有一定差异。于是，对它们的选择取舍，就成为了一个一直存在的不易有标准答案的话题。
-ECharts 从初始一直使用 Canvas 绘制图表（除了对 IE8- 使用 VML）。而 [ECharts v4.0](https://github.com/apache/incubator-echarts/releases) 发布了 SVG 渲染器，从而提供了一种新的选择。只须在初始化一个图表实例时，设置 [renderer 参数](api.html#echarts.init) 为 `'canvas'` 或 `'svg'` 即可指定渲染器，比较方便。
+Apache ECharts (incubating)<sup>TM</sup> 从初始一直使用 Canvas 绘制图表（除了对 IE8- 使用 VML）。而 [ECharts v4.0](https://github.com/apache/incubator-echarts/releases) 发布了 SVG 渲染器，从而提供了一种新的选择。只须在初始化一个图表实例时，设置 [renderer 参数](api.html#echarts.init) 为 `'canvas'` 或 `'svg'` 即可指定渲染器，比较方便。
> SVG 和 Canvas 这两种使用方式差异很大的技术，能够做到同时被透明支持，主要归功于 ECharts 底层库 [ZRender](https://github.com/ecomfe/zrender) 的抽象和实现，形成可互换的 SVG 渲染器和 Canvas 渲染器。
diff --git a/zh/tutorial/rich-text.md b/zh/tutorial/rich-text.md
index a064227..f832a73 100644
--- a/zh/tutorial/rich-text.md
+++ b/zh/tutorial/rich-text.md
@@ -22,7 +22,7 @@
<br>
-原先 echarts 中的文本标签，只能对整块统一进行样式设置，并且仅仅支持颜色和字体的设置，从而导致不易于制作表达能力更强的文字描述信息。
+原先 Apache ECharts (incubating)<sup>TM</sup> 中的文本标签，只能对整块统一进行样式设置，并且仅仅支持颜色和字体的设置，从而导致不易于制作表达能力更强的文字描述信息。
echarts v3.7 以后，支持了富文本标签，能够：
diff --git a/zh/tutorial/style-overview.md b/zh/tutorial/style-overview.md
index ef1e9d1..3f37d07 100644
--- a/zh/tutorial/style-overview.md
+++ b/zh/tutorial/style-overview.md
@@ -2,7 +2,7 @@
# ECharts 中的样式简介
-本文主要是大略概述，用哪些方法，可以设置设置样式，改变图形元素或者文字的颜色、明暗、大小等。
+本文主要是大略概述，用哪些方法，可以在 Apache ECharts (incubating)<sup>TM</sup> 中设置样式，改变图形元素或者文字的颜色、明暗、大小等。
> 之所以用“样式”这种可能不很符合数据可视化思维的词，是因为，比较通俗易懂。
diff --git a/zh/tutorial/styling.md b/zh/tutorial/styling.md
index 3888cf1..738328f 100644
--- a/zh/tutorial/styling.md
+++ b/zh/tutorial/styling.md
@@ -1,7 +1,7 @@
{{ target: styling }}
# 个性化图表的样式
-ECharts 提供了丰富的自定义配置选项，并且能够从全局、系列、数据三个层级去设置数据图形的样式。下面我们来看如何使用 ECharts 实现下面这个南丁格尔图：
+Apache ECharts (incubating)<sup>TM</sup> 提供了丰富的自定义配置选项，并且能够从全局、系列、数据三个层级去设置数据图形的样式。下面我们来看如何使用 ECharts 实现下面这个南丁格尔图：
~[500x400](${galleryViewPath}doc-example/tutorial-styling-step5&edit=1&reset=1)
diff --git a/zh/tutorial/sunburst-series.md b/zh/tutorial/sunburst-series.md
index 723d081..e4f2d31 100644
--- a/zh/tutorial/sunburst-series.md
+++ b/zh/tutorial/sunburst-series.md
@@ -8,7 +8,7 @@
## 引入相关文件
-旭日图是 ECharts 4.0 新增的图表类型，从 [CDN](https://www.jsdelivr.com/package/npm/echarts) 引入完整版的 [echarts.min.js](https://cdn.jsdelivr.net/npm/echarts/dist/echarts.min.js)
+旭日图是 Apache ECharts (incubating)<sup>TM</sup> 4.0 新增的图表类型，从 [CDN](https://www.jsdelivr.com/package/npm/echarts) 引入完整版的 [echarts.min.js](https://cdn.jsdelivr.net/npm/echarts/dist/echarts.min.js)
## 最简单的旭日图
diff --git a/zh/tutorial/visual-map.md b/zh/tutorial/visual-map.md
index 9bed0d2..e7d626a 100644
--- a/zh/tutorial/visual-map.md
+++ b/zh/tutorial/visual-map.md
@@ -5,7 +5,7 @@
数据可视化是 **数据** 到 **视觉元素** 的映射过程（这个过程也可称为视觉编码，视觉元素也可称为视觉通道）。
-ECharts 的每种图表本身就内置了这种映射过程，比如折线图把数据映射到『线』，柱状图把数据映射到『长度』。一些更复杂的图表，如 `graph`、`事件河流图`、`treemap` 也都会做出他们内置的映射。
+Apache ECharts (incubating)<sup>TM</sup> 的每种图表本身就内置了这种映射过程，比如折线图把数据映射到『线』，柱状图把数据映射到『长度』。一些更复杂的图表，如 `graph`、`事件河流图`、`treemap` 也都会做出他们内置的映射。
此外，ECharts 还提供了 [visualMap 组件](option.html#visualMap) 来提供通用的视觉映射。`visualMap` 组件中可以使用的视觉元素有：<br>
`图形类别（symbol）`、`图形大小（symbolSize）`<br>
diff --git a/zh/tutorial/weixin-application.md b/zh/tutorial/weixin-application.md
index a231456..93f080d 100644
--- a/zh/tutorial/weixin-application.md
+++ b/zh/tutorial/weixin-application.md
@@ -2,7 +2,7 @@
# 在微信小程序中使用 ECharts
-我们接到了很多微信小程序开发者的反馈，表示他们强烈需要像 ECharts 这样的可视化工具。但是微信小程序是不支持 DOM 操作的，Canvas 接口也和浏览器不尽相同。
+我们接到了很多微信小程序开发者的反馈，表示他们强烈需要像 Apache ECharts (incubating)<sup>TM</sup> 这样的可视化工具。但是微信小程序是不支持 DOM 操作的，Canvas 接口也和浏览器不尽相同。
因此，我们和微信小程序官方团队合作，提供了 ECharts 的微信小程序版本。开发者可以通过熟悉的 ECharts 配置方式，快速开发图表，满足各种可视化需求。
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org