This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-doc.git
The following commit(s) were added to refs/heads/master by this push:
new b1d5d7c remove incubator and incubating.
b1d5d7c is described below
commit b1d5d7c04a0fd0da69a639ee093e9ae0e75b7d14
Author: 100pah <[email protected]>
AuthorDate: Mon Jan 18 23:51:51 2021 +0800
remove incubator and incubating.
---
README.md | 2 +-
config/env.asf.js | 2 +-
config/env.dev.js | 4 ++--
config/env.localsite.js | 2 +-
en/option/series/boxplot.md | 2 +-
en/option/series/graph.md | 2 +-
en/tutorial/aria.md | 2 +-
en/tutorial/basic-concepts-overview.md | 2 +-
en/tutorial/custom-build.md | 4 ++--
en/tutorial/custom-series.md | 2 +-
en/tutorial/data-zoom.md | 2 +-
en/tutorial/dataset.md | 2 +-
en/tutorial/drag-example.md | 2 +-
en/tutorial/dynamic-data.md | 2 +-
en/tutorial/echarts-feature.md | 2 +-
en/tutorial/event.md | 2 +-
en/tutorial/getting-started.md | 6 +++---
en/tutorial/headless.md | 2 +-
en/tutorial/media-query.md | 2 +-
en/tutorial/npm-webpack.md | 4 ++--
en/tutorial/renderer.md | 6 +++---
en/tutorial/rich-text.md | 2 +-
en/tutorial/style-overview.md | 2 +-
en/tutorial/styling.md | 2 +-
en/tutorial/visual-map.md | 2 +-
package.json | 2 +-
zh/option/series/boxplot.md | 2 +-
zh/option/series/graph.md | 2 +-
zh/tutorial/aria.md | 2 +-
zh/tutorial/basic-concepts-overview.md | 2 +-
zh/tutorial/calendar-example.md | 2 +-
zh/tutorial/custom-build.md | 4 ++--
zh/tutorial/custom-series.md | 2 +-
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 | 6 +++---
zh/tutorial/headless.md | 2 +-
zh/tutorial/media-query.md | 2 +-
zh/tutorial/npm-webpack.md | 4 ++--
zh/tutorial/renderer.md | 4 ++--
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 | 4 ++--
51 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/README.md b/README.md
index 51e3da2..6a942e6 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# About
-This project is part of the source of [The Apache ECharts (incubating)
Official Website](https://echarts.apache.org/). See
[incubator-echarts-website](https://github.com/apache/incubator-echarts-website)
for more details of the building process.
+This project is part of the source of [The Apache ECharts Official
Website](https://echarts.apache.org/). See
[echarts-website](https://github.com/apache/echarts-website) for more details
of the building process.
## Online Docs
diff --git a/config/env.asf.js b/config/env.asf.js
index a324c7d..1c6b1a5 100644
--- a/config/env.asf.js
+++ b/config/env.asf.js
@@ -10,6 +10,6 @@ module.exports = {
imagePath: 'asset/gl/img/',
},
- releaseDestDir: path.resolve(__dirname, '../../incubator-echarts-website'),
+ releaseDestDir: path.resolve(__dirname, '../../echarts-website'),
ecWWWGeneratedDir: path.resolve(__dirname, '../../echarts-www/_generated')
};
diff --git a/config/env.dev.js b/config/env.dev.js
index 8595648..fb45354 100644
--- a/config/env.dev.js
+++ b/config/env.dev.js
@@ -1,8 +1,8 @@
const path = require('path');
module.exports = {
- galleryViewPath:
'http://localhost/incubator-echarts-website/examples/en/view.html?c=',
- galleryEditorPath:
'http://localhost/incubator-echarts-website/examples/en/editor.html?c=',
+ galleryViewPath:
'http://localhost/echarts-website/examples/en/view.html?c=',
+ galleryEditorPath:
'http://localhost/echarts-website/examples/en/editor.html?c=',
websitePath: './',
imagePath: 'asset/img/',
diff --git a/config/env.localsite.js b/config/env.localsite.js
index fd043bd..dad32e3 100644
--- a/config/env.localsite.js
+++ b/config/env.localsite.js
@@ -10,6 +10,6 @@ module.exports = {
imagePath: 'asset/gl/img/'
},
- releaseDestDir: path.resolve(__dirname, '../../incubator-echarts-website'),
+ releaseDestDir: path.resolve(__dirname, '../../echarts-website'),
ecWWWGeneratedDir: path.resolve(__dirname, '../../echarts-www/_generated')
};
\ No newline at end of file
diff --git a/en/option/series/boxplot.md b/en/option/series/boxplot.md
index 1542c48..c55d6e1 100644
--- a/en/option/series/boxplot.md
+++ b/en/option/series/boxplot.md
@@ -124,7 +124,7 @@ Every data item (each line in the example above) in the
two-dimensional array wi
ECharts doesn't contain data processing modules, so the five statistic values
should be calculated by yourself and then passes into `boxplot`.
-However, ECharts also provide some simple [raw data processing
tools](https://github.com/apache/incubator-echarts/tree/master/extension/dataTool).
For example, this
[example](${galleryEditorPath}boxplot-light-velocity&edit=1&reset=1) uses
`echarts.dataTool.prepareBoxplotData` to proceed simple data statistics.
+However, ECharts also provide some simple [raw data processing
tools](https://github.com/apache/echarts/tree/master/extension/dataTool). For
example, this
[example](${galleryEditorPath}boxplot-light-velocity&edit=1&reset=1) uses
`echarts.dataTool.prepareBoxplotData` to proceed simple data statistics.
### name(string)
diff --git a/en/option/series/graph.md b/en/option/series/graph.md
index 05effc0..db37f2f 100644
--- a/en/option/series/graph.md
+++ b/en/option/series/graph.md
@@ -89,7 +89,7 @@ Because the force-directed layout will be steady after
several iterations, this
{{ use: partial-version(version = "4.5.0") }}
It will slow down the nodes' movement. The value range is from 0 to 1.
-But it is still an experimental option, see
[#11024](https://github.com/apache/incubator-echarts/issues/11024).
+But it is still an experimental option, see
[#11024](https://github.com/apache/echarts/issues/11024).
## roam(boolean|string) = false
{{ use: partial-roam }}
diff --git a/en/tutorial/aria.md b/en/tutorial/aria.md
index f93e761..4439438 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 Apache ECharts
(incubating)<sup>TM</sup> 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<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 0dfec62..6056ba9 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 Apache ECharts
(incubating)<sup>TM</sup>.
+This chapter describes some of the common concepts and terms of Apache
ECharts<sup>TM</sup>.
## ECharts instance
diff --git a/en/tutorial/custom-build.md b/en/tutorial/custom-build.md
index a5cef7c..26463ac 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, 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
+In most cases, Apache ECharts<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/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.
@@ -124,7 +124,7 @@ Open `myProject/pie.html` in a browser, we can see the pie
chart:
## Modules that are permitted to be imported
-All of the permitted modules are declared in
[`myProject/node_module/echarts/echarts.all.js`](https://github.com/apache/incubator-echarts/blob/master/echarts.all.js)
and
[`myProject/node_module/echarts/src/export.js`](https://github.com/apache/incubator-echarts/blob/master/src/export.js).
Other modules in the source code of echarts and zrender **SHOULD NOT BE
IMPORTED**, because they are inner modules, whose interfaces and
functionalities may be modified in the subsequent upgrades of echarts.
+All of the permitted modules are declared in
[`myProject/node_module/echarts/echarts.all.js`](https://github.com/apache/echarts/blob/master/echarts.all.js)
and
[`myProject/node_module/echarts/src/export.js`](https://github.com/apache/echarts/blob/master/src/export.js).
Other modules in the source code of echarts and zrender **SHOULD NOT BE
IMPORTED**, because they are inner modules, whose interfaces and
functionalities may be modified in the subsequent upgrades of echarts.
## Use `echarts/lib/**` or `echarts/src/**`?
diff --git a/en/tutorial/custom-series.md b/en/tutorial/custom-series.md
index f1390d9..114feff 100644
--- a/en/tutorial/custom-series.md
+++ b/en/tutorial/custom-series.md
@@ -4,7 +4,7 @@
[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 does Apache ECharts (incubating)<sup>TM</sup> supports `custom series`?
+Why does Apache ECharts<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 [...]
diff --git a/en/tutorial/data-zoom.md b/en/tutorial/data-zoom.md
index bd1f6ab..75b786a 100644
--- a/en/tutorial/data-zoom.md
+++ b/en/tutorial/data-zoom.md
@@ -3,7 +3,7 @@
# Add interaction to the chart component
-Apache ECharts (incubating)<sup>TM</sup> provides many interaction components
besides chart. For example:
+Apache ECharts<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 0a55f42..e28b011 100644
--- a/en/tutorial/dataset.md
+++ b/en/tutorial/dataset.md
@@ -3,7 +3,7 @@
# Dataset
-`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.
+`dataset` component is published since Apache ECharts<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 d284bfb..713be4e 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 Apache ECharts (incubating)<sup>TM</sup>. 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<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 6ee5c38..39e8244 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 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.
+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<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'));
diff --git a/en/tutorial/echarts-feature.md b/en/tutorial/echarts-feature.md
index 7ecf4c6..21fb8ca 100644
--- a/en/tutorial/echarts-feature.md
+++ b/en/tutorial/echarts-feature.md
@@ -1,7 +1,7 @@
{{ target: echarts-feature }}
# Introduction of ECharts features
-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.
+Apache ECharts<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 a152920..b9cfeff 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 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.
+User interactions trigger corresponding events in Apache ECharts<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 ebe4b0f..2be95f7 100644
--- a/en/tutorial/getting-started.md
+++ b/en/tutorial/getting-started.md
@@ -3,11 +3,11 @@
## Installing ECharts
-First, install Apache ECharts (incubating)<sup>TM</sup> using one of the
following methods:
+First, install Apache ECharts<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.
+* Download official source release from [Apache ECharts
website](${websitePath}/en/download.html). Then
[build](https://github.com/apache/echarts#build) from the source release.
-* Download from [GitHub](https://github.com/apache/incubator-echarts/releases)
+* Download from [GitHub](https://github.com/apache/echarts/releases)
* Using npm: `npm install echarts --save`. [Using ECharts with
webpack](tutorial.html#Use%20ECharts%20with%20webpack)
diff --git a/en/tutorial/headless.md b/en/tutorial/headless.md
index ccef6bd..496ce6d 100644
--- a/en/tutorial/headless.md
+++ b/en/tutorial/headless.md
@@ -3,7 +3,7 @@
# Server-side Rendering
-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.
+Apache ECharts<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 f126031..4f8b307 100644
--- a/en/tutorial/media-query.md
+++ b/en/tutorial/media-query.md
@@ -3,7 +3,7 @@
# Responsive 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 [...]
+Apache ECharts<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 on small scre [...]
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 4929606..854466a 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 Apache ECharts
(incubating)<sup>TM</sup>. 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<sup>TM</sup>. Here we
assume you already have certain understanding about webpack and used it in your
project.
## Use npm to install ECharts
@@ -75,6 +75,6 @@ myChart.setOption({
});
```
-Available modules see
[https://github.com/apache/incubator-echarts/blob/master/src/echarts.all.ts](https://github.com/apache/incubator-echarts/blob/master/src/echarts.all.ts)
+Available modules see
[https://github.com/apache/echarts/blob/master/src/echarts.all.ts](https://github.com/apache/echarts/blob/master/src/echarts.all.ts)
The same goes for another popular packaging tools
[browserify](http://browserify.org/), which will not be introduced again here.
Using [rollup](https://rollupjs.org/) to make a custom build of echarts is
introduced in [Create Custom Build of
ECharts](tutorial.html#Create%20Custom%20Build%20of%20ECharts)
diff --git a/en/tutorial/renderer.md b/en/tutorial/renderer.md
index 427e034..cbb9ef9 100644
--- a/en/tutorial/renderer.md
+++ b/en/tutorial/renderer.md
@@ -2,9 +2,9 @@
# Render by Canvas or SVG
-Most 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 interchangeable, without critical differences. However, in some cases,
they show notable differences in performance or functionality.
+Most browser-side charting libraries use SVG or Canvas as their underlying
renderer. In the scope of Apache ECharts<sup>TM</sup>, they are usually
interchangeable, without critical differences. However, in some cases, they
show notable differences in performance or functionality.
-ECharts has been using Canvas as its renderer (use VML for IE8-) from the
beginning. As of [ECharts
v3.8](https://github.com/apache/incubator-echarts/releases) we provide an 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.
+ECharts has been using Canvas as its renderer (use VML for IE8-) from the
beginning. As of [ECharts v3.8](https://github.com/apache/echarts/releases) we
provide an 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.
> Both SVG and Canvas, which are very different rendering implementations, are
> supported in ECharts by leveraging the Canvas and SVG renderers offered by
> the [zender](https://github.com/ecomfe/zrender) library.
@@ -25,7 +25,7 @@ How to make a choice? These factors, hardware and software
environment, data amo
+ If lots of ECharts instances have to be created, and it causes the
browser crash (probably caused by that the large memory consumption) we can try
the SVG renderer. Or, generally, when running on some old Android devices, or
if we are using some kind of charts like
[liquidfill](https://ecomfe.github.io/echarts-liquidfill/example/), the SVG
renderer probably gives a better performance.
+ If visualizing a large amount of data, or complicated human interactions
with data is required, the Canvas renderer works better currently.
-Therefore [feedback](https://github.com/apache/incubator-echarts/issues/new)
of experiences and usage scenarios are strongly welcomed, which will help
improve the these renderers.
+Therefore [feedback](https://github.com/apache/echarts/issues/new) of
experiences and usage scenarios are strongly welcomed, which will help improve
the these renderers.
Notice: The features of rich text, shadow and texture have not been supported
yet in the current beta version of the SVG renderer.
diff --git a/en/tutorial/rich-text.md b/en/tutorial/rich-text.md
index a34981a..c2dae86 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 Apache ECharts (incubating)<sup>TM</sup> labels of
series, axis or other components. For example:
+Rich text can be used in Apache ECharts<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 7b23002..261195e 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 Apache
ECharts (incubating)<sup>TM</sup> 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<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 6c31907..9d82fdb 100644
--- a/en/tutorial/styling.md
+++ b/en/tutorial/styling.md
@@ -1,7 +1,7 @@
{{ target: styling }}
# Customized Chart Styles
-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:
+Apache ECharts<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 a33c8bc..54e4c4d 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 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.
+Every type of charts in Apache ECharts<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/package.json b/package.json
index cf117c7..89019f1 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"description": "Documentation of ECharts",
"repository": {
"type": "git",
- "url": "https://github.com/apache/incubator-echarts-doc";
+ "url": "https://github.com/apache/echarts-doc";
},
"scripts": {
"build": "node build.js --env asf",
diff --git a/zh/option/series/boxplot.md b/zh/option/series/boxplot.md
index d6b4df7..cfe4f0e 100644
--- a/zh/option/series/boxplot.md
+++ b/zh/option/series/boxplot.md
@@ -168,7 +168,7 @@ box 的宽度的上下限。数组的意思是：`[min, max]`。
ECharts 并不内置对原始数据的处理，输入给 `boxplot` 的数据须是如上五个统计结果量值。
-但是 ECharts 也额外提供了简单的
[原始数据处理函数](https://github.com/apache/incubator-echarts/tree/master/extension/dataTool)，如这个
[例子](${galleryEditorPath}boxplot-light-velocity&edit=1&reset=1)
使用了`echarts.dataTool.prepareBoxplotData` 来进行简单的数据统计。
+但是 ECharts 也额外提供了简单的
[原始数据处理函数](https://github.com/apache/echarts/tree/master/extension/dataTool)，如这个
[例子](${galleryEditorPath}boxplot-light-velocity&edit=1&reset=1)
使用了`echarts.dataTool.prepareBoxplotData` 来进行简单的数据统计。
### name(string)
diff --git a/zh/option/series/graph.md b/zh/option/series/graph.md
index 058dde3..5442558 100644
--- a/zh/option/series/graph.md
+++ b/zh/option/series/graph.md
@@ -130,7 +130,7 @@ edgeLength: [10, 50]
{{ use: partial-version(version = "4.5.0") }}
这个参数能减缓节点的移动速度。取值范围 0 到 1。
-但是仍然是个试验性的参数，参见
[#11024](https://github.com/apache/incubator-echarts/issues/11024)。
+但是仍然是个试验性的参数，参见 [#11024](https://github.com/apache/echarts/issues/11024)。
## roam(boolean|string) = false
{{ use: partial-roam }}
diff --git a/zh/tutorial/aria.md b/zh/tutorial/aria.md
index e085b1b..18e3fb5 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），致力于使得网页内容和网页应用能够被更多残障人士访问。Apache
ECharts (incubating)<sup>TM</sup> 4.0
遵从这一规范，支持自动根据图表配置项智能生成描述，使得盲人可以在朗读设备的帮助下了解图表内容，让图表可以被更多人群访问。
+W3C 制定了无障碍富互联网应用规范集（[WAI-ARIA](https://www.w3.org/WAI/intro/aria)，the
Accessible Rich Internet Applications Suite），致力于使得网页内容和网页应用能够被更多残障人士访问。Apache
ECharts<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 092969d..59dbb75 100644
--- a/zh/tutorial/basic-concepts-overview.md
+++ b/zh/tutorial/basic-concepts-overview.md
@@ -2,7 +2,7 @@
# ECharts 基础概念概览
-本文介绍 Apache ECharts (incubating)<sup>TM</sup> 最基本的名词和概念。
+本文介绍 Apache ECharts<sup>TM</sup> 最基本的名词和概念。
## echarts 实例
diff --git a/zh/tutorial/calendar-example.md b/zh/tutorial/calendar-example.md
index 1f2e35e..eb953f9 100644
--- a/zh/tutorial/calendar-example.md
+++ b/zh/tutorial/calendar-example.md
@@ -2,7 +2,7 @@
# 小例子：实现日历图
-在 Apache ECharts (incubating)<sup>TM</sup> 中，我们新增了日历坐标系，如何快速写出一个日历图呢？
+在 Apache ECharts<sup>TM</sup> 中，我们新增了日历坐标系，如何快速写出一个日历图呢？
~[800x300](${galleryViewPath}calendar-simple&edit=1&reset=1)
通过以下三个步骤即可实现上述效果：
diff --git a/zh/tutorial/custom-build.md b/zh/tutorial/custom-build.md
index ddd35dc..757a700 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) 中获取构建后的 Apache
ECharts (incubating)<sup>TM</sup>，也可以从
[GitHub](https://github.com/apache/incubator-echarts/releases) 中的
`echarts/dist` 文件夹中获取构建好的 echarts，这都可以直接在浏览器端项目中使用。这些构建好的 echarts 提供了下面这几种定制：
+一般来说，可以直接从 [CDN](https://www.jsdelivr.com/package/npm/echarts) 中获取构建后的 Apache
ECharts<sup>TM</sup>，也可以从 [GitHub](https://github.com/apache/echarts/releases)
中的 `echarts/dist` 文件夹中获取构建好的 echarts，这都可以直接在浏览器端项目中使用。这些构建好的 echarts 提供了下面这几种定制：
+
完全版：`echarts/dist/echarts.js`，体积最大，包含所有的图表和组件，所包含内容参见：`echarts/echarts.all.js`。
+
常用版：`echarts/dist/echarts.common.js`，体积适中，包含常见的图表和组件，所包含内容参见：`echarts/echarts.common.js`。
@@ -122,7 +122,7 @@ node node_modules/echarts/build/build.js --min -i
echarts.custom.js -o lib/echar
## 允许被引用的模块
-在自定义构建中，允许被引用的模块，全声明在
[`myProject/node_module/echarts/echarts.all.js`](https://github.com/apache/incubator-echarts/blob/master/echarts.all.js)
和
[`myProject/node_module/echarts/src/export.js`](https://github.com/apache/incubator-echarts/blob/master/src/export.js)
中。echarts 和 zrender 源代码中的其他模块，都是 echarts 的内部模块，**不应该去引用**。因为在后续 echarts
版本升级中，内部模块的接口和功能可能变化，甚至模块本身也可能被移除。
+在自定义构建中，允许被引用的模块，全声明在
[`myProject/node_module/echarts/echarts.all.js`](https://github.com/apache/echarts/blob/master/echarts.all.js)
和
[`myProject/node_module/echarts/src/export.js`](https://github.com/apache/echarts/blob/master/src/export.js)
中。echarts 和 zrender 源代码中的其他模块，都是 echarts 的内部模块，**不应该去引用**。因为在后续 echarts
版本升级中，内部模块的接口和功能可能变化，甚至模块本身也可能被移除。
## 引用 `echarts/lib/**` 还是 `echarts/src/**`
diff --git a/zh/tutorial/custom-series.md b/zh/tutorial/custom-series.md
index e918d03..b1969ff 100644
--- a/zh/tutorial/custom-series.md
+++ b/zh/tutorial/custom-series.md
@@ -4,7 +4,7 @@
[自定义系列（custom
series）](option.html#series-custom)，是一种系列的类型。它把绘制图形元素这一步留给开发者去做，从而开发者能在坐标系中自由绘制出自己需要的图表。
-Apache ECharts (incubating)<sup>TM</sup> 为什么会要支持 `自定义系列` 呢？
+Apache ECharts<sup>TM</sup> 为什么会要支持 `自定义系列` 呢？
ECharts 内置支持的图表类型是最常见的图表类型，但是图表类型是难于穷举的，有很多小众的需求 echarts
并不能内置的支持。那么就需要提供一种方式来让开发者自己扩展。另一方面，所提供的扩展方式要尽可能得简单，例如图形元素创建和释放、过渡动画、tooltip、[数据区域缩放（dataZoom）](option.html#dataZoom)、[视觉映射（visualMap）](option.html#visualMap)等功能，尽量在
ECharts 中内置得处理，使开发者不必纠结于这些细节。综上考虑形成了 [自定义系列（custom
series）](option.html#series-custom)。
diff --git a/zh/tutorial/data-zoom.md b/zh/tutorial/data-zoom.md
index bb49c0f..f2d004c 100644
--- a/zh/tutorial/data-zoom.md
+++ b/zh/tutorial/data-zoom.md
@@ -3,7 +3,7 @@
# 在图表中加入交互组件
-除了图表外 Apache ECharts (incubating)<sup>TM</sup> 中，提供了很多交互组件。例如：
+除了图表外 Apache ECharts<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 23efb7d..4255b79 100644
--- a/zh/tutorial/dataset.md
+++ b/zh/tutorial/dataset.md
@@ -3,7 +3,7 @@
# 使用 dataset 管理数据
-Apache ECharts (incubating)<sup>TM</sup> 4 开始支持了 `dataset`
组件用于单独的数据集声明，从而数据可以单独管理，被多个组件复用，并且可以基于数据指定数据到视觉的映射。这在不少场景下能带来使用上的方便。
+Apache ECharts<sup>TM</sup> 4 开始支持了 `dataset`
组件用于单独的数据集声明，从而数据可以单独管理，被多个组件复用，并且可以基于数据指定数据到视觉的映射。这在不少场景下能带来使用上的方便。
ECharts 4 以前，数据只能声明在各个“系列（series）”中，例如：
diff --git a/zh/tutorial/drag-example.md b/zh/tutorial/drag-example.md
index b9359f8..94c74af 100644
--- a/zh/tutorial/drag-example.md
+++ b/zh/tutorial/drag-example.md
@@ -2,7 +2,7 @@
# 小例子：自己实现拖拽
-介绍一个实现拖拽的小例子。这个例子是在原生 Apache ECharts (incubating)<sup>TM</sup>
基础上做了些小小扩展，带有一定的交互性。通过这个例子，我们可以了解到，如何使用 ECharts 提供的 API 实现定制化的富交互的功能。
+介绍一个实现拖拽的小例子。这个例子是在原生 Apache ECharts<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 b007d4e..3a05adc 100644
--- a/zh/tutorial/dynamic-data.md
+++ b/zh/tutorial/dynamic-data.md
@@ -4,7 +4,7 @@
## 异步加载
-[入门示例](~getting-started)中的数据是在初始化后 `setOption`
中直接填入的，但是很多时候可能数据需要异步加载后再填入。Apache ECharts (incubating)<sup>TM</sup>
中实现异步数据的更新非常简单，在图表初始化后不管任何时候只要通过 jQuery 等工具异步获取数据后通过 `setOption` 填入数据和配置项就行。
+[入门示例](~getting-started)中的数据是在初始化后 `setOption`
中直接填入的，但是很多时候可能数据需要异步加载后再填入。Apache ECharts<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 8f61e07..96ea3dc 100644
--- a/zh/tutorial/echarts-feature.md
+++ b/zh/tutorial/echarts-feature.md
@@ -1,7 +1,7 @@
{{ target: echarts-feature }}
# ECharts 特性介绍
-Apache ECharts (incubating)<sup>TM</sup>，一个纯 Javascript 的图表库，可以流畅的运行在 PC
和移动设备上，兼容当前绝大部分浏览器（IE8/9/10/11，Chrome，Firefox，Safari等），底层依赖轻量级的 Canvas 类库
[ZRender](https://github.com/ecomfe/zrender)，提供直观，生动，可交互，可高度个性化定制的数据可视化图表。
+Apache ECharts<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 3408496..177fc7b 100644
--- a/zh/tutorial/echarts-gl.md
+++ b/zh/tutorial/echarts-gl.md
@@ -2,7 +2,7 @@
# 使用 ECharts GL 实现基础的三维可视化
-ECharts GL （后面统一简称 GL）为 Apache ECharts (incubating)<sup>TM</sup>
补充了丰富的三维可视化组件，这篇文章我们会简单介绍如何基于 GL 实现一些常见的三维可视化作品。实际上如果你对 ECharts
有一定了解的话，也可以很快的上手 GL，GL 的配置项完全是按照 ECharts 的标准和上手难度来设计的。
+ECharts GL （后面统一简称 GL）为 Apache ECharts<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 421fb63..fd56252 100644
--- a/zh/tutorial/event.md
+++ b/zh/tutorial/event.md
@@ -2,7 +2,7 @@
# ECharts 中的事件和行为
-在 Apache ECharts (incubating)<sup>TM</sup>
的图表中用户的操作将会触发相应的事件。开发者可以监听这些事件，然后通过回调函数做相应的处理，比如跳转到一个地址，或者弹出对话框，或者做数据下钻等等。
+在 Apache ECharts<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 6c056ef..0ceffe5 100644
--- a/zh/tutorial/getting-started.md
+++ b/zh/tutorial/getting-started.md
@@ -3,11 +3,11 @@
## 获取 ECharts
-你可以通过以下几种方式获取 Apache ECharts (incubating)<sup>TM</sup>。
+你可以通过以下几种方式获取 Apache ECharts<sup>TM</sup>。
-* 从 [Apache ECharts (incubating) 官网下载界面](${websitePath}/zh/download.html)
获取官方源码包后构建。
+* 从 [Apache ECharts 官网下载界面](${websitePath}/zh/download.html) 获取官方源码包后构建。
-* 在 ECharts 的 [GitHub](https://github.com/apache/incubator-echarts/releases)
获取。
+* 在 ECharts 的 [GitHub](https://github.com/apache/echarts/releases) 获取。
* 通过 npm 获取 echarts，`npm install echarts --save`，详见“[在 webpack 中使用
echarts](tutorial.html#%E5%9C%A8%20webpack%20%E4%B8%AD%E4%BD%BF%E7%94%A8%20ECharts)”
diff --git a/zh/tutorial/headless.md b/zh/tutorial/headless.md
index a745ce6..7b99409 100644
--- a/zh/tutorial/headless.md
+++ b/zh/tutorial/headless.md
@@ -3,7 +3,7 @@
# 服务端渲染
-Apache ECharts (incubating)<sup>TM</sup> 可以在服务端进行渲染。例如
[官方示例](https://echarts.apache.org/examples/zh/index.html) 里的一个个小截图，就是在服务端预生成出来的。
+Apache ECharts<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 b37557f..d5ac8f3 100644
--- a/zh/tutorial/media-query.md
+++ b/zh/tutorial/media-query.md
@@ -3,7 +3,7 @@
# 移动端自适应
-Apache ECharts (incubating)<sup>TM</sup> 工作在用户指定高宽的 DOM 节点（容器）中。ECharts
的『组件』和『系列』都在这个 DOM 节点中，每个节点都可以由用户指定位置。图表库内部并不适宜实现 DOM
文档流布局，因此采用类似绝对布局的简单容易理解的布局方式。但是有时候容器尺寸极端时，这种方式并不能自动避免组件重叠的情况，尤其在移动端小屏的情况下。
+Apache ECharts<sup>TM</sup> 工作在用户指定高宽的 DOM 节点（容器）中。ECharts 的『组件』和『系列』都在这个 DOM
节点中，每个节点都可以由用户指定位置。图表库内部并不适宜实现 DOM
文档流布局，因此采用类似绝对布局的简单容易理解的布局方式。但是有时候容器尺寸极端时，这种方式并不能自动避免组件重叠的情况，尤其在移动端小屏的情况下。
另外，有时会出现一个图表需要同时在PC、移动端上展现的场景。这需要 ECharts 内部组件随着容器尺寸变化而变化的能力。
diff --git a/zh/tutorial/npm-webpack.md b/zh/tutorial/npm-webpack.md
index d7789d4..831755d 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 的项目中轻松的引入和打包
Apache ECharts (incubating)<sup>TM</sup>，这里假设你已经对 webpack 具有一定的了解并且在自己的项目中使用。
+[Webpack](https://webpack.js.org/) 是目前比较流行的模块打包工具，你可以在使用 webpack 的项目中轻松的引入和打包
Apache ECharts<sup>TM</sup>，这里假设你已经对 webpack 具有一定的了解并且在自己的项目中使用。
## npm 安装 ECharts
@@ -75,7 +75,7 @@ myChart.setOption({
});
```
-可以按需引入的模块列表见
[https://github.com/apache/incubator-echarts/blob/master/src/echarts.all.ts](https://github.com/apache/incubator-echarts/blob/master/src/echarts.all.ts)
+可以按需引入的模块列表见
[https://github.com/apache/echarts/blob/master/src/echarts.all.ts](https://github.com/apache/echarts/blob/master/src/echarts.all.ts)
对于流行的模块打包工具 [browserify](http://browserify.org/) 也是同样的用法，这里就不赘述了。而对于使用
[rollup](https://rollupjs.org/) 的自定义构建，参见 [自定义构建
ECharts](${websitePath}/zh/tutorial.html#%E8%87%AA%E5%AE%9A%E4%B9%89%E6%9E%84%E5%BB%BA%20ECharts)。
diff --git a/zh/tutorial/renderer.md b/zh/tutorial/renderer.md
index 282d0cc..fbd62ec 100644
--- a/zh/tutorial/renderer.md
+++ b/zh/tutorial/renderer.md
@@ -4,7 +4,7 @@
浏览器端图表库大多会选择 SVG 或者 Canvas
进行渲染。对于绘制图表来说，这两种技术往往是可替换的，效果相近。但是在一些场景中，他们的表现和能力又有一定差异。于是，对它们的选择取舍，就成为了一个一直存在的不易有标准答案的话题。
-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'` 即可指定渲染器，比较方便。
+Apache ECharts<sup>TM</sup> 从初始一直使用 Canvas 绘制图表（除了对 IE8- 使用 VML）。而 [ECharts
v4.0](https://github.com/apache/echarts/releases) 发布了 SVG
渲染器，从而提供了一种新的选择。只须在初始化一个图表实例时，设置 [renderer 参数](api.html#echarts.init) 为
`'canvas'` 或 `'svg'` 即可指定渲染器，比较方便。
> SVG 和 Canvas 这两种使用方式差异很大的技术，能够做到同时被透明支持，主要归功于 ECharts 底层库
> [ZRender](https://github.com/ecomfe/zrender) 的抽象和实现，形成可互换的 SVG 渲染器和 Canvas
> 渲染器。
@@ -22,7 +22,7 @@ Apache ECharts (incubating)<sup>TM</sup> 从初始一直使用 Canvas 绘制图
+ 在须要创建很多 ECharts 实例且浏览器易崩溃的情况下（可能是因为 Canvas 数量多导致内存占用超出手机承受能力），可以使用 SVG
渲染器来进行改善。大略得说，如果图表运行在低端安卓机，或者我们在使用一些特定图表如
[水球图](https://ecomfe.github.io/echarts-liquidfill/example/) 等，SVG 渲染器可能效果更好。
+ 数据量很大、较多交互时，可以选用 Canvas 渲染器。
-我们强烈欢迎开发者们 [反馈](https://github.com/apache/incubator-echarts/issues/new)
给我们使用的体验和场景，帮助我们更好的做优化。
+我们强烈欢迎开发者们 [反馈](https://github.com/apache/echarts/issues/new)
给我们使用的体验和场景，帮助我们更好的做优化。
注：除了某些特殊的渲染可能依赖
Canvas：如[炫光尾迹特效](option.html#series-lines.effect)、[带有混合效果的热力图](${galleryEditorPath}heatmap-bmap)等，绝大部分功能
SVG 都是支持的。此外，目前的 SVG 版中，富文本、材质功能尚未实现。
diff --git a/zh/tutorial/rich-text.md b/zh/tutorial/rich-text.md
index f832a73..a0ef525 100644
--- a/zh/tutorial/rich-text.md
+++ b/zh/tutorial/rich-text.md
@@ -22,7 +22,7 @@
<br>
-原先 Apache ECharts (incubating)<sup>TM</sup>
中的文本标签，只能对整块统一进行样式设置，并且仅仅支持颜色和字体的设置，从而导致不易于制作表达能力更强的文字描述信息。
+原先 Apache ECharts<sup>TM</sup>
中的文本标签，只能对整块统一进行样式设置，并且仅仅支持颜色和字体的设置，从而导致不易于制作表达能力更强的文字描述信息。
echarts v3.7 以后，支持了富文本标签，能够：
diff --git a/zh/tutorial/style-overview.md b/zh/tutorial/style-overview.md
index 3ff8805..1668579 100644
--- a/zh/tutorial/style-overview.md
+++ b/zh/tutorial/style-overview.md
@@ -2,7 +2,7 @@
# ECharts 中的样式简介
-本文主要是大略概述，用哪些方法，可以在 Apache ECharts (incubating)<sup>TM</sup>
中设置样式，改变图形元素或者文字的颜色、明暗、大小等。
+本文主要是大略概述，用哪些方法，可以在 Apache ECharts<sup>TM</sup> 中设置样式，改变图形元素或者文字的颜色、明暗、大小等。
> 之所以用“样式”这种可能不很符合数据可视化思维的词，是因为，比较通俗易懂。
diff --git a/zh/tutorial/styling.md b/zh/tutorial/styling.md
index 738328f..5ef5089 100644
--- a/zh/tutorial/styling.md
+++ b/zh/tutorial/styling.md
@@ -1,7 +1,7 @@
{{ target: styling }}
# 个性化图表的样式
-Apache ECharts (incubating)<sup>TM</sup>
提供了丰富的自定义配置选项，并且能够从全局、系列、数据三个层级去设置数据图形的样式。下面我们来看如何使用 ECharts 实现下面这个南丁格尔图：
+Apache ECharts<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 e4f2d31..070e8a1 100644
--- a/zh/tutorial/sunburst-series.md
+++ b/zh/tutorial/sunburst-series.md
@@ -8,7 +8,7 @@
## 引入相关文件
-旭日图是 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)
+旭日图是 Apache ECharts<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 e7d626a..1c8465a 100644
--- a/zh/tutorial/visual-map.md
+++ b/zh/tutorial/visual-map.md
@@ -5,7 +5,7 @@
数据可视化是 **数据** 到 **视觉元素** 的映射过程（这个过程也可称为视觉编码，视觉元素也可称为视觉通道）。
-Apache ECharts (incubating)<sup>TM</sup>
的每种图表本身就内置了这种映射过程，比如折线图把数据映射到『线』，柱状图把数据映射到『长度』。一些更复杂的图表，如
`graph`、`事件河流图`、`treemap` 也都会做出他们内置的映射。
+Apache ECharts<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 93f080d..78571be 100644
--- a/zh/tutorial/weixin-application.md
+++ b/zh/tutorial/weixin-application.md
@@ -2,7 +2,7 @@
# 在微信小程序中使用 ECharts
-我们接到了很多微信小程序开发者的反馈，表示他们强烈需要像 Apache ECharts (incubating)<sup>TM</sup>
这样的可视化工具。但是微信小程序是不支持 DOM 操作的，Canvas 接口也和浏览器不尽相同。
+我们接到了很多微信小程序开发者的反馈，表示他们强烈需要像 Apache ECharts<sup>TM</sup> 这样的可视化工具。但是微信小程序是不支持
DOM 操作的，Canvas 接口也和浏览器不尽相同。
因此，我们和微信小程序官方团队合作，提供了 ECharts 的微信小程序版本。开发者可以通过熟悉的 ECharts
配置方式，快速开发图表，满足各种可视化需求。
@@ -20,7 +20,7 @@
其中，`ec-canvas` 是我们提供的组件，其他文件是如何使用该组件的示例。
-`ec-canvas` 目录下有一个 `echarts.js`，默认我们会在每次 `echarts-for-weixin` 项目发版的时候替换成最新版的
ECharts。如有必要，可以自行从 ECharts
项目中下载[最新发布版](https://github.com/apache/incubator-echarts/releases)，或者从[官网自定义构建](${websitePath}/builder.html)以减小文件大小。
+`ec-canvas` 目录下有一个 `echarts.js`，默认我们会在每次 `echarts-for-weixin` 项目发版的时候替换成最新版的
ECharts。如有必要，可以自行从 ECharts
项目中下载[最新发布版](https://github.com/apache/echarts/releases)，或者从[官网自定义构建](${websitePath}/builder.html)以减小文件大小。
## 引入组件
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
