Merge branch '3.0' of https://github.com/taosdata/TDengine into refact/tsdb_optimize

docs/en/12-taos-sql/24-show.md

@@ -194,7 +194,7 @@ Shows information about streams in the system.
 SHOW SUBSCRIPTIONS;
 ```
 
-Shows all subscriptions in the current database.
+Shows all subscriptions in the system.
 
 ## SHOW TABLES
 

docs/en/13-operation/01-pkg-install.md

@@ -35,6 +35,22 @@ TDengine is removed successfully!
 
 ```
 
+Apt-get package of taosTools can be uninstalled as below:
+
+```
+$ sudo apt remove taostools
+Reading package lists... Done
+Building dependency tree
+Reading state information... Done
+The following packages will be REMOVED:
+  taostools
+0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded.
+After this operation, 68.3 MB disk space will be freed.
+Do you want to continue? [Y/n]
+(Reading database ... 147973 files and directories currently installed.)
+Removing taostools (2.1.2) ...
+```
+
 </TabItem>
 <TabItem label="Uninstall Deb" value="debuninst">
 
@@ -48,6 +64,14 @@ TDengine is removed successfully!
 
 ```
 
+Deb package of taosTools can be uninstalled as below:
+
+```
+$ sudo dpkg -r taostools
+(Reading database ... 147973 files and directories currently installed.)
+Removing taostools (2.1.2) ...
+```
+
 </TabItem>
 
 <TabItem label="Uninstall RPM" value="rpmuninst">
@@ -59,6 +83,13 @@ $ sudo rpm -e tdengine
 TDengine is removed successfully!
 ```
 
+RPM package of taosTools can be uninstalled as below:
+
+```
+sudo rpm -e taostools
+taosToole is removed successfully!
+```
+
 </TabItem>
 
 <TabItem label="Uninstall tar.gz" value="taruninst">
@@ -67,10 +98,16 @@ tar.gz package of TDengine can be uninstalled as below:
 
 ```
 $ rmtaos
-Nginx for TDengine is running, stopping it...
 TDengine is removed successfully!
+```
 
-taosKeeper is removed successfully!
+tar.gz package of taosTools can be uninstalled as below:
+
+```
+$ rmtaostools
+Start to uninstall taos tools ...
+
+taos tools is uninstalled successfully!
 ```
 
 </TabItem>

docs/zh/12-taos-sql/24-show.md

@@ -195,7 +195,7 @@ SHOW STREAMS;
 SHOW SUBSCRIPTIONS;
 ```
 
-显示当前数据库下的所有的订阅关系
+显示当前系统内所有的订阅关系
 
 ## SHOW TABLES
 

docs/zh/17-operation/01-pkg-install.md

@@ -47,7 +47,7 @@ lrwxrwxrwx  1 root root   13 Feb 22 09:34 log -> /var/log/taos/
 <Tabs>
 <TabItem label="apt-get 卸载" value="aptremove">
 
-卸载命令如下:
+TDengine 卸载命令如下:
 
 ```
 $ sudo apt-get remove tdengine
@@ -65,10 +65,26 @@ TDengine is removed successfully!
 
 ```
 
+taosTools 卸载命令如下:
+
+```
+$ sudo apt remove taostools
+Reading package lists... Done
+Building dependency tree
+Reading state information... Done
+The following packages will be REMOVED:
+  taostools
+0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded.
+After this operation, 68.3 MB disk space will be freed.
+Do you want to continue? [Y/n]
+(Reading database ... 147973 files and directories currently installed.)
+Removing taostools (2.1.2) ...
+```
+
 </TabItem>
 <TabItem label="Deb 卸载" value="debuninst">
 
-卸载命令如下:
+TDengine 卸载命令如下:
 
 ```
 $ sudo dpkg -r tdengine
@@ -78,28 +94,52 @@ TDengine is removed successfully!
 
 ```
 
+taosTools 卸载命令如下:
+
+```
+$ sudo dpkg -r taostools
+(Reading database ... 147973 files and directories currently installed.)
+Removing taostools (2.1.2) ...
+```
+
 </TabItem>
 
 <TabItem label="RPM 卸载" value="rpmuninst">
 
-卸载命令如下:
+卸载 TDengine 命令如下:
 
 ```
 $ sudo rpm -e tdengine
 TDengine is removed successfully!
 ```
 
+卸载 taosTools 命令如下:
+
+```
+sudo rpm -e taostools
+taosToole is removed successfully!
+```
+
 </TabItem>
 
 <TabItem label="tar.gz 卸载" value="taruninst">
 
-卸载命令如下:
+卸载 TDengine 命令如下:
 
 ```
 $ rmtaos
 TDengine is removed successfully!
 ```
 
+卸载 taosTools 命令如下：
+
+```
+$ rmtaostools
+Start to uninstall taos tools ...
+
+taos tools is uninstalled successfully!
+```
+
 </TabItem>
 <TabItem label="Windows 卸载" value="windows">
 在 C:\TDengine 目录下，通过运行 unins000.exe 卸载程序来卸载 TDengine。