Merge operator (#1226)

* Update 5.lookup.md (#1002)

update col name

* Update 3.role-list.md (#1005)

* Update source_install-nebula-graph-by-rpm-or-deb.md (#1008)

* Update source_install-nebula-graph-by-rpm-or-deb.md

* Update source_install-nebula-graph-by-rpm-or-deb.md

* Update source_install-nebula-graph-by-rpm-or-deb.md

* Update source_install-nebula-graph-by-rpm-or-deb.md

* Update 2.deploy-nebula-operator.md (#1015)

* Update mkdocs.yml (#1016)

* Support excluding files (#1017)

* Support excluding files

* Update mkdocs.yml

* Update 2.deploy-dashboard.md (#1014)

* Update 2.deploy-dashboard.md

* Update 2.deploy-dashboard.md

Co-authored-by: cooper-lzy <[email protected]>

* Update 4.ldap.md (#1011)

* Enable prefix bloom filter by default (#1012)

* show jobs only show space related (#1013)

* Update 3.2create-cluster-with-helm.md (#1021)

* Update 4.schema.md (#1019)

* Update nebula-algorithm.md (#1022)

* Update 4.connect-to-nebula-graph-service.md (#1023)

* Update 5.operator-failover.md (#1025)

* update utils (#1029)

* Update ex-ug-FAQ.md (#1033)

* add toss (#1035)

* Update ex-ug-import-from-neo4j.md (#1034)

* add ssl (#1039)

* delete enterpriseonly (#1046)

* lookup support use IN (#1050)

* Update 4.date-and-time.md (#1037)

* Update 4.date-and-time.md

* Update 4.date-and-time.md

* Update 4.date-and-time.md (#1038)

* Update 3.go.md (#1048)

* add max_allowed_query_size in graph config (#1036)

* Update mkdocs.yml (#1040)

* create space as (#1045)

* create space as

* update

* Fix bad punctuations (#1049)

* Fix the incorrect description for UPSERT example (#1051)

* Update how-to-contribute.md (#1052)

* Update 4.ssl.md (#1044)

* Update 4.ssl.md

* Update 4.ssl.md

* Update nebula-algorithm.md (#1043)

* Update 4.ssl.md (#1041)

* Update 4.ssl.md

* Update 4.ssl.md

Co-authored-by: foesa <[email protected]>

* Modify some descriptions (#1054)

* fetch format (#1060)

* fetch format

* update

* update

* update

* lookup format (#1061)

* lookup format

* update

* Update ex-ug-import-from-sst.md (#1055)

* Improve the format of contributing guide (#1056)

- Add some missing periods.
- Add a missing space between Chinese and English.
- Merge redundant issue links.
- Add link for fork.

Update CONTRIBUTING.md

* get subgraph format (#1058)

* get subgraph format

* update

* Update 4.fetch.md (#1063)

* Update explorer (#1059)

* [WIP]Update explorer

* update

* Update ex-ug-canvas.md

* update

* Update ex-ug-canvas.md

* fix

* Update ex-ug-connect.md

* Update ex-ug-connect.md

* Update ex-ug-page-overview.md (#1065)

* add a memory configuration param (#1062)

change the default value to 0.9

* add go format (#1064)

* add go format

* Update 3.go.md

* Update 3.go.md

* Update 3.go.md (#1067)

* update eco tools (#1057)

* update eco tools

* Update nebula-algorithm.md

* Update ex-ug-import-from-neo4j.md

* Update mkdocs.yml

* Update mkdocs.yml

* Add rate limit parameters (#1071)

* modify suffix (#1068)

* Update ex-ug-import-from-sst.md (#1074)

* Update 6.delete-tag.md (#1075)

fix a small typo "LABLE" -> "LABEL"

* update explorer picture (#1078)

* yield for full doc (#1070)

* yield for full doc

* update

* update

* update

* update

* update

* update

* update

* update

* update

* Update 2.meta-config.md (#1066)

double checked with siwang, remove local_config and minimum_reserved_bytes

* Update ex-ug-import-from-sst.md (#1073)

* lack of "[" (#1079)

lack of "[" in <alter_definition> [, alter_definition] ...]

* Update ttl-options.md (#1080)

* add zone doc (#1053)

* add zone doc

* update

* update

* update

* update

* update

* update

Co-authored-by: foesa <[email protected]>

* add geo (#1081)

* add geo

* update

* update

* update

* Update 1.search-with-text-based-index.md (#1083)

command errod for fulltext creation
CREATE TAG INDEX nebula_index_1 ON player(name)-->CREATE FULLTEXT TAG INDEX nebula_index_1 ON player(name)

* Update limit syntax (#1082)

* Update LIMIT

* Update limit.md

* Update limit.md

* Update limit

* Update limit.md

* Add sample doc (#1084)

* Add sample doc

* Update sample.md

* Update sample.md

* Update 0.FAQ.md (#1087)

* Update 1.text-based-index-restrictions.md (#1089)

* Update 5.lookup.md (#1086)

* add 2.6 release note (#1088)

* add 2.6 release note

* update

* Update 2.rocksdb-statistics.md (#1091)

* upgrade nebula (#1093)

* upgrade nebula

* update

* update

* update

* update

* Update load-balance.md (#1092)

* Update source_manage-service.md (#1094)

* Update 5.null.md (#1097)

* Update releasenote.md (#1099)

* Update 4.date-and-time.md (#1095)

* add geo directory (#1096)

* add geo directory

* update

* Update 4.nebula-graph-crud.md (#1098)

* remove studio&dashboard&explorer (#1100)

* No line to separate result rows (#1105)

* change eco-tools (#1106)

console, importer, Docker Compose, Go, Python, Java

* Use new console table format in example (#1102)

* Use new console table format in example

* fix format of match

* Update 8.map.md (#1103)

* Update 9.type-conversion.md (#1104)

* Update 1.resource-preparations.md (#1110)

* Update 2.deploy-es.md (#1111)

* Update 4.schema.md (#1108)

* updated-connect-to-nebula-graph (#1107)

* Update 6.eco-tool-version.md (#1101)

Co-authored-by: cooper-lzy <[email protected]>

* Update 3.property-reference.md (#1109)

* change example (#1115)

Use the basketballPlayer subset as an example in the CRUD and GET Subgraph documents

* Add doc: install with tar (#1116)

* Update 6.set.md (#1114)

* Update 4.pipe.md (#1113)

* Update 1.comparison.md (#1112)

* Update composite property indexes (#1118)

* Update 1.create-native-index.md

* Update 1.create-native-index.md

* Update 1.create-native-index.md

* update studio (#1069)

* [WIP]update studio

* Update st-ug-deploy.md

* Create st-ug-deploy-by-helm.md

* Update st-ug-deploy-by-helm.md

* Update st-ug-deploy-by-helm.md

* Update st-ug-release-note.md

* Update st-ug-deploy-by-helm.md

* Update mkdocs.yml

* update

* update

* Update 7.string.md (#1120)

* Update 8.predicate.md (#1124)

* Update 14.geo.md (#1125)

* update exchange 2.6.0 (#1119)

* Create 6. cheatcheet-for-ngql-command.md (#1085)

* Create 6. cheatcheet-for-ngql-command.md

* Update 6. cheatcheet-for-ngql-command.md

* Update 6. cheatcheet-for-ngql-command.md

* Update 6. cheatcheet-for-ngql-command.md

* link path&typo

* Update 6. cheatcheet-for-ngql-command.md

* Update 6. cheatcheet-for-ngql-command.md

* Update 6. cheatcheet-for-ngql-command.md

* Update 6. cheatcheet-for-ngql-command.md

* Update 6. cheatcheet-for-ngql-command.md

* Update 6. cheatcheet-for-ngql-command.md

* Update 6. cheatcheet-for-ngql-command.md

* Update 1.install-nebula-graph-by-compiling-the-source-code.md (#1117)

* Update 1.install-nebula-graph-by-compiling-the-source-code.md

* Update 1.install-nebula-graph-by-compiling-the-source-code.md

* Update 1.install-nebula-graph-by-compiling-the-source-code.md

* Update 1.install-nebula-graph-by-compiling-the-source-code.md

* Update 1.install-nebula-graph-by-compiling-the-source-code.md

Co-authored-by: cooper-lzy <[email protected]>

* Update 5.case-expressions.md (#1121)

* Update 7.count.md (#1122)

* Update 12.hash.md (#1123)

* Update 2.match.md (#1127)

* Update 4.install-nebula-graph-from-tar.md (#1128)

* Update 4.install-nebula-graph-from-tar.md

* Update 4.install-nebula-graph-from-tar.md

* verify nGQL (#1129)

* update (#1133)

* Update 14.show-stats.md (#1138)

* Update 7.show-index-status.md (#1137)

* Update 6.show-hosts.md (#1136)

* Update 5.show-create-tags-edges.md (#1135)

* Update 4.show-create-space.md (#1134)

* Update 3.go.md (#1132)

* Update 3.deploy-nebula-graph-with-docker-compose.md (#1126)

* Update 3.deploy-nebula-graph-with-docker-compose.md

* Update 3.deploy-nebula-graph-with-docker-compose.md

* Update 3.deploy-nebula-graph-with-docker-compose.md

* Update 3.deploy-nebula-graph-with-docker-compose.md

* Update 5.lookup.md (#1130)

* Update 0.FAQ.md (#1141)

* Update 15.show-tags-edges.md (#1139)

* Update 17.show-sessions.md (#1140)

* updates (#1131)

* updates

* Update deploy-nebula-graph-cluster.md

* Update source_install-nebula-graph-by-rpm-or-deb.md (#1142)

* Update source_install-nebula-graph-by-rpm-or-deb.md

* Update source_install-nebula-graph-by-rpm-or-deb.md

* Update source_install-nebula-graph-by-rpm-or-deb.md

* Add an example for random LIMIT seed (#1143)

* modify-doc-name (#1144)

* release 2.6.0 (#1145)

* Update mkdocs.yml

* Update 6.eco-tool-version.md

* update connector (#1146)

* Delete overrides/partials directory

* Update 1.resource-preparations.md

* Update mkdocs.yml

* Update mkdocs.yml

* update nav (#1149)

* Update upgrade-nebula-graph-to-260.md (#1148)

* Update upgrade-nebula-graph-to-260.md

* Update upgrade-nebula-graph-to-260.md

* Update mkdocs.yml

* Update 6.eco-tool-version.md

* fix typo (#1150)

* hidden eco tools (#1151)

* Update ex-ug-import-from-sst.md

* Deploy studio with helm desc changes (#1154)

* Update upgrade-nebula-graph-to-260.md (#1147)

* Update upgrade-nebula-graph-to-260.md

* Update upgrade-nebula-graph-to-260.md

* Update st-ug-deploy-by-helm.md

* Update 6.eco-tool-version.md

* release 2.6.1 (#1155)

* Update ex-ug-limitations.md

* Update st-ug-limitations.md

* Update releasenote.md

* Update releasenote.md

* Update releasenote.md

* Update releasenote.md

* Update 0.FAQ.md

* Update 1.what-is-nebula-graph.md

* Update 3.manage-snapshot.md (#1158) (#1159)

Update 3.manage-snapshot.md (#1156)

Co-authored-by: Romi <[email protected]>

* Update 3.deploy-nebula-graph-with-docker-compose.md

* Update source_manage-service.md (#1160)

* Update ex-ug-import-from-parquet.md

* Update 1.resource-preparations.md

* add move_files config for ingest

* Update 6.cheatsheet-for-ngql-command.md (#1164)

changed \| to |

* Update README.md

* Update 6.show-hosts.md (#1166)

* Update mkdocs.yml

* Update 6.eco-tool-version.md

* merge explorer (#1167)

* Update mkdocs.yml

* Update ex-ug-deploy.md

* Update ex-ug-deploy.md

* Update ex-ug-deploy.md (#1169)

* Update ex-ug-deploy.md

* Update ex-ug-deploy.md

* display error (#1171)

* Change upgrade  (#1172)

* change upgrade

* update

* [WIP]add license doc (#1177)

* add license doc

* update

* Update docs-2.0/4.deployment-and-installation/2.compile-and-install-nebula-graph/1.install-nebula-graph-by-compiling-the-source-code.md

Co-authored-by: randomJoe211 <[email protected]>

* Update 4.install-nebula-graph-from-tar.md

* Update source_install-nebula-graph-by-rpm-or-deb.md

* Update deploy-license.md

* Update deploy-license.md

* update

* update

Co-authored-by: randomJoe211 <[email protected]>

* Update 1.install-nebula-graph-by-compiling-the-source-code.md

* Update 4.install-nebula-graph-from-tar.md

* Update ex-ug-import-from-sst.md

* Update ex-ug-import-from-sst.md

* Update 0.FAQ.md

* Update 10.collect.md (#1186)

lower case

* Update ex-ug-FAQ.md

* Add exchange ent doc (#1199)

* Add docs for Exchange Enterprise edition

* Update ex-ug-parameter.md

* Update ex-ug-export-from-nebula.md

* No support for generating SST with GEO data (#1201)

* change create sentence in nGQL (#1198)

* Update 3.go.md (#1196)

* Update 3.go.md (#1194)

* Update return.md (#1192)

* Update 5.lookup.md (#1191)

* Update nebula-bench.md

* Update source_install-nebula-graph-by-rpm-or-deb.md

* Merge dashboard (#1202)

* Update 8.predicate.md (#1124)

* add dashboard enterprise (#1077)

* [WIP]add dashboard enterprise

* update

* update

* Update 1.create-cluster.md

* update

* update

* update-1101

* update-1103

* update-1104

* update

* update

* update

* update-1105

* update

* update

* add dashboard to yaml (#1173)

* fix problem (#1174)

* modify dashboard ent (#1175)

* modify dashboard ent

* update-1108

* Update 1.create-cluster.md

* Update 1.what-is-dashboard-en.md

* Update 1.create-cluster.md

* update

* update

* Update mkdocs.yml (#1178)

* change en to ent (#1179)

* Change en to ent (#1180)

* change en to ent

* update

* Delete 2.deploy-connect-dashboard-en.md (#1181)

* Update dashboard ent (#1182)

* Update dashboard ent

* update

* Update 8.faq.md

* update

* Update 2.deploy-connect-dashboard-ent.md

* update-1109

* Update 2.deploy-connect-dashboard-ent.md

* Update Python client installation instruction (#1189)

Mirror update to vesoft-inc/nebula-python#152

* Update ex-ug-import-from-sst.md (#1188)

* Update ex-ug-import-from-sst.md

* Update ex-ug-import-from-sst.md

* Add link for Exchange bench (#1195)

* update dashboard (#1197)

* update

* Update 6.eco-tool-version.md

Co-authored-by: randomJoe211 <[email protected]>
Co-authored-by: foesa <[email protected]>
Co-authored-by: Grey Li <[email protected]>

* Update 1.create-cluster.md

* Update 2.deploy-connect-dashboard-ent.md

* Update 6.eco-tool-version.md

* Update 5.account-management.md

* Update yield.md (#1203)

* update

* Update 8.faq.md

* Add FAQ for Hive to Nebula (#1208)

* Update 2.deploy-connect-dashboard-ent.md

* Update SHOW CREATE TAG/EDGE (#1210)

* Update SHOW CREATE TAG/EDGE

* Update 5.show-create-tag-edge.md

* Update 6.eco-tool-version.md

* Update 0.FAQ.md

* Update 2.meta-service.md (#1218)

* Update 1.create-space.md (#1219)

* Update 2.use-space.md (#1220)

* Update 2.use-space.md

* Update mkdocs.yml

* New and updates for operator 090 to 261 (#1225)

* custom-conf-parameters&pv-claim&balance data (#1176)

* custom-conf-parameters

* update-pv-claim

* auto-balance-data-parameter

* Update mkdocs.yml

* version macro

* updates

* Update 8.3.balance-data-when-scaling-storage.md

* Update 2.deploy-nebula-operator.md

* Update 2.deploy-nebula-operator.md

* Update 8.3.balance-data-when-scaling-storage.md

* Update 8.1.custom-conf-parameter.md

* updates

* Update 8.1.custom-conf-parameter.md

* Update 8.3.balance-data-when-scaling-storage.md

* colon fix

* Update 3.1create-cluster-with-kubectl.md

* Create 9.upgrade-nebula-cluster.md (#1190)

* Create 9.upgrade-nebula-cluster.md

* Update 9.upgrade-nebula-cluster.md

* Update 9.upgrade-nebula-cluster.md

* Update 9.upgrade-nebula-cluster.md

* add crd updating step for 090 (#1221)&crd&macro&yaml

* upgrade Helm

* Update 3.2create-cluster-with-helm.md

* describe optimization

* Update 9.upgrade-nebula-cluster.md

* Update 9.upgrade-nebula-cluster.md

* Update 2.deploy-nebula-operator.md

* Update 2.deploy-nebula-operator.md

* crd upgrading

* Update 2.deploy-nebula-operator.md

Helm Updates for 090 (#1214)

* upgrade Helm

* Update 3.2create-cluster-with-helm.md

* describe optimization

* Update 9.upgrade-nebula-cluster.md

* Update 9.upgrade-nebula-cluster.md

* Update 2.deploy-nebula-operator.md

Update 2.deploy-nebula-operator.md

Update mkdocs.yml (#1213)

* updates for ingress and upgrading (#1205)

* Update 4.connect-to-nebula-graph-service.md

* Update 4.connect-to-nebula-graph-service.md

* Update 9.upgrade-nebula-cluster.md

* Service access via Ingress  (#1187)

* Update 4.connect-to-nebula-graph-service.md

* Update 4.connect-to-nebula-graph-service.md

* Update 4.connect-to-nebula-graph-service.md

* Update mkdocs.yml

Co-authored-by: lopn <[email protected]>
Co-authored-by: cooper-lzy <[email protected]>
Co-authored-by: foesa <[email protected]>
Co-authored-by: randomJoe211 <[email protected]>
Co-authored-by: Grey Li <[email protected]>
Co-authored-by: haifei.zhao <[email protected]>
Co-authored-by: [email protected] <[email protected]>
Co-authored-by: jingchun.xia <[email protected]>
Co-authored-by: Yee <[email protected]>
Co-authored-by: Sophie-Xie <[email protected]>
Co-authored-by: min.wu <[email protected]>
Co-authored-by: Romi <[email protected]>
Co-authored-by: Anqi <[email protected]>
Co-authored-by: Harris.Chu <[email protected]>
Co-authored-by: Even <[email protected]>

docs-2.0/1.introduction/3.nebula-graph-architecture/2.meta-service.md

@@ -43,9 +43,9 @@ Meta 服务中存储了 Schema 信息，同时还负责 Schema 的添加、修
 
 更多 Nebula Graph 的 Schema 信息，请参见[数据模型](../2.data-model.md)。
 
-### 管理基于TTL的数据回收
+### 管理TTL信息
 
-Meta 服务提供基于 TTL(Time To Live) 的自动数据回收和空间回收。
+Meta 服务存储TTL（Time To Live）定义信息，可以用于设置数据生命周期。数据过期后，会由Storage 服务进行处理，具体过程参见[TTL](../../3.ngql-guide/8.clauses-and-options/ttl-options.md)。
 
 ### 管理作业
 

docs-2.0/2.quick-start/6.cheatsheet-for-ngql-command.md

@@ -335,7 +335,7 @@
   | [SHOW CHARSET](../3.ngql-guide/7.general-query-statements/6.show/1.show-charset.md) | `SHOW CHARSET`                                    | `SHOW CHARSET`                       | 显示当前的字符集。                                       |
   | [SHOW COLLATION](../3.ngql-guide/7.general-query-statements/6.show/2.show-collation.md) | `SHOW COLLATION`                                  | `SHOW COLLATION`                     | 显示当前的排序规则。                                     |
   | [SHOW CREATE SPACE](../3.ngql-guide/7.general-query-statements/6.show/4.show-create-space.md) | `SHOW CREATE SPACE <space_name>`                  | `SHOW CREATE SPACE basketballplayer` | 显示指定图空间的创建语句。                               |
-  | [SHOW CREATE TAG/EDGE](../3.ngql-guide/7.general-query-statements/6.show/5.show-create-tags-edges.md) | `SHOW CREATE {TAG <tag_name> | EDGE <edge_name>}` | `SHOW CREATE TAG player`             | 显示指定Tag/Edge type的基本信息。                        |
+  | [SHOW CREATE TAG/EDGE](../3.ngql-guide/7.general-query-statements/6.show/5.show-create-tag-edge.md) | `SHOW CREATE {TAG <tag_name> | EDGE <edge_name>}` | `SHOW CREATE TAG player`             | 显示指定Tag/Edge type的基本信息。                        |
   | [SHOW HOSTS](../3.ngql-guide/7.general-query-statements/6.show/6.show-hosts.md) | `SHOW HOSTS [GRAPH | STORAGE | META]`               | `SHOW HOSTS`<br>`SHOW HOSTS GRAPH`   | 显示Graph、Storage、Meta服务主机信息、版本信息。         |
   | [SHOW INDEX STATUS](../3.ngql-guide/7.general-query-statements/6.show/7.show-index-status.md) | `SHOW {TAG | EDGE} INDEX STATUS`                  | `SHOW TAG INDEX STATUS`              | 重建原生索引的作业状态，以便确定重建索引是否成功。       |
   | [SHOW INDEXES](../3.ngql-guide/7.general-query-statements/6.show/8.show-indexes.md) | `SHOW {TAG | EDGE} INDEXES`                       | `SHOW TAG INDEXES`                   | 列出当前图空间内的所有Tag和Edge type（包括属性）的索引。 |

docs-2.0/20.appendix/0.FAQ.md

@@ -40,7 +40,7 @@ Nebula Graph一直在持续开发，功能或操作的行为可能会有变化
 
 悬挂边 (Dangling edge) 是指一条边的起点或者终点在数据库中不存在。
 
-Nebula Graph {{ nebula.release }} 的数据模型中，允许存在"悬挂边"；也没有 openCypher 中的 MERGE 语句。对于悬挂边的保证完全依赖应用层面。详见[INSERT VERTEX](../3.ngql-guide/12.vertex-statements/1.insert-vertex.md), [DELETE VERTEX](../3.ngql-guide/12.vertex-statements/4.delete-vertex.md), [INSERT EDGE](../3.ngql-guide/13.edge-statements/1.insert-edge.md), [DELETE EDGE](../3.ngql-guide/13.edge-statements/4.delete-edge.md)。
+Nebula Graph {{ nebula.release }} 的数据模型中，异常情况下可能会存在"悬挂边"；也没有 openCypher 中的 MERGE 语句。对于悬挂边的保证完全依赖应用层面。详见[INSERT VERTEX](../3.ngql-guide/12.vertex-statements/1.insert-vertex.md), [DELETE VERTEX](../3.ngql-guide/12.vertex-statements/4.delete-vertex.md), [INSERT EDGE](../3.ngql-guide/13.edge-statements/1.insert-edge.md), [DELETE EDGE](../3.ngql-guide/13.edge-statements/4.delete-edge.md)。
 
 
 ### 如何处理错误信息 `[ERROR (-1005)]: Used memory hits the high watermark(0.800000) of total system memory.`

docs-2.0/20.appendix/6.eco-tool-version.md

@@ -57,6 +57,14 @@ Nebula Dashboard（简称Dashboard）是一款用于监控和管理Nebula Graph
 |:---|:---|
 | {{ nebula.release }}  | {{dashboard_ent.release}}（79248d9） |
 
+## Nebula Dashboard（企业版）
+
+Nebula Dashboard（简称Dashboard）是一款用于监控和管理Nebula Graph多集群中机器和服务状态的可视化工具，支持在可视化界面进行集群创建、集群导入、数据平衡、扩容缩容等操作。详情参见[什么是Nebula Dashboard](../nebula-dashboard-ent/1.what-is-dashboard-ent.md)。
+
+|Nebula Graph版本|Dashboard企业版本（commit id）|
+|:---|:---|
+| {{ nebula.release }}  | {{dashboard_ent.release}}（3474c78） |
+
 ## Nebula Explorer
 
 Nebula Explorer（简称Explorer）是一款可以通过Web访问的图探索可视化工具，搭配Nebula Graph内核使用，用于与图数据进行可视化交互。即使没有图数据操作经验，用户也可以快速成为图专家。详情参见[什么是Nebula Explorer](../nebula-explorer/about-explorer/ex-ug-what-is-explorer.md)。
@@ -81,8 +89,7 @@ Nebula Operator（简称Operator）是用于在Kubernetes系统上自动化部
 
 |Nebula Graph版本|Operator版本（commit id）|
 |:---|:---|
-| {{ nebula.release }}  | {{operator.release}}（6d1104e） |
--->
+| {{ nebula.release }}  | {{operator.release}}（ba88e28） |
 
 ## Nebula Importer
 

docs-2.0/20.appendix/releasenote.md

@@ -7,3 +7,4 @@
 ## 历史版本
 
 [历史版本](https://nebula-graph.com.cn/tags/release-note/)
+

docs-2.0/3.ngql-guide/8.clauses-and-options/yield.md

@@ -145,11 +145,11 @@ nebula> YIELD "Hel" + "\tlo" AS string1, ", World!" AS string2;
 +-------------+------------+
 
 nebula> YIELD hash("Tim") % 100;
-+-----------------+
-| (hash(Tim)%100) |
-+-----------------+
-| 42              |
-+-----------------+
++-------------------+
+| (hash("Tim")%100) |
++-------------------+
+| 42                |
++-------------------+
 
 nebula> YIELD \
       CASE 2+3 \

docs-2.0/3.ngql-guide/9.space-statements/1.create-space.md

@@ -117,6 +117,7 @@ nebula> SHOW HOSTS;
 
 ```ngql
 nebula> BALANCE LEADER;
+nebula> SHOW HOSTS;
 +-------------+------+----------+--------------+--------------------------------+--------------------------------+
 | Host        | Port | Status   | Leader count | Leader distribution            | Partition distribution         |
 +-------------+------+----------+--------------+--------------------------------+--------------------------------+

docs-2.0/3.ngql-guide/9.space-statements/2.use-space.md

@@ -15,17 +15,15 @@ USE <graph_space_name>;
 ## 示例
 
 ```ngql
+# 创建示例空间。
+nebula> CREATE SPACE IF NOT EXISTS space1 (vid_type=FIXED_STRING(30));
+nebula> CREATE SPACE IF NOT EXISTS space2 (vid_type=FIXED_STRING(30));
+
 # 指定图空间space1作为工作空间。
 nebula> USE space1;
 
-# 检索图空间space1。
-nebula> GO FROM 1 OVER edge1;
-
-# 切换到图空间space2。
+# 切换到图空间space2。检索space2时，无法从space1读取任何数据，检索的点和边与space1无关。
 nebula> USE space2;
-
-# 检索图空间space2。无法从space1读取任何数据，检索的点和边与space1无关。
-nebula> GO FROM 2 OVER edge2;
 ```
 
 !!! Caution

docs-2.0/nebula-dashboard-ent/2.deploy-connect-dashboard-ent.md

@@ -88,10 +88,10 @@
    或是执行以下命令，分别启动prometheus、webserver、exporter和gateway服务以启动Dashboard。
    ```bash
    $ cd scripts
-   $ sudo ./dashboard.server start prometheus # 启动prometheus服务
-   $ sudo ./dashboard.server start webserver #启动webserver服务
-   $ sudo ./dashboard.server start exporter #启动exporter服务
-   $ sudo ./dashboard.server start gateway #启动gateway服务
+   $ sudo ./dashboard.service start prometheus # 启动prometheus服务
+   $ sudo ./dashboard.service start webserver #启动webserver服务
+   $ sudo ./dashboard.service start exporter #启动exporter服务
+   $ sudo ./dashboard.service start gateway #启动gateway服务
    ```
 
 ## 管理Dashboard服务

docs-2.0/nebula-dashboard-ent/3.create-import-dashboard/2.import-cluster.md

@@ -6,7 +6,8 @@
 
 !!! caution
 
-    在同一集群下，服务需要统一版本。不支持在同一集群中导入不同版本的Nebula Graph实例。
+    - 在同一集群下，服务需要统一版本。不支持在同一集群中导入不同版本的Nebula Graph实例。
+    - Nebula Graph的安装路径需要为默认安装路径`/usr/local。
 
 1. 在集群管理页面，点击 **导入集群** 标签。
 2. 在导入集群页面，输入连接Nebula Graph的信息：

docs-2.0/nebula-dashboard-ent/5.account-management.md

@@ -6,4 +6,4 @@
 
 用户使用创建的ADMIN账号登陆，不能对其他的账号进行操作，仅能查看用户名、角色、创建时间。下图为ADMIN用户的权限管理页面。
 
-![admin](../nebula-dashboard-ent/figs/ds-031.png))
+![admin](../nebula-dashboard-ent/figs/ds-031.png)

docs-2.0/nebula-dashboard-ent/8.faq.md

@@ -36,11 +36,11 @@ Meta服务主要存储Nebula Graph数据库中的元数据。一旦Meta服务出
 
 ## 为什么无法启动Dashboard（企业版）？
 
-- 确保License已拷贝至Dashboard目录中，且执行了`bash ./scripts/start.sh`命令。
+- 确保License已拷贝至Dashboard目录中，且执行了`sudo ./dashboard.service start all`命令。
 - 确保License未过期。
 
 用户也可以在Dashboard目录中执行`cat logs/webserver.log`查看各个模块的启动信息。如果满足以上条件，仍无法启动Dashboard，请前往 [Nebula Graph 官方论坛](https://discuss.nebula-graph.com.cn/ "点击前往 Nebula Graph 官方论坛") 咨询。
 
 ## 是否可以手动添加Nebula Graph安装包？
 
-Dashboard支持手动添加安装包，可以点击 [如何获取 Nebula Graph](https://nebula-graph.com.cn/download/) 下载所需系统和版本的RPM包或DEB包，添加到`dashboard/download/nebula-graph`路径下。在创建、扩容集群时，可选择添加的包进行部署。
+Dashboard支持手动添加安装包，可以点击 [如何获取 Nebula Graph](https://nebula-graph.com.cn/download/) 下载所需系统和版本的RPM包或DEB包，添加到`dashboard/download/nebula-graph`路径下。在创建、扩容集群时，可选择添加的包进行部署。

docs-2.0/nebula-exchange/ex-ug-FAQ.md

@@ -2,7 +2,7 @@
 
 ## 编译问题
 
-### 部分非central仓库的包下载失败，报错`Could not resolve dependencies for project xxx`
+### Q：部分非central仓库的包下载失败，报错`Could not resolve dependencies for project xxx`
 
 请检查Maven安装目录下`libexec/conf/settings.xml`文件的`mirror`部分：
 
@@ -21,7 +21,7 @@
 
 ## 执行问题
 
-### Yarn-Cluster模式下如何提交？
+### Q：Yarn-Cluster模式下如何提交？
 
 在Yarn-Cluster模式下提交任务，请参考如下命令：
 
@@ -35,19 +35,19 @@ nebula-exchange-2.0.0.jar \
 -c application.conf
 ```
 
-### 报错`method name xxx not found`
+### Q：报错`method name xxx not found`
 
 一般是端口配置错误，需检查Meta服务、Graph服务、Storage服务的端口配置。
 
-### 报NoSuchMethod、MethodNotFound错误（`Exception in thread "main" java.lang.NoSuchMethodError`等）
+### Q：报NoSuchMethod、MethodNotFound错误（`Exception in thread "main" java.lang.NoSuchMethodError`等）
 
 绝大多数是因为JAR包冲突和版本冲突导致的报错，请检查报错服务的版本，与Exchange中使用的版本进行对比，检查是否一致，尤其是Spark版本、Scala版本、Hive版本。
 
-### Exchange导入Hive数据时报错`Exception in thread "main" org.apache.spark.sql.AnalysisException: Table or view not found`
+### Q：Exchange导入Hive数据时报错`Exception in thread "main" org.apache.spark.sql.AnalysisException: Table or view not found`
 
 检查提交exchange任务的命令中是否遗漏参数`-h`，检查table和database是否正确，在spark-sql中执行用户配置的exec语句，验证exec语句的正确性。
 
-### 运行时报错`com.facebook.thrift.protocol.TProtocolException: Expected protocol id xxx`
+### Q：运行时报错`com.facebook.thrift.protocol.TProtocolException: Expected protocol id xxx`
 
 请检查Nebula Graph服务端口配置是否正确。
 
@@ -78,13 +78,47 @@ nebula-exchange-2.0.0.jar \
 
     - Storage服务可用的端口号有33183、33177、33185。
 
-### 运行时报错`Exception in thread "main" com.facebook.thrift.protocol.TProtocolException: The field 'code' has been assigned the invalid value -4`
+### Q：运行时报错`Exception in thread "main" com.facebook.thrift.protocol.TProtocolException: The field 'code' has been assigned the invalid value -4`
 
 检查 Exchange 版本与 Nebula Graph 版本是否匹配，详细信息可参考[使用限制](../nebula-exchange/about-exchange/ex-ug-limitations.md)。
 
+### Q：将Hive中的数据导入Nebula Graph时出现乱码如何解决？
+
+如果Hive中数据的属性值包含中文字符，可能出现该情况。解决方案是在导入命令中的JAR包路径前加上以下选项：
+
+```bash
+--conf spark.driver.extraJavaOptions=-Dfile.encoding=utf-8
+--conf spark.executor.extraJavaOptions=-Dfile.encoding=utf-8
+```
+
+即：
+
+```bash
+<spark_install_path>/bin/spark-submit --master "local" \
+--conf spark.driver.extraJavaOptions=-Dfile.encoding=utf-8 \
+--conf spark.executor.extraJavaOptions=-Dfile.encoding=utf-8 \
+--class com.vesoft.nebula.exchange.Exchange \
+<nebula-exchange-2.x.y.jar_path> -c <application.conf_path>
+```
+
+如果是在YARN中，则用以下命令：
+
+```bash
+<spark_install_path>/bin/spark-submit \
+--class com.vesoft.nebula.exchange.Exchange \
+--master yarn-cluster \
+--files <application.conf_path> \
+--conf spark.driver.extraClassPath=./ \
+--conf spark.executor.extraClassPath=./ \
+--conf spark.driver.extraJavaOptions=-Dfile.encoding=utf-8 \
+--conf spark.executor.extraJavaOptions=-Dfile.encoding=utf-8 \
+<nebula-exchange-2.x.y.jar_path> \
+-c application.conf
+```
+
 ## 配置问题
 
-### 哪些配置项影响导入性能？
+### Q：哪些配置项影响导入性能？
 
 - batch：每次发送给Nebula Graph服务的nGQL语句中包含的数据条数。
 
@@ -100,18 +134,18 @@ nebula-exchange-2.0.0.jar \
 
 ## 其他问题
 
-### Exchange支持哪些版本的Nebula Graph？
+### Q：Exchange支持哪些版本的Nebula Graph？
 
 请参见Exchange的[使用限制](about-exchange/ex-ug-limitations.md)。
 
-### Exchange与Spark Writer有什么关系？
+### Q：Exchange与Spark Writer有什么关系？
 
 Exchange是在Spark Writer基础上开发的Spark应用程序，二者均适用于在分布式环境中将集群的数据批量迁移到Nebula Graph中，但是后期的维护工作将集中在 Exchange上。与Spark Writer相比，Exchange有以下改进：
 
 - 支持更丰富的数据源，如MySQL、Neo4j、Hive、HBase、Kafka、Pulsar等。
 
 - 修复了Spark Writer的部分问题。例如Spark读取HDFS里的数据时，默认读取到的源数据均为String类型，可能与Nebula Graph定义的Schema不同，所以Exchange增加了数据类型的自动匹配和类型转换，当Nebula Graph定义的Schema中数据类型为非String类型（如double）时，Exchange会将String类型的源数据转换为对应的类型（如double）。
 
-### Exchange传输数据的性能如何？
+### Q：Exchange传输数据的性能如何？
 
 Exchange的性能测试数据和测试方法参见[Nebula Exchange test result](https://github.com/vesoft-inc/nebula-exchange/blob/master/bench/exchange-test.md)。

docs-2.0/nebula-operator/1.introduction-to-nebula-operator.md

@@ -18,9 +18,11 @@ Nebula Operator已具备的功能如下：
 
 - **集群扩容和缩容**：通过在控制循环中调用Nebula Graph原生提供的扩缩容接口，Nebula Graph封装Nebula Operator实现了扩缩容的逻辑，用户可以通过YAML配置进行简单的扩缩容，且保证数据的稳定性。更多信息参考[使用Kubeclt扩缩容集群](3.deploy-nebula-graph-cluster/3.1create-cluster-with-kubectl.md#_3)或[使用Helm扩缩容集群](3.deploy-nebula-graph-cluster/3.2create-cluster-with-helm.md#_2)。
 
+- **集群升级**：支持升级2.5.x版的Nebula Graph集群至2.6.x版。
+
 - **故障自愈**：Nebula Operator调用Nebula Graph集群提供的接口，动态地感知服务状态。一旦发现异常，Nebula Operator自动进行容错处理。更多信息参考[故障自愈](5.operator-failover.md)。
 
-- **均衡调度**: 基于调度器扩展接口，Nebula Operator提供的调度器可以将应用Pods均匀地分布在Nebula Graph集群中。
+- **均衡调度**：基于调度器扩展接口，Nebula Operator提供的调度器可以将应用Pods均匀地分布在Nebula Graph集群中。
 
 ## 使用限制
 
@@ -30,7 +32,8 @@ Nebula Operator不支持v1.x版本的Nebula Graph，其与Nebula Graph版本的
 
 | Nebula Operator版本 | Nebula Graph版本 |
 | ------------------- | ---------------- |
-| {{operator.release}}| {{nebula.release}} |
+| {{operator.release}}| 2.5.x ~ 2.6.x |
+|0.8.0|2.5.x|
 
 ### 功能限制