Merge 2.6.1 (#957)

* Move to 2.6.0 (#838)

* Update deploy.yml

* Update mkdocs.yml

* Update mkdocs.yml

* Update 6.eco-tool-version.md

* Eco tools (#840)

* Move to 2.6.0 (#836)

* Revert "Move to 2.6.0 (#836)" (#837)

This reverts commit e4508b7.

* Update deploy.yml

* Update deploy.yml

* change eco-tools

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

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

* Update faq (#841)

* Move to 2.6.0 (#836)

* Revert "Move to 2.6.0 (#836)" (#837)

This reverts commit e4508b7.

* Update deploy.yml

* Update deploy.yml

* Update 0.FAQ.md

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

* Update 8.map.md

* Update 4.schema.md

* Update 4.schema.md

* update connect to nebula (#842)

* update connect to nebula

* Update source_connect-to-nebula-graph.md

* Update source_connect-to-nebula-graph.md

* Update source_manage-service.md (#843)

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

* Update 2.deploy-es.md

* Update README.md

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

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

* Update mkdocs.yml

* group&zone (#847)

* group&zone

* Update 5.zone.md

* Update 5.zone.md (#849)

* Update 1.create-native-index.md

* Update ex-ug-limitations.md

* Update 7.count.md (#848)

count(expr) return -->count(expr) returns

* update exchange 2.6.0 (#852)

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

* nGQL cheatsheet (#851)

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

* Verify n gql (#855)

* verify nGQL

* merge new console table format

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

* Update 5.lookup.md

* Update 4.date-and-time.md

* Update mkdocs.yml

* Update 5.null.md

* Update 9.type-conversion.md

* Upgrading nebula with docker compose updates (#857)

* 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 (#858)

* Update 3.property-reference.md

* deploy clusters on multiple servers (#856)

* updates

* Update deploy-nebula-graph-cluster.md

* Update 1.comparison.md

* Update 4.pipe.md

* Update 6.set.md

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

* grammar error (#860)

* Update 4.nebula-graph-crud.md

* Update 1.get-subgraph.md

* Update 1.create-native-index.md

* Update 6.eco-tool-version.md

* Update mkdocs.yml

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

* Update 7.string.md (#862)

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

* update nav (#866)

* update geo (#867)

* Update 3.date-and-time.md

* Update 3.date-and-time.md

* Create 4.install-nebula-graph-from-tar.md (#869)

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

* Update mkdocs.yml

* Update 6.eco-tool-version.md

* Update 6.eco-tool-version.md

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

* Update 3.date-and-time.md

* Update 3.date-and-time.md

* Update 3.date-and-time.md

* Update 6.eco-tool-version.md

* merge update studio (#871)

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

* update go and lookup (#872)

* update studio (#874)

* update show (#876)

* Update limit.md (#877)

* release 2.6.1 (#878)

* 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 (#880)

checkpoints directory changed

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

* Checkpoints directory changed (#881)

* Update 3.manage-snapshot.md

checkpoints directory changed

* Update 3.manage-snapshot.md

* Update source_manage-service.md (#882)

* Checkpoints directory changed (#883)

* Update 3.manage-snapshot.md

checkpoints directory changed

* Update 3.manage-snapshot.md

* Update 3.manage-snapshot.md

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

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

change \| to |

* Update mkdocs.yml

* Update 6.eco-tool-version.md

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

* Update 6.show-hosts.md

* Update 6.show-hosts.md

* change upgrade (#889)

* Update mkdocs.yml

* Update 1.what-is-dashboard.md (#892) (#896)

* Update 1.what-is-dashboard.md

* Update 1.what-is-dashboard.md

* Update 1.what-is-dashboard.md (#897)

* settings and parameters (#894) (#899)

* settings and parameters

* add pics

* fix title

* Update 6.system-settings.md

* Update 7.monitor-parameter.md

* add operation and settings (#905)

* add operation and settings

* Update docs-2.0/nebula-dashboard-ent/4.cluster-operator/5.operation-record.md

Co-authored-by: abby.huang <[email protected]>

* Update docs-2.0/nebula-dashboard-ent/4.cluster-operator/6.settings.md

Co-authored-by: abby.huang <[email protected]>

* update

Co-authored-by: abby.huang <[email protected]>

* Update 6.settings.md

* add what is dashboard ent (#900)

* add what is dashboard ent

* update

* update

* Update docs-2.0/nebula-dashboard-en/1.what-is-dashboard-en.md

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

* Update docs-2.0/nebula-dashboard-en/1.what-is-dashboard-en.md

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

* Update docs-2.0/nebula-dashboard-en/1.what-is-dashboard-en.md

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

* Update docs-2.0/nebula-dashboard-en/1.what-is-dashboard-en.md

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

* Update docs-2.0/nebula-dashboard-en/1.what-is-dashboard-en.md

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

* Update docs-2.0/nebula-dashboard-en/1.what-is-dashboard-en.md

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

* Update docs-2.0/nebula-dashboard-en/1.what-is-dashboard-en.md

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

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

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

* update explorer (#887) (#907)

* update

* Update ex-ug-deploy.md

* update-1105

* Update ex-ug-deploy.md

Co-authored-by: 朱晓青 <[email protected]>

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

* change create sentence in nGQL (#906)

* create and import cluster (#904)

* create and import cluster

* Update 1.what-is-dashboard.md

* add pics

* Create 8.faq.md (#901)

* Create 8.faq.md

* Update 8.faq.md

* cluster operation (#909)

* Update mkdocs.yml

* add license (#903)

* add license

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

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

* update-1111

* deploy dashboard and account (#893) (#910)

* deploy dashboard and account (#893)

* deploy dashboard and account

* add pics and fix title

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

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

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

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

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

Co-Authored-By: foesa <[email protected]>
Co-Authored-By: cooper-lzy <[email protected]>

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

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

* fix deploy dashboard (#911)

* update

* Update mkdocs.yml

* Rename 2.deploy-connect-dashboard-en.md to 2.deploy-connect-dashboard-ent.md

* fix pics (#914)

* fix dashboard (#916)

* Update mkdocs.yml (#917)

* update

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

* Update 8.faq.md

* Update 0.FAQ.md

* Update 2.meta-service.md

* Update 1.create-space.md

* Update 2.use-space.md

* Update 2.use-space.md

* Update mkdocs.yml

* Operator new and updates for 261 (#922)

* add crd updates (#919)

Update 8.1.custom-conf-parameter.md (#920)

period typo

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

* custom-conf-parameters&pv-claim&balance-data

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

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

* update yaml

* Update 7.operator-faq.md

* update helm

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

* error fix

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

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

* Create 9.upgrade-nebula-cluster.md

* Update 9.upgrade-nebula-cluster.md

* Update 9.upgrade-nebula-cluster.md

* Update 9.upgrade-nebula-cluster.md

* Update 9.upgrade-nebula-cluster.md

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

* 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 4.connect-to-nebula-graph-service.md

* Update mkdocs.yml (#923) (#925)

* Add upgrade cluster to mkdocs 261 (#928)

* Update mkdocs.yml (#923)

* Update mkdocs.yml

* Update mkdocs.yml

* Update 6.eco-tool-version.md

* Update 3.role-list.md

* fixed broken markdown table (#935)

fixed broken markdown table

https://docs.nebula-graph.io/2.6.1/3.ngql-guide/5.operators/5.property-reference/

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

* fix details (#929)

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

* add exchange ent (#932)

* add exchange ent

* add exchange ent docs

* Update ex-ug-compile.md

* add parameters and fix details

* Update ex-ug-what-is-exchange.md

* Update 2.deploy-es.md

* added link of release note (#937)

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

* Update 2.deploy-dashboard.md

* Update 2.deploy-dashboard.md

* Update mkdocs.yml

* Update ex-ug-what-is-exchange.md

* Update 2.deploy-connect-dashboard-ent.md (#938)

* Update nebula-spark-connector.md (#939)

* Update practice.md (#940)

* Update 6.eco-tool-version.md

java client：https://github.com/vesoft-inc/nebula-java/releases/tag/v2.6.1
nebula exchange：https://github.com/vesoft-inc/nebula-exchange/releases/tag/v2.6.1
nebula spark connector：https://github.com/vesoft-inc/nebula-spark-connector/releases/tag/v2.6.1
nebula flink connector： https://github.com/vesoft-inc/nebula-flink-connector/releases/tag/v2.6.1

* Update comments.md

* Update 2.update-edge.md

* Update mkdocs.yml (#944)

java client：https://github.com/vesoft-inc/nebula-java/releases/tag/v2.6.1
nebula exchange：https://github.com/vesoft-inc/nebula-exchange/releases/tag/v2.6.1
nebula spark connector：https://github.com/vesoft-inc/nebula-spark-connector/releases/tag/v2.6.1
nebula flink connector： https://github.com/vesoft-inc/nebula-flink-connector/releases/tag/v2.6.1

* Update nebula-spark-connector.md (#945)

* Update nebula-spark-connector.md

* Update 6.cheatsheet-for-ngql.md

* Update 1.what-is-dashboard.md

* Update nebula-algorithm.md (#946)

* Update use-importer.md (#947)

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

* Update 2.match.md (#950)

* Update 2.match.md

* Update 2.match.md

* Update deploy.yml

* Update mkdocs.yml

Co-authored-by: randomJoe211 <[email protected]>
Co-authored-by: min.wu <[email protected]>
Co-authored-by: Sophie-Xie <[email protected]>
Co-authored-by: cooper-lzy <[email protected]>
Co-authored-by: [email protected] <[email protected]>
Co-authored-by: abby.huang <[email protected]>
Co-authored-by: Yee <[email protected]>
Co-authored-by: Wey Gu <[email protected]>

Author: 9 people

mkdocs.yml

@@ -61,50 +61,60 @@ extra:
     release: 3.1.0
   explorer:
     base100: 1.0.0
-    release: 2.0.0
+    release: 2.1.0
+  exchange_ent:
+    release: 2.6.0
+    branch: v2.6
   exchange:
-    release: 2.5.1
-    branch: v2.5
+    release: 2.6.1
+    branch: v2.6
+    tag: v2.6.1
   importer:
-    release: 2.5.0
-    branch: release-v2.0.0-ga
+    release: 2.6.0
+    branch: v2.6.0
   algorithm:
     release: 2.5.1
     branch: v2.5
   sparkconnector:
-    release: 2.5.1
-    branch: v2.5
+    release: 2.6.1
+    branch: v2.6
+    tag: v2.6.1
   flinkconnector:
-    release: 2.5.0
-    branch: v2.5
+    release: 2.6.1
+    branch: v2.6
+    tag: v2.6.1
   dockercompose:
-    release: 2.5.0
-    branch: v2.5.0
+    release: 2.6.0
+    branch: v2.6.0
   common:
     release: 2.5.1
   dashboard:
-    release: 1.0.1
+    release: 1.0.2
     base100: 1.0.0
-    branch: v1.0.1
+    branch: v1.0.2
+  dashboard_ent:
+    release: 1.0.0
   console:
-    release: 2.5.0
+    release: 2.6.0
+    branch: v2.6.0
   br:
     release: 0.5.0
   cpp:
     release: 2.5.0
     branch: v2.5.0
   java:
-    release: 2.5.0
-    branch: v2.5.0
+    release: 2.6.1
+    branch: v2.6.1
   python:
-    release: 2.5.0
-    branch: v2.5.0
+    release: 2.6.0
+    branch: v2.6.0
   go:
-    release: 2.5.0
-    branch: release-v2.5.0
+    release: 2.6.0
+    branch: v2.6.0
   bench:
     release: 1.0.0
     branch: master
+    tag: v1.0.0
   operator:
     release: 0.9.0
     branch: v0.9.0
@@ -129,6 +139,7 @@ nav:
       - Step 2 Manage Nebula Graph Service: 2.quick-start/5.start-stop-service.md
       - Step 3 Connect to Nebula Graph: 2.quick-start/3.connect-to-nebula-graph.md
       - Step 4 Use nGQL (CRUD): 2.quick-start/4.nebula-graph-crud.md
+      - nGQL cheatsheet: 2.quick-start/6.cheatsheet-for-ngql.md
 
   - nGQL guide:
       - nGQL overview:
@@ -149,7 +160,7 @@ nav:
         - Set: 3.ngql-guide/3.data-types/7.set.md
         - Map: 3.ngql-guide/3.data-types/8.map.md
         - Type conversion: 3.ngql-guide/3.data-types/9.type-conversion.md
-        - GEOGRAPHY: 3.ngql-guide/3.data-types/10.geography.md
+        - Geography: 3.ngql-guide/3.data-types/10.geography.md
 
       - Variables and composite queries:
         - Composite queries: 3.ngql-guide/4.variable-and-composite-queries/1.composite-queries.md
@@ -193,7 +204,7 @@ nav:
             - SHOW COLLATION: 3.ngql-guide/7.general-query-statements/6.show/2.show-collation.md
 #            - SHOW CONFIGS: 3.ngql-guide/7.general-query-statements/6.show/3.show-configs.md
             - SHOW CREATE SPACE: 3.ngql-guide/7.general-query-statements/6.show/4.show-create-space.md
-            - SHOW CREATE TAGS/EDGES: 3.ngql-guide/7.general-query-statements/6.show/5.show-create-tags-edges.md
+            - SHOW CREATE TAG/EDGE: 3.ngql-guide/7.general-query-statements/6.show/5.show-create-tag-edge.md
             - SHOW HOSTS: 3.ngql-guide/7.general-query-statements/6.show/6.show-hosts.md
             - SHOW INDEX STATUS: 3.ngql-guide/7.general-query-statements/6.show/7.show-index-status.md
             - SHOW INDEXES: 3.ngql-guide/7.general-query-statements/6.show/8.show-indexes.md
@@ -233,6 +244,7 @@ nav:
           - SHOW TAGS: 3.ngql-guide/10.tag-statements/4.show-tags.md
           - DESCRIBE TAG: 3.ngql-guide/10.tag-statements/5.describe-tag.md
           - DELETE TAG: 3.ngql-guide/10.tag-statements/6.delete-tag.md
+          - Add or delete tag: 3.ngql-guide/10.tag-statements/improve-query-by-tag-index.md
 
       - Edge type statements:
           - CREATE EDGE: 3.ngql-guide/11.edge-type-statements/1.create-edge.md
@@ -288,14 +300,15 @@ nav:
       - Compile and install Nebula Graph:
           - Install Nebula Graph by compiling the source code: 4.deployment-and-installation/2.compile-and-install-nebula-graph/1.install-nebula-graph-by-compiling-the-source-code.md
           - Install Nebula Graph with RPM or DEB package: 4.deployment-and-installation/2.compile-and-install-nebula-graph/2.install-nebula-graph-by-rpm-or-deb.md
-          - Install Nebula graph with the tar.gz file: 4.deployment-and-installation/2.compile-and-install-nebula-graph/4.install-nebula-graph-from-tar.md
+          - Install Nebula Graph with the tar.gz file: 4.deployment-and-installation/2.compile-and-install-nebula-graph/4.install-nebula-graph-from-tar.md
           - Deploy Nebula Graph with Docker Compose: 4.deployment-and-installation/2.compile-and-install-nebula-graph/3.deploy-nebula-graph-with-docker-compose.md
-          - Deploy Nebula Graph cluster: 4.deployment-and-installation/2.compile-and-install-nebula-graph/deploy-nebula-graph-cluster.md
+          - Deploy a Nebula Graph cluster on multiple servers: 4.deployment-and-installation/2.compile-and-install-nebula-graph/deploy-nebula-graph-cluster.md
+      - Deploy license: 4.deployment-and-installation/deploy-license.md
       - Manage Service: 4.deployment-and-installation/manage-service.md
       - Connect to Service: 4.deployment-and-installation/connect-to-nebula-graph.md
       - Upgrade:
-          - Upgrade Nebula Graph to v2.6.0: 4.deployment-and-installation/3.upgrade-nebula-graph/upgrade-nebula-graph-to-260.md
-          - Upgrade Nebula Graph from v2.0.x to v2.6.0: 4.deployment-and-installation/3.upgrade-nebula-graph/upgrade-nebula-from-200-to-260.md
+          - Upgrade Nebula Graph to the current version: 4.deployment-and-installation/3.upgrade-nebula-graph/upgrade-nebula-graph-to-latest.md
+          - Upgrade Nebula Graph from v2.0.x to the current version: 4.deployment-and-installation/3.upgrade-nebula-graph/upgrade-nebula-from-200-to-latest.md
       - Uninstall Nebula Graph: 4.deployment-and-installation/4.uninstall-nebula-graph.md
 
   - Configurations and logs:
@@ -334,7 +347,7 @@ nav:
     - System design suggestions: 8.service-tuning/3.system-design.md
     - Execution plan: 8.service-tuning/4.plan.md
     - Processing super vertices: 8.service-tuning/super-node.md
-    - Add or delete tag: 8.service-tuning/improve-query-by-tag-index.md
+    - Best practices: 8.service-tuning/practice.md
 
   - Client:
     - Clients overview: 14.client/1.nebula-client.md
@@ -376,13 +389,31 @@ nav:
       - Cannot access to Studio: nebula-studio/troubleshooting/st-ug-connection-errors.md
       - FAQ: nebula-studio/troubleshooting/st-ug-faq.md
 
-  - Nebula Dashboard:
+  - Nebula Dashboard Community Edition:
       - What is Nebula Dashboard: nebula-dashboard/1.what-is-dashboard.md
       - Deploy Dashboard: nebula-dashboard/2.deploy-dashboard.md
       - Connect Dashboard: nebula-dashboard/3.connect-dashboard.md
       - Use Dashboard: nebula-dashboard/4.use-dashboard.md
       - Monitor Parameter: nebula-dashboard/6.monitor-parameter.md
 
+  - Nebula Dashboard Enterprise Edition:
+      - What is Nebula Dashboard: nebula-dashboard-ent/1.what-is-dashboard-ent.md
+      - Deploy Dashboard: nebula-dashboard-ent/2.deploy-connect-dashboard-ent.md
+      - Create and Import Cluster:
+        - Create clusters: nebula-dashboard-ent/3.create-import-dashboard/1.create-cluster.md
+        - Import clusters: nebula-dashboard-ent/3.create-import-dashboard/2.import-cluster.md
+      - Cluster Operation:
+        - Cluster Overview: nebula-dashboard-ent/4.cluster-operator/1.overview.md
+        - Cluster Monitoring: nebula-dashboard-ent/4.cluster-operator/2.monitor.md
+        - Cluster Information: nebula-dashboard-ent/4.cluster-operator/3.cluster-information.md
+        - Cluster Operation: nebula-dashboard-ent/4.cluster-operator/4.manage.md
+        - Operation Record: nebula-dashboard-ent/4.cluster-operator/5.operation-record.md
+        - Other Settings: nebula-dashboard-ent/4.cluster-operator/6.settings.md
+      - Authority Management: nebula-dashboard-ent/5.account-management.md
+      - System Settings: nebula-dashboard-ent/6.system-settings.md
+      - Monitor Parameter: nebula-dashboard-ent/7.monitor-parameter.md
+      - FAQ: nebula-dashboard-ent/8.faq.md
+
   - Nebula Explorer:
       - What is Nebula Explorer: nebula-explorer/about-explorer/ex-ug-what-is-explorer.md
       - Deploy and connect:
@@ -406,7 +437,7 @@ nav:
     - Introduction:
       - What is Nebula Exchange: nebula-exchange/about-exchange/ex-ug-what-is-exchange.md
       - Limitations: nebula-exchange/about-exchange/ex-ug-limitations.md
-    - Compile Exchange: nebula-exchange/ex-ug-compile.md
+    - Get Exchange: nebula-exchange/ex-ug-compile.md
     - Exchange configurations:
       - Options for import: nebula-exchange/parameter-reference/ex-ug-para-import-command.md
       - Parameters in the configuration file: nebula-exchange/parameter-reference/ex-ug-parameter.md
@@ -424,6 +455,7 @@ nav:
       - Import data from Pulsar: nebula-exchange/use-exchange/ex-ug-import-from-pulsar.md
       - Import data from Kafka: nebula-exchange/use-exchange/ex-ug-import-from-kafka.md
       - Import data from SST files: nebula-exchange/use-exchange/ex-ug-import-from-sst.md
+      - Export data from Nebula Graph: nebula-exchange/use-exchange/ex-ug-export-from-nebula.md
     - Exchange FAQ: nebula-exchange/ex-ug-FAQ.md
 
   - Nebula Operator:
@@ -491,6 +523,9 @@ plugins:
       glob:
 # Exclude all files in a directory. The path starts with the directory name in docs-2.0, such as `20.appendix/*`.
         - 7.data-security/2.backup-restore/*
+        - nebula-flink/*
+        - CHANGELOG.md
+        - spark-connector/*
 # Exclude the file with the following file name.
 #        - abc.md
 # Exclude files with regular expressions (regexes)
@@ -499,7 +534,7 @@ plugins:
 
   - with-pdf:
       copyright: 2021 Vesoft Inc.
-      cover_subtitle: master since v2.5.1
+      cover_subtitle: master since v2.6.1
       author: Min Wu, Yao Zhou, Cooper Liang, Foesa Yang, Max Zhu, Abby Huang
       cover: true
       back_cover: true