fix merge conflicts

docs/en/07-develop/01-connect.md

@@ -7,19 +7,19 @@ import Tabs from "@theme/Tabs";
 import TabItem from "@theme/TabItem";
 import Image from '@theme/IdealImage';
 import imgConnect from '../assets/connecting-to-tdengine-01.png';
-import ConnJava from "./_connect_java.mdx";
+import ConnJava from "../assets/resources/_connect_java.mdx";
-import ConnGo from "./_connect_go.mdx";
+import ConnGo from "../assets/resources/_connect_go.mdx";
-import ConnRust from "./_connect_rust.mdx";
+import ConnRust from "../assets/resources/_connect_rust.mdx";
-import ConnNode from "./_connect_node.mdx";
+import ConnNode from "../assets/resources/_connect_node.mdx";
-import ConnPythonNative from "./_connect_python.mdx";
+import ConnPythonNative from "../assets/resources/_connect_python.mdx";
-import ConnCSNative from "./_connect_cs.mdx";
+import ConnCSNative from "../assets/resources/_connect_cs.mdx";
-import ConnC from "./_connect_c.mdx";
+import ConnC from "../assets/resources/_connect_c.mdx";
-import InstallOnLinux from "../14-reference/05-connector/_linux_install.mdx";
+import InstallOnLinux from "../assets/resources/_linux_install.mdx";
-import InstallOnWindows from "../14-reference/05-connector/_windows_install.mdx";
+import InstallOnWindows from "../assets/resources/_windows_install.mdx";
-import InstallOnMacOS from "../14-reference/05-connector/_macos_install.mdx";
+import InstallOnMacOS from "../assets/resources/_macos_install.mdx";
-import VerifyLinux from "../14-reference/05-connector/_verify_linux.mdx";
+import VerifyLinux from "../assets/resources/_verify_linux.mdx";
-import VerifyMacOS from "../14-reference/05-connector/_verify_macos.mdx";
+import VerifyMacOS from "../assets/resources/_verify_macos.mdx";
-import VerifyWindows from "../14-reference/05-connector/_verify_windows.mdx";
+import VerifyWindows from "../assets/resources/_verify_windows.mdx";
 
 TDengine provides a rich set of application development interfaces. To facilitate users in quickly developing their applications, TDengine supports connectors for multiple programming languages. The official connectors include support for C/C++, Java, Python, Go, Node.js, C#, Rust, Lua (community contribution), and PHP (community contribution). These connectors support connecting to the TDengine cluster using the native interface (taosc) and REST interface (not supported in some languages yet). Community developers have also contributed several unofficial connectors, such as ADO.NET connector, Lua connector, and PHP connector. Additionally, TDengine can directly call the REST API provided by taosadapter for data writing and querying operations.
 

docs/en/10-third-party/01-collection/02-prometheus.md

@@ -3,7 +3,7 @@ title: Prometheus
 slug: /third-party-tools/data-collection/prometheus
 ---
 
-import Prometheus from "./_prometheus.mdx"
+import Prometheus from "../../assets/resources/_prometheus.mdx"
 
 Prometheus is a popular open-source monitoring and alerting system. In 2016, Prometheus joined the Cloud Native Computing Foundation (CNCF), becoming the second hosted project after Kubernetes. The project has a very active developer and user community.
 

docs/en/10-third-party/01-collection/03-telegraf.md

@@ -3,7 +3,7 @@ title: Telegraf
 slug: /third-party-tools/data-collection/telegraf
 ---
 
-import Telegraf from "./_telegraf.mdx"
+import Telegraf from "../../assets/resources/_telegraf.mdx"
 
 Telegraf is a very popular open-source metric collection software. In data collection and platform monitoring systems, Telegraf can collect operational information from various components without the need to manually write scripts for periodic collection, reducing the difficulty of data acquisition.
 

docs/en/10-third-party/01-collection/05-collectd.md

@@ -3,7 +3,7 @@ title: collectd
 slug: /third-party-tools/data-collection/collectd
 ---
 
-import CollectD from "./_collectd.mdx"
+import CollectD from "../../assets/resources/_collectd.mdx"
 
 collectd is a daemon for collecting system performance. collectd provides various storage mechanisms to store different values. It periodically collects relevant statistical information about the system while it is running and storing information. Utilizing this information helps identify current system performance bottlenecks and predict future system loads.
 

docs/en/10-third-party/01-collection/06-statsd.md

@@ -3,7 +3,7 @@ title: StatsD
 slug: /third-party-tools/data-collection/statsd
 ---
 
-import StatsD from "./_statsd.mdx"
+import StatsD from "../../assets/resources/_statsd.mdx"
 
 StatsD is a simple daemon for aggregating and summarizing application metrics that has rapidly evolved in recent years into a unified protocol for collecting application performance metrics.
 

docs/en/10-third-party/01-collection/07-icinga2.md

@@ -3,7 +3,7 @@ title: Icinga2
 slug: /third-party-tools/data-collection/icinga2
 ---
 
-import Icinga2 from "./_icinga2.mdx"
+import Icinga2 from "../../assets/resources/_icinga2.mdx"
 
 icinga2 is an open-source host and network monitoring software, originally developed from the Nagios network monitoring application. Currently, icinga2 is released under the GNU GPL v2 license.
 

docs/en/10-third-party/01-collection/08-tcollector.md

@@ -3,7 +3,7 @@ title: TCollector
 slug: /third-party-tools/data-collection/tcollector
 ---
 
-import TCollector from "./_tcollector.mdx"
+import TCollector from "../../assets/resources/_tcollector.mdx"
 
 TCollector is part of openTSDB, used for collecting client logs and sending them to the database.
 

docs/en/14-reference/01-components/03-taosadapter.md

@@ -6,11 +6,11 @@ slug: /tdengine-reference/components/taosadapter
 
 import Image from '@theme/IdealImage';
 import imgAdapter from '../../assets/taosadapter-01.png';
-import Prometheus from "../../10-third-party/01-collection/_prometheus.mdx"
+import Prometheus from "../../assets/resources/_prometheus.mdx"
-import CollectD from "../../10-third-party/01-collection/_collectd.mdx"
+import CollectD from "../../assets/resources/_collectd.mdx"
-import StatsD from "../../10-third-party/01-collection/_statsd.mdx"
+import StatsD from "../../assets/resources/_statsd.mdx"
-import Icinga2 from "../../10-third-party/01-collection/_icinga2.mdx"
+import Icinga2 from "../../assets/resources/_icinga2.mdx"
-import TCollector from "../../10-third-party/01-collection/_tcollector.mdx"
+import TCollector from "../../assets/resources/_tcollector.mdx"
 
 taosAdapter is a companion tool for TDengine, serving as a bridge and adapter between the TDengine cluster and applications. It provides an easy and efficient way to ingest data directly from data collection agents (such as Telegraf, StatsD, collectd, etc.). It also offers InfluxDB/OpenTSDB compatible data ingestion interfaces, allowing InfluxDB/OpenTSDB applications to be seamlessly ported to TDengine.
 

docs/en/14-reference/05-connector/14-java.md

@@ -6,7 +6,7 @@ slug: /tdengine-reference/client-libraries/java
 
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
-import RequestId from "./_request_id.mdx";
+import RequestId from "../../assets/resources/_request_id.mdx";
 
 `taos-jdbcdriver` is the official Java connector for TDengine, allowing Java developers to develop applications that access the TDengine database. `taos-jdbcdriver` implements the interfaces of the JDBC driver standard.
 

docs/en/14-reference/05-connector/20-go.md

@@ -6,7 +6,7 @@ slug: /tdengine-reference/client-libraries/go
 
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
-import RequestId from "./_request_id.mdx";
+import RequestId from "../../assets/resources/_request_id.mdx";
 
 `driver-go` is the official Go language connector for TDengine, implementing the interface of the Go language [database/sql](https://golang.org/pkg/database/sql/) package. Go developers can use it to develop applications that access data in the TDengine cluster.
 

docs/en/14-reference/05-connector/26-rust.md

@@ -7,8 +7,8 @@ slug: /tdengine-reference/client-libraries/rust
 import Tabs from "@theme/Tabs";
 import TabItem from "@theme/TabItem";
 
-import Preparation from "./_preparation.mdx";
+import Preparation from "../../assets/resources/_preparation.mdx"
-import RequestId from "./_request_id.mdx";
+import RequestId from "../../assets/resources/_request_id.mdx";
 
 [![Crates.io](https://img.shields.io/crates/v/taos)](https://crates.io/crates/taos) ![Crates.io](https://img.shields.io/crates/d/taos) [![docs.rs](https://img.shields.io/docsrs/taos)](https://docs.rs/taos)
 
@@ -28,7 +28,7 @@ Supports Rust 1.70 and above.
 ## Version History
 
 | Rust Connector Version | Major Changes                                                                                         | TDengine Version   |
-| -------------------- | --------------------------------------------------------------------------------------------------- | --------------- |
+| ---------------------- | ----------------------------------------------------------------------------------------------------- | ------------------ |
 | v0.12.3                | 1. Optimized WebSocket query and insert performance. <br/> 2. Supported VARBINARY and GEOMETRY types. | 3.3.0.0 and higher |
 | v0.12.0                | WebSocket supports compression.                                                                       | 3.2.3.0 and higher |
 | v0.11.0                | TMQ feature optimization.                                                                             | 3.2.0.0 and higher |

docs/en/14-reference/05-connector/30-python.md

@@ -6,7 +6,7 @@ slug: /tdengine-reference/client-libraries/python
 
 import Tabs from "@theme/Tabs";
 import TabItem from "@theme/TabItem";
-import RequestId from "./_request_id.mdx";
+import RequestId from "../../assets/resources/_request_id.mdx";
 
 `taopsy` is the official connector provided by TDengine database for Python language, which provides multiple access interfaces for database writing, querying, subscribing, etc.
 

docs/en/14-reference/05-connector/35-node.md

@@ -6,7 +6,7 @@ slug: /tdengine-reference/client-libraries/node
 
 import Tabs from "@theme/Tabs";
 import TabItem from "@theme/TabItem";
-import RequestId from "./_request_id.mdx";
+import RequestId from "../../assets/resources/_request_id.mdx";
 
 `@tdengine/websocket` is the official Node.js language connector for TDengine. Node.js developers can use it to develop applications that access the TDengine database.
 

docs/en/14-reference/05-connector/40-csharp.md

@@ -6,7 +6,7 @@ slug: /tdengine-reference/client-libraries/csharp
 
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
-import RequestId from "./_request_id.mdx";
+import RequestId from "../../assets/resources/_request_id.mdx";
 
 `TDengine.Connector` is the C# language connector provided by TDengine. C# developers can use it to develop C# applications that access data in the TDengine cluster.
 

docs/en/14-reference/05-connector/43-r-lang.md

@@ -6,7 +6,7 @@ slug: /tdengine-reference/client-libraries/r-lang
 
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
-import Rdemo from "../../07-develop/_connect_r.mdx"
+import Rdemo from "../../assets/resources/_connect_r.mdx"
 
 The RJDBC library in R language can enable R language programs to access TDengine data. Here are the installation process, configuration process, and R language example code.
 

docs/en/14-reference/05-connector/index.md

@@ -7,12 +7,12 @@ import Tabs from "@theme/Tabs";
 import TabItem from "@theme/TabItem";
 import Image from '@theme/IdealImage';
 import imgClientLib from '../../assets/client-libraries-01.png';
-import InstallOnLinux from "./_linux_install.mdx";
+import InstallOnLinux from "../../assets/resources/_linux_install.mdx";
-import InstallOnWindows from "./_windows_install.mdx";
+import InstallOnWindows from "../../assets/resources/_windows_install.mdx";
-import InstallOnMacOS from "./_macos_install.mdx";
+import InstallOnMacOS from "../../assets/resources/_macos_install.mdx";
-import VerifyWindows from "./_verify_windows.mdx";
+import VerifyWindows from "../../assets/resources/_verify_windows.mdx";
-import VerifyLinux from "./_verify_linux.mdx";
+import VerifyLinux from "../../assets/resources/_verify_linux.mdx";
-import VerifyMacOS from "./_verify_macos.mdx";
+import VerifyMacOS from "../../assets/resources/_verify_macos.mdx";
 
 TDengine provides a rich set of application development interfaces. To facilitate users in quickly developing their own applications, TDengine supports connectors for multiple programming languages, including official connectors for C/C++, Java, Python, Go, Node.js, C#, and Rust. These connectors support connecting to the TDengine cluster using the native interface (taosc) and WebSocket interface. Community developers have also contributed several unofficial connectors, such as the ADO.NET connector, Lua connector, and PHP connector.
 

docs/zh/27-train-faq/01-faq.md

@@ -276,11 +276,11 @@ TDinsight插件中展示的数据是通过taosKeeper和taosAdapter服务收集
 
 ### 30 为什么开源版 TDengine 的主进程会建立一个与公网的连接？
 这个连接只会上报不涉及任何用户数据的最基本信息，用于官方了解产品在世界范围内的分布情况，进而优化产品，提升用户体验，具体采集项目为：集群名、操作系统版本、cpu信息等。
-该特性为可选配置项，在开源版中默认开启，具体参数为 telemetryReporting , 在官方文档中有做说明，链接如下：
+该特性为可选配置项，在开源版中默认开启，具体参数为 telemetryReporting , 在官方文档中有做说明，链接如下：[参数简介](https://docs.taosdata.com/reference/components/taosd/#%E7%9B%91%E6%8E%A7%E7%9B%B8%E5%85%B3)
-https://docs.taosdata.com/reference/components/taosd/#%E7%9B%91%E6%8E%A7%E7%9B%B8%E5%85%B3
 您可以随时关闭该参数，只需要在taos.cfg 中修改telemetryReporting为 0，然后重启数据库服务即可。
-代码位于:https://github.com/taosdata/TDengine/blob/62e609c558deb764a37d1a01ba84bc35115a85a4/source/dnode/mnode/impl/src/mndTelem.c
+代码位于:[点击此处](https://github.com/taosdata/TDengine/blob/62e609c558deb764a37d1a01ba84bc35115a85a4/source/dnode/mnode/impl/src/mndTelem.c)
 此外，对于安全性要求极高的企业版 TDengine Enterprise 来说，此参数不会工作。
+
 ### 31 第一次连接集群时遇到“Sync leader is unreachable”怎么办？
 报这个错，说明第一次向集群的连接是成功的，但第一次访问的IP不是mnode的leader节点，客户端试图与leader建立连接时发生错误。客户端通过EP，也就是指定的fqdn与端口号寻找leader节点，常见的报错原因有两个：