Merge branch '2.6' into FIX/TS-1438

docs-cn/07-develop/03-insert-data/_c_line.mdx

-```c
-{{#include docs-examples/c/line_example.c:main}}
-```
\ No newline at end of file

docs-cn/07-develop/03-insert-data/_c_opts_json.mdx

-```c
-{{#include docs-examples/c/json_protocol_example.c:main}}
-```
\ No newline at end of file

docs-cn/07-develop/03-insert-data/_c_opts_telnet.mdx

-```c
-{{#include docs-examples/c/telnet_line_example.c:main}}
-```
\ No newline at end of file

docs-cn/07-develop/03-insert-data/_c_sql.mdx

-```c
-{{#include docs-examples/c/insert_example.c}}
-```
\ No newline at end of file

docs-cn/07-develop/03-insert-data/_cs_line.mdx

-```csharp
-{{#include docs-examples/csharp/InfluxDBLineExample.cs}}
-```

docs-cn/07-develop/03-insert-data/_cs_opts_json.mdx

-```csharp
-{{#include docs-examples/csharp/OptsJsonExample.cs}}
-```

docs-cn/07-develop/03-insert-data/_cs_opts_telnet.mdx

-```csharp
-{{#include docs-examples/csharp/OptsTelnetExample.cs}}
-```

docs-cn/07-develop/03-insert-data/_cs_sql.mdx

-```csharp
-{{#include docs-examples/csharp/SQLInsertExample.cs}}
-```

docs-cn/07-develop/03-insert-data/_cs_stmt.mdx

-```csharp
-{{#include docs-examples/csharp/StmtInsertExample.cs}}
-```

docs-cn/07-develop/03-insert-data/_go_line.mdx

-```go
-{{#include docs-examples/go/insert/line/main.go}}
-```

docs-cn/07-develop/03-insert-data/_go_opts_json.mdx

-```go
-{{#include docs-examples/go/insert/json/main.go}}
-```

docs-cn/07-develop/03-insert-data/_go_opts_telnet.mdx

-```go
-{{#include docs-examples/go/insert/telnet/main.go}}
-```

docs-cn/07-develop/03-insert-data/_go_sql.mdx

-```go
-{{#include docs-examples/go/insert/sql/main.go}}
-```

docs-cn/07-develop/03-insert-data/_js_line.mdx

-```js
-{{#include docs-examples/node/nativeexample/influxdb_line_example.js}}
-```

docs-cn/07-develop/03-insert-data/_js_opts_json.mdx

-```js
-{{#include docs-examples/node/nativeexample/opentsdb_json_example.js}}
-```

docs-cn/07-develop/03-insert-data/_js_opts_telnet.mdx

-```js
-{{#include docs-examples/node/nativeexample/opentsdb_telnet_example.js}}
-```

docs-cn/07-develop/03-insert-data/_js_sql.mdx

-```js
-{{#include docs-examples/node/nativeexample/insert_example.js}}
-```

docs-cn/07-develop/03-insert-data/_php_sql.mdx

-```php
-{{#include docs-examples/php/insert.php}}
-```

docs-cn/07-develop/03-insert-data/_php_stmt.mdx

-```php
-{{#include docs-examples/php/insert_stmt.php}}
-```

docs-cn/07-develop/03-insert-data/_py_line.mdx

-```py
-{{#include docs-examples/python/line_protocol_example.py}}
-```

docs-cn/07-develop/03-insert-data/_py_opts_json.mdx

-```py
-{{#include docs-examples/python/json_protocol_example.py}}
-```

docs-cn/07-develop/03-insert-data/_py_opts_telnet.mdx

-```py
-{{#include docs-examples/python/telnet_line_protocol_example.py}}
-```

docs-cn/07-develop/03-insert-data/_py_sql.mdx

-```py
-{{#include docs-examples/python/native_insert_example.py}}
-```

docs-cn/07-develop/03-insert-data/_rust_sql.mdx

-```rust
-{{#include docs-examples/rust/restexample/examples/insert_example.rs}}
-```

docs-cn/07-develop/03-insert-data/_rust_stmt.mdx

-```rust
-{{#include docs-examples/rust/nativeexample/examples/stmt_example.rs}}
-```

docs-cn/07-develop/04-query-data/_c.mdx

-```c
-{{#include docs-examples/c/query_example.c}}
-```
\ No newline at end of file

docs-cn/07-develop/04-query-data/_c_async.mdx

-```c
-{{#include docs-examples/c/async_query_example.c:demo}}
-```
\ No newline at end of file

docs-cn/07-develop/04-query-data/_cs.mdx

-```csharp
-{{#include docs-examples/csharp/QueryExample.cs}}
-```

docs-cn/07-develop/04-query-data/_cs_async.mdx

-```csharp
-{{#include docs-examples/csharp/AsyncQueryExample.cs}}
-```

docs-cn/07-develop/04-query-data/_go.mdx

-```go
-{{#include docs-examples/go/query/sync/main.go}}
-```

docs-cn/07-develop/04-query-data/_go_async.mdx

-```go
-{{#include docs-examples/go/query/async/main.go}}
-```

docs-cn/07-develop/04-query-data/_js.mdx

-```js
-{{#include docs-examples/node/nativeexample/query_example.js}}
-```

docs-cn/07-develop/04-query-data/_js_async.mdx

-```js
-{{#include docs-examples/node/nativeexample/async_query_example.js}}
-```

docs-cn/07-develop/04-query-data/_php.mdx

-```go
-{{#include docs-examples/php/query.php}}
-```

docs-cn/07-develop/04-query-data/_rust.mdx

-```rust
-{{#include docs-examples/rust/restexample/examples/query_example.rs}}
-```

docs-cn/07-develop/_sub_c.mdx

-```c
-{{#include docs-examples/c/subscribe_demo.c}}
-```
\ No newline at end of file

docs-cn/07-develop/_sub_cs.mdx

-```csharp
-{{#include docs-examples/csharp/SubscribeDemo.cs}}
-```
\ No newline at end of file

docs-cn/07-develop/_sub_go.mdx

-```go
-{{#include docs-examples/go/sub/main.go}}
-```
\ No newline at end of file

docs-cn/07-develop/_sub_node.mdx

-```js
-{{#include docs-examples/node/nativeexample/subscribe_demo.js}}
-```
\ No newline at end of file

docs-cn/07-develop/_sub_python.mdx

-```py
-{{#include docs-examples/python/subscribe_demo.py}}
-```
\ No newline at end of file

docs-cn/07-develop/_sub_rust.mdx

-```rs
-{{#include docs-examples/rust/nativeexample/examples/subscribe_demo.rs}}
-```
\ No newline at end of file

docs-cn/12-taos-sql/12-keywords/_category_.yml

-label: 参数限制与保留关键字
\ No newline at end of file

docs-en/07-develop/03-insert-data/_c_line.mdx

-```c
-{{#include docs-examples/c/line_example.c:main}}
-```
\ No newline at end of file

docs-en/07-develop/03-insert-data/_c_opts_json.mdx

-```c
-{{#include docs-examples/c/json_protocol_example.c:main}}
-```
\ No newline at end of file

docs-en/07-develop/03-insert-data/_c_opts_telnet.mdx

-```c
-{{#include docs-examples/c/telnet_line_example.c:main}}
-```
\ No newline at end of file

docs-en/07-develop/03-insert-data/_c_sql.mdx

-```c
-{{#include docs-examples/c/insert_example.c}}
-```
\ No newline at end of file

docs-en/07-develop/03-insert-data/_cs_line.mdx

-```csharp
-{{#include docs-examples/csharp/InfluxDBLineExample.cs}}
-```

docs-en/07-develop/03-insert-data/_cs_opts_json.mdx

-```csharp
-{{#include docs-examples/csharp/OptsJsonExample.cs}}
-```

docs-en/07-develop/03-insert-data/_cs_opts_telnet.mdx

-```csharp
-{{#include docs-examples/csharp/OptsTelnetExample.cs}}
-```

docs-en/07-develop/03-insert-data/_cs_sql.mdx

-```csharp
-{{#include docs-examples/csharp/SQLInsertExample.cs}}
-```

docs-en/07-develop/03-insert-data/_cs_stmt.mdx

-```csharp
-{{#include docs-examples/csharp/StmtInsertExample.cs}}
-```

docs-en/07-develop/03-insert-data/_go_line.mdx

-```go
-{{#include docs-examples/go/insert/line/main.go}}
-```

docs-en/07-develop/03-insert-data/_go_opts_json.mdx

-```go
-{{#include docs-examples/go/insert/json/main.go}}
-```

docs-en/07-develop/03-insert-data/_go_opts_telnet.mdx

-```go
-{{#include docs-examples/go/insert/telnet/main.go}}
-```

docs-en/07-develop/03-insert-data/_go_sql.mdx

-```go
-{{#include docs-examples/go/insert/sql/main.go}}
-```

docs-en/07-develop/03-insert-data/_js_line.mdx

-```js
-{{#include docs-examples/node/nativeexample/influxdb_line_example.js}}
-```

docs-en/07-develop/03-insert-data/_js_opts_json.mdx

-```js
-{{#include docs-examples/node/nativeexample/opentsdb_json_example.js}}
-```

docs-en/07-develop/03-insert-data/_js_opts_telnet.mdx

-```js
-{{#include docs-examples/node/nativeexample/opentsdb_telnet_example.js}}
-```

docs-en/07-develop/03-insert-data/_js_sql.mdx

-```js
-{{#include docs-examples/node/nativeexample/insert_example.js}}
-```

docs-en/07-develop/03-insert-data/_py_line.mdx

-```py
-{{#include docs-examples/python/line_protocol_example.py}}
-```

docs-en/07-develop/03-insert-data/_py_opts_json.mdx

-```py
-{{#include docs-examples/python/json_protocol_example.py}}
-```

docs-en/07-develop/03-insert-data/_py_opts_telnet.mdx

-```py
-{{#include docs-examples/python/telnet_line_protocol_example.py}}
-```

docs-en/07-develop/03-insert-data/_py_sql.mdx

-```py
-{{#include docs-examples/python/native_insert_example.py}}
-```

docs-en/07-develop/03-insert-data/_rust_sql.mdx

-```rust
-{{#include docs-examples/rust/restexample/examples/insert_example.rs}}
-```

docs-en/07-develop/03-insert-data/_rust_stmt.mdx

-```rust
-{{#include docs-examples/rust/nativeexample/examples/stmt_example.rs}}
-```

docs-en/07-develop/04-query-data/_c.mdx

-```c
-{{#include docs-examples/c/query_example.c}}
-```
\ No newline at end of file

docs-en/07-develop/04-query-data/_c_async.mdx

-```c
-{{#include docs-examples/c/async_query_example.c:demo}}
-```
\ No newline at end of file

docs-en/07-develop/04-query-data/_cs.mdx

-```csharp
-{{#include docs-examples/csharp/QueryExample.cs}}
-```

docs-en/07-develop/04-query-data/_cs_async.mdx

-```csharp
-{{#include docs-examples/csharp/AsyncQueryExample.cs}}
-```

docs-en/07-develop/04-query-data/_go.mdx

-```go
-{{#include docs-examples/go/query/sync/main.go}}
-```

docs-en/07-develop/04-query-data/_go_async.mdx

-```go
-{{#include docs-examples/go/query/async/main.go}}
-```

docs-en/07-develop/04-query-data/_js.mdx

-```js
-{{#include docs-examples/node/nativeexample/query_example.js}}
-```

docs-en/07-develop/04-query-data/_js_async.mdx

-```js
-{{#include docs-examples/node/nativeexample/async_query_example.js}}
-```

docs-en/07-develop/04-query-data/_rust.mdx

-```rust
-{{#include docs-examples/rust/restexample/examples/query_example.rs}}
-```

docs-en/07-develop/_sub_c.mdx

-```c
-{{#include docs-examples/c/subscribe_demo.c}}
-```
\ No newline at end of file

docs-en/07-develop/_sub_cs.mdx

-```csharp
-{{#include docs-examples/csharp/SubscribeDemo.cs}}
-```
\ No newline at end of file

docs-en/07-develop/_sub_go.mdx

-```go
-{{#include docs-examples/go/sub/main.go}}
-```
\ No newline at end of file

docs-en/07-develop/_sub_node.mdx

-```js
-{{#include docs-examples/node/nativeexample/subscribe_demo.js}}
-```
\ No newline at end of file

docs-en/07-develop/_sub_python.mdx

-```py
-{{#include docs-examples/python/subscribe_demo.py}}
-```
\ No newline at end of file

docs-en/07-develop/_sub_rust.mdx

-```rs
-{{#include docs-examples/rust/nativeexample/examples/subscribe_demo.rs}}
-```
\ No newline at end of file

docs-en/02-intro/index.md → docs/en/02-intro/index.md

@@ -110,4 +110,4 @@ As a high-performance, scalable and SQL supported time-series database, TDengine
 - [TDengine vs InfluxDB、OpenTSDB、Cassandra、MySQL、ClickHouse](https://www.tdengine.com/downloads/TDengine_Testing_Report_en.pdf)
 - [TDengine vs OpenTSDB](https://tdengine.com/2019/09/12/710.html)
 - [TDengine vs Cassandra](https://tdengine.com/2019/09/12/708.html)
-- [TDengine vs InfluxDB](https://tdengine.com/2019/09/12/706.html)
+- [TDengine vs InfluxDB](https://tdengine.com/2019/09/12/706.html)
\ No newline at end of file

docs-en/05-get-started/index.md → docs/en/05-get-started/index.md

 ---
 title: Get Started
-description: 'Install TDengine from Docker image, apt-get or package, and run TAOS CLI and taosBenchmark to experience the features'
+description: 'Install TDengine from Docker image, apt-get or package, and run TDengine CLI and taosBenchmark to experience the features'
 ---
 
 import Tabs from "@theme/Tabs";
@@ -120,7 +120,7 @@ select * from t;
 Query OK, 2 row(s) in set (0.003128s)
 ```
 
-Besides executing SQL commands, system administrators can check running status, add/drop user accounts and manage the running instances. TAOS CLI with client driver can be installed and run on either Linux or Windows machines. For more details on CLI, please [check here](../reference/taos-shell/).
+Besides executing SQL commands, system administrators can check running status, add/drop user accounts and manage the running instances. TDengine CLI with client driver can be installed and run on either Linux or Windows machines. For more details on CLI, please [check here](../reference/taos-shell/).
 
 ## Experience the blazing fast speed
 

docs-en/07-develop/01-connect/_connect_c.mdx → docs/en/07-develop/01-connect/_connect_c.mdx

 ```c title="Native Connection"
-{{#include docs-examples/c/connect_example.c}}
+{{#include docs/examples/c/connect_example.c}}
 ```

docs-en/07-develop/01-connect/_connect_cs.mdx → docs/en/07-develop/01-connect/_connect_cs.mdx

 ```csharp title="Native Connection"
-{{#include docs-examples/csharp/ConnectExample.cs}}
+{{#include docs/examples/csharp/ConnectExample.cs}}
 ```
 
 :::info

docs-en/07-develop/01-connect/_connect_go.mdx → docs/en/07-develop/01-connect/_connect_go.mdx

 #### Unified Database Access Interface
 
 ```go title="Native Connection"
-{{#include docs-examples/go/connect/cgoexample/main.go}}
+{{#include docs/examples/go/connect/cgoexample/main.go}}
 ```
 
 ```go title="REST Connection"
-{{#include docs-examples/go/connect/restexample/main.go}}
+{{#include docs/examples/go/connect/restexample/main.go}}
 ```
 
 #### Advanced Features
@@ -13,5 +13,5 @@
 The af package of driver-go can also be used to establish connection, with this way some advanced features of TDengine, like parameter binding and subscription, can be used.
 
 ```go title="Establish native connection using af package"
-{{#include docs-examples/go/connect/afconn/main.go}}
+{{#include docs/examples/go/connect/afconn/main.go}}
 ```

docs-en/07-develop/01-connect/_connect_java.mdx → docs/en/07-develop/01-connect/_connect_java.mdx

 ```java title="Native Connection"
-{{#include docs-examples/java/src/main/java/com/taos/example/JNIConnectExample.java}}
+{{#include docs/examples/java/src/main/java/com/taos/example/JNIConnectExample.java}}
 ```
 
 ```java title="REST Connection"
-{{#include docs-examples/java/src/main/java/com/taos/example/RESTConnectExample.java:main}}
+{{#include docs/examples/java/src/main/java/com/taos/example/RESTConnectExample.java:main}}
 ```
 
 When using REST connection, the feature of bulk pulling can be enabled if the size of resulting data set is huge.
 
 ```java title="Enable Bulk Pulling" {4}
-{{#include docs-examples/java/src/main/java/com/taos/example/WSConnectExample.java:main}}
+{{#include docs/examples/java/src/main/java/com/taos/example/WSConnectExample.java:main}}
 ```
 
 More configuration about connection，please refer to [Java Connector](/reference/connector/java)

docs-en/07-develop/01-connect/_connect_node.mdx → docs/en/07-develop/01-connect/_connect_node.mdx

 ```js title="Native Connection"
-{{#include docs-examples/node/nativeexample/connect.js}}
+{{#include docs/examples/node/nativeexample/connect.js}}
 ```
 
 ```js title="REST Connection"
-{{#include docs-examples/node/restexample/connect.js}}
+{{#include docs/examples/node/restexample/connect.js}}
 ```

docs-en/07-develop/01-connect/_connect_python.mdx → docs/en/07-develop/01-connect/_connect_python.mdx

 ```python title="Native Connection"
-{{#include docs-examples/python/connect_example.py}}
+{{#include docs/examples/python/connect_example.py}}
 ```

docs-en/07-develop/01-connect/_connect_r.mdx → docs/en/07-develop/01-connect/_connect_r.mdx

 ```r title="Native Connection"
-{{#include docs-examples/R/connect_native.r:demo}}
+{{#include docs/examples/R/connect_native.r:demo}}
 ```

docs-en/07-develop/01-connect/_connect_rust.mdx → docs/en/07-develop/01-connect/_connect_rust.mdx

 ```rust title="Native Connection/REST Connection"
-{{#include docs-examples/rust/nativeexample/examples/connect.rs}}
+{{#include docs/examples/rust/nativeexample/examples/connect.rs}}
 ```
 
 :::note