You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/04/07 03:53:13 UTC
[incubator-linkis-website] branch dev updated: adjust how-to-verify.md (#222)
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-linkis-website.git
The following commit(s) were added to refs/heads/dev by this push:
new 72ddbecba adjust how-to-verify.md (#222)
72ddbecba is described below
commit 72ddbecba2324f4ee7c91286be2ebcce245c8211
Author: Casion <ca...@gmail.com>
AuthorDate: Thu Apr 7 11:53:08 2022 +0800
adjust how-to-verify.md (#222)
* adjust how-to-verify.md
---
community/how-to-contribute-to-website.md | 2 +-
community/how-to-verify.md | 16 +++++++++++++++-
docs/release-notes-1.1.0.md | 10 +++++-----
.../current/how-to-contribute-to-website.md | 2 +-
.../current/how-to-verify.md | 20 +++++++++++++++++++-
.../microservice_governance_services/overview.md | 2 +-
.../current/architecture/overview.md | 4 ++--
.../microservice_governance_services/overview.md | 2 +-
.../version-1.0.2/architecture/overview.md | 6 +++---
.../microservice_governance_services/overview.md | 2 +-
.../version-1.0.3/architecture/overview.md | 2 +-
11 files changed, 50 insertions(+), 18 deletions(-)
diff --git a/community/how-to-contribute-to-website.md b/community/how-to-contribute-to-website.md
index 6d7546404..5c56b1caa 100644
--- a/community/how-to-contribute-to-website.md
+++ b/community/how-to-contribute-to-website.md
@@ -5,7 +5,7 @@ sidebar_position: 2.1
## Branch
-dev is the development branch. For all modifications, please fork first, and then proceed on the dev branch.
+dev is the development branch, please fork to your own repository, create a fix/feature branch based on the dev branch, and then perform development and modification on this branch.
```
master
dev #development branch
diff --git a/community/how-to-verify.md b/community/how-to-verify.md
index 3d6f2e089..a51466f09 100644
--- a/community/how-to-verify.md
+++ b/community/how-to-verify.md
@@ -189,9 +189,22 @@ If you initiate a posting vote, you can refer to this response example to reply
<font color="red">
When replying to the email, you must bring the information that you have checked by yourself. Simply replying to `+1 approve` is invalid.
-PPMC/IPMC member voting is best with the binding suffix, indicating a binding vote, which is convenient for counting voting results
+When PPMC votes in the dev@linkis.apache.org linkis community, Please bring the binding suffix to indicate that it has a binding vote for the vote in the linkis community, and it is convenient to count the voting results.
+
+When IPMC votes in the general@incubator.apache.org incubator community. Please bring the binding suffix to indicate that the voting in the incubator community has a binding vote, which is convenient for counting the voting results.
</font>
+:::caution note
+If you have already voted on dev@linkis.apache.org, you can take it directly to the incubator community when you reply to the vote, such as:
+
+```html
+//Incubator community voting, only IPMC members have binding binding
+Forward my +1 from dev@linkis (non-binding)
+Copy my +1 from linkis DEV ML (non-binding)
+````
+:::
+
+
Non-PPMC/Non-IPMC member
```html
+1 (non-binding)
@@ -205,6 +218,7 @@ I checked:
PPMC/IPMC member
```html
+//Incubator community voting, only IPMC members have binding binding
+1 (binding)
I checked:
1. All download links are valid
diff --git a/docs/release-notes-1.1.0.md b/docs/release-notes-1.1.0.md
index 6d9fc0dc4..174f98638 100644
--- a/docs/release-notes-1.1.0.md
+++ b/docs/release-notes-1.1.0.md
@@ -27,11 +27,11 @@ Abbreviations:
## New Feature
-* \[DMS-Common][[Linkis-1335]](https://github.com/apache/incubator-linkis/pull/1335) Add a new module linkis-datasource-manager-common, add data source data Structure, exception class, tool class.
-* \[DMS-Common][[Linkis-1340]](https://github.com/apache/incubator-linkis/pull/1340) Add a new module linkis-metadata-manager-common, add metadata data Structure, exception class, tool class.
-* \[MDS-Server][[Linkis-1352]](https://github.com/apache/incubator-linkis/pull/1352) Add a new module linkis-datasource-manager-server to provide data source management services , provides functions such as adding, deleting, checking, and modifying data sources through the restful interface.
-* \[MDS-Server][[Linkis-1356]](https://github.com/apache/incubator-linkis/pull/1356) Add a new module linkis-metadata-manager-server to provide metadata management services , which provides database, table, and column queries of metadata through the restful interface.
-* \[MDS-Services][[Linkis-1366]](https://github.com/apache/incubator-linkis/pull/1366) Add a new module linkis-metadata-manager-service-es to provide Elasticsearch metadata management service.
+* \[DMS-Common][[Linkis-1335]](https://github.com/apache/incubator-linkis/pull/1335) Add a new module linkis-datasource-manager-common, add datasource data structure/exception class/util class.
+* \[DMS-Common][[Linkis-1340]](https://github.com/apache/incubator-linkis/pull/1340) Add a new module linkis-metadata-manager-common, add metadata data structure/exception class/util class.
+* \[MDS-Server][[Linkis-1352]](https://github.com/apache/incubator-linkis/pull/1352) Add a new module linkis-datasource-manager-server to provide data source management services, provides functions such as adding, deleting, checking, and modifying data sources through the restful interface.
+* \[MDS-Server][[Linkis-1356]](https://github.com/apache/incubator-linkis/pull/1356) Add a new module linkis-metadata-manager-server to provide metadata management services, which provides database, table, and column queries of metadata through the restful interface.
+* \[MDS-Services][[Linkis-1366]](https://github.com/apache/incubator-linkis/pull/1366) Add a new module linkis-metadata-manager-service-es to provide elasticsearch metadata management service.
* \[MDS-Services][[Linkis-1368]](https://github.com/apache/incubator-linkis/pull/1368) Add a new module linkis-metadata-manager-service-hive, providing for hive Metadata management service.
* \[MDS-Services][[Linkis-1371]](https://github.com/apache/incubator-linkis/pull/1371) Add a new module linkis-metadata-manager-service-kafka, providing for kafka Metadata management service.
* \[MDS-Services][[Linkis-1373]](https://github.com/apache/incubator-linkis/pull/1373) Add a new module linkis-metadata-manager-service-mysql, provide for mysql Metadata management service.
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/how-to-contribute-to-website.md b/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/how-to-contribute-to-website.md
index 6512d8d37..5d5872ab7 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/how-to-contribute-to-website.md
+++ b/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/how-to-contribute-to-website.md
@@ -4,7 +4,7 @@ sidebar_position: 2.1
---
## 分支
-dev为开发分支，修改请先fork到自己的仓库，然后在dev分支上进行开发修改。
+dev为开发分支，请先fork到自己的仓库，基于dev分支创建fix/feature分支，然后在该分支上进行开发修改。
```
master 主分支
dev 开发分支
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/how-to-verify.md b/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/how-to-verify.md
index 96bc7c491..1b6e33069 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/how-to-verify.md
+++ b/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/how-to-verify.md
@@ -190,9 +190,26 @@ $ cd apache-linkis-${release_version}-incubating-bin
<font color="red">
回复的邮件一定要带上自己检查了那些项信息，仅仅回复`+1 approve`，是无效的。
-PPMC/IPMC成员，投票时请带上 binding后缀，表示具有约束性投票，方便统计投票结果
+PPMC在dev@linkis.apache.org linkis的社区投票时，请带上 binding后缀，表示对linkis社区中的投票具有约束性投票，方便统计投票结果。
+
+IPMC在general@incubator.apache.org incubator社区投票，请带上 binding后缀，表示表示对incubator社区中的投票具有约束性投票，方便统计投票结果。
+
</font>
+:::caution 注意
+如果在dev@linkis.apache.org已经投过票，在incubator社区进行投票回复时，可以直接带过去 如:
+
+```html
+//incubator社区 投票时，只有IPMC成员才具有约束性 binding
+Forward my +1 from dev@linkis (non-binding)
+Copy my +1 from linkis DEV ML (non-binding)
+```
+:::
+
+
+
+
+
非PPMC/IPMC成员
```html
+1 (non-binding)
@@ -206,6 +223,7 @@ I checked:
PPMC/IPMC成员
```html
+//incubator社区 投票时，只有IPMC成员才具有约束性 binding
+1 (binding)
I checked:
1. All download links are valid
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/current/architecture/microservice_governance_services/overview.md b/i18n/zh-CN/docusaurus-plugin-content-docs/current/architecture/microservice_governance_services/overview.md
index 681ee1996..ef33e8fea 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-docs/current/architecture/microservice_governance_services/overview.md
+++ b/i18n/zh-CN/docusaurus-plugin-content-docs/current/architecture/microservice_governance_services/overview.md
@@ -4,7 +4,7 @@ sidebar_position: 0
---
## **背景**
-微服务治理包含了Gateway、Eureka、Open Feign等三个主要的微服务。用来解决Linkis的服务发现与注册、统一网关、请求转发、服务间通信、负载均衡等问题。同时Linkis1.0还会提供对Nacos的支持；整个Linkis是一个完全的微服务架构，每个业务流程都是需要多个微服务协同完成的。
+微服务治理包含了Gateway、Eureka、Open Feign等三个主要的微服务。用来解决Linkis的服务发现与注册、统一网关、请求转发、服务间通信、负载均衡等问题。整个Linkis是一个完全的微服务架构，每个业务流程都是需要多个微服务协同完成的。
## **架构图**
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/current/architecture/overview.md b/i18n/zh-CN/docusaurus-plugin-content-docs/current/architecture/overview.md
index 3ba4c89f9..28f24690a 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-docs/current/architecture/overview.md
+++ b/i18n/zh-CN/docusaurus-plugin-content-docs/current/architecture/overview.md
@@ -10,9 +10,9 @@ Linkis 1.0 将所有微服务总体划分为三大类：公共增强服务、计
各大类的具体职责如下：
-1. 公共增强服务为 Linkis 0.X 已经提供的物料库服务、上下文服务、数据源服务和公共服务等；
+1. 公共增强服务为 Linkis 0.X 已经提供的物料库服务、上下文服务、数据源服务和公共服务等。
-2. 微服务治理服务为 Linkis 0.X 已经提供的 Spring Cloud Gateway、Eureka 和 Open Feign，同时 Linkis1.X 后续会计划提供对 Nacos 的支持；
+2. 微服务治理服务为 Linkis 0.X 已经提供的 Spring Cloud Gateway、Eureka 和 Open Feign。
3. 计算治理服务是 Linkis 1.0 的核心重点，从 提交 —> 准备 —> 执行三个阶段，来全面升级 Linkis 对 用户任务的执行管控能力。
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.0.2/architecture/microservice_governance_services/overview.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.0.2/architecture/microservice_governance_services/overview.md
index 681ee1996..ef33e8fea 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.0.2/architecture/microservice_governance_services/overview.md
+++ b/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.0.2/architecture/microservice_governance_services/overview.md
@@ -4,7 +4,7 @@ sidebar_position: 0
---
## **背景**
-微服务治理包含了Gateway、Eureka、Open Feign等三个主要的微服务。用来解决Linkis的服务发现与注册、统一网关、请求转发、服务间通信、负载均衡等问题。同时Linkis1.0还会提供对Nacos的支持；整个Linkis是一个完全的微服务架构，每个业务流程都是需要多个微服务协同完成的。
+微服务治理包含了Gateway、Eureka、Open Feign等三个主要的微服务。用来解决Linkis的服务发现与注册、统一网关、请求转发、服务间通信、负载均衡等问题。整个Linkis是一个完全的微服务架构，每个业务流程都是需要多个微服务协同完成的。
## **架构图**
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.0.2/architecture/overview.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.0.2/architecture/overview.md
index 7054abaaa..7287a4085 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.0.2/architecture/overview.md
+++ b/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.0.2/architecture/overview.md
@@ -10,11 +10,11 @@ Linkis 1.0 将所有微服务总体划分为三大类：公共增强服务、计
各大类的具体职责如下：
-1. 公共增强服务为 Linkis 0.X 已经提供的物料库服务、上下文服务、数据源服务和公共服务等；
+1. 公共增强服务为 Linkis 0.X 已经提供的物料库服务、上下文服务、数据源服务和公共服务等。
-2. 微服务治理服务为 Linkis 0.X 已经提供的 Spring Cloud Gateway、Eureka 和 Open Feign，Linkis1.X 后续会计划提供对 Nacos 的支持；
+2. 微服务治理服务为 Linkis 0.X 已经提供的 Spring Cloud Gateway、Eureka 和 Open Feign。
-3. 计算治理服务是 Linkis 1.0 的核心重点，从 提交 —> 准备 —> 执行三个阶段，来全面升级 Linkis 对 用户任务的执行管控能力。
+3. 计算治理服务是 Linkis 1.0 的核心重点，从 提交 —> 准备 —> 执行三个阶段，来全面升级 Linkis 对用户任务的执行管控能力。
以下是 Linkis1.0 架构文档的目录列表：
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.0.3/architecture/microservice_governance_services/overview.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.0.3/architecture/microservice_governance_services/overview.md
index 681ee1996..ef33e8fea 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.0.3/architecture/microservice_governance_services/overview.md
+++ b/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.0.3/architecture/microservice_governance_services/overview.md
@@ -4,7 +4,7 @@ sidebar_position: 0
---
## **背景**
-微服务治理包含了Gateway、Eureka、Open Feign等三个主要的微服务。用来解决Linkis的服务发现与注册、统一网关、请求转发、服务间通信、负载均衡等问题。同时Linkis1.0还会提供对Nacos的支持；整个Linkis是一个完全的微服务架构，每个业务流程都是需要多个微服务协同完成的。
+微服务治理包含了Gateway、Eureka、Open Feign等三个主要的微服务。用来解决Linkis的服务发现与注册、统一网关、请求转发、服务间通信、负载均衡等问题。整个Linkis是一个完全的微服务架构，每个业务流程都是需要多个微服务协同完成的。
## **架构图**
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.0.3/architecture/overview.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.0.3/architecture/overview.md
index 7054abaaa..14d736ea8 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.0.3/architecture/overview.md
+++ b/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.0.3/architecture/overview.md
@@ -12,7 +12,7 @@ Linkis 1.0 将所有微服务总体划分为三大类：公共增强服务、计
1. 公共增强服务为 Linkis 0.X 已经提供的物料库服务、上下文服务、数据源服务和公共服务等；
-2. 微服务治理服务为 Linkis 0.X 已经提供的 Spring Cloud Gateway、Eureka 和 Open Feign，Linkis1.X 后续会计划提供对 Nacos 的支持；
+2. 微服务治理服务为 Linkis 0.X 已经提供的 Spring Cloud Gateway、Eureka 和 Open Feign
3. 计算治理服务是 Linkis 1.0 的核心重点，从 提交 —> 准备 —> 执行三个阶段，来全面升级 Linkis 对 用户任务的执行管控能力。
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org